Version 4.1.19

applications/blog/Application.php

@@ -3,7 +3,7 @@
  * @brief		Blog Application Class
  * @author		<a href=''>Invision Power Services, Inc.</a>
  * @copyright	(c) 2014 Invision Power Services, Inc.
- * @package		IPS Social Suite
+ * @package		IPS Community Suite
  * @subpackage	Blog
  * @since		3 Mar 2014
  * @version		
@@ -51,4 +51,37 @@ class _Application extends \IPS\Application
 	{
 		return 'file-text';
 	}
+	
+	/**
+	 * Default front navigation
+	 *
+	 * @code
+	 	
+	 	// Each item...
+	 	array(
+			'key'		=> 'Example',		// The extension key
+			'app'		=> 'core',			// [Optional] The extension application. If ommitted, uses this application	
+			'config'	=> array(...),		// [Optional] The configuration for the menu item
+			'title'		=> 'SomeLangKey',	// [Optional] If provided, the value of this language key will be copied to menu_item_X
+			'children'	=> array(...),		// [Optional] Array of child menu items for this item. Each has the same format.
+		)
+	 	
+	 	return array(
+		 	'rootTabs' 		=> array(), // These go in the top row
+		 	'browseTabs'	=> array(),	// These go under the Browse tab on a new install or when restoring the default configuraiton; or in the top row if installing the app later (when the Browse tab may not exist)
+		 	'browseTabsEnd'	=> array(),	// These go under the Browse tab after all other items on a new install or when restoring the default configuraiton; or in the top row if installing the app later (when the Browse tab may not exist)
+		 	'activityTabs'	=> array(),	// These go under the Activity tab on a new install or when restoring the default configuraiton; or in the top row if installing the app later (when the Activity tab may not exist)
+		)
+	 * @endcode
+	 * @return array
+	 */
+	public function defaultFrontNavigation()
+	{
+		return array(
+			'rootTabs'		=> array(),
+			'browseTabs'	=> array( array( 'key' => 'Blogs' ) ),
+			'browseTabsEnd'	=> array(),
+			'activityTabs'	=> array()
+		);
+	}
 }

applications/blog/api/blogs.php

@@ -0,0 +1,104 @@
+<?php
+/**
+ * @brief		Blog Blogs API
+ * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
+ * @license		http://www.invisionpower.com/legal/standards/
+ * @package		IPS Community Suite
+ * @subpackage	Blog
+ * @since		9 Dec 2015
+ * @version		SVN_VERSION_NUMBER
+ */
+
+namespace IPS\blog\api;
+
+/* To prevent PHP errors (extending class does not exist) revealing path */
+if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+{
+	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
+	exit;
+}
+
+/**
+ * @brief	Blog Blogs API
+ */
+class _blogs extends \IPS\Api\Controller
+{	
+	/**
+	 * GET /blog/blogs
+	 * Get list of blogs
+	 *
+	 * @apiparam	string	owners	Comma-delimited list of member IDs - if provided, only blogs owned by those members are returned (can be used in conjection with groups or set to 0 to exclude member-created blogs)
+	 * @apiparam	string	groups	Comma-delimited list of group IDs - if provided, only blogs owned by those groups are returned (can be used in conjection with members or set to 0 to exclude group blogs)
+	 * @apiparam	int		pinned	If 1, only blogs which are pinned are returned, if 0 only not pinned
+	 * @apiparam	string	sortBy	What to sort by. Can be 'count_entries' for number of entries, 'last_edate' for last entry date or do not specify for ID
+	 * @apiparam	string	sortDir	Sort direction. Can be 'asc' or 'desc' - defaults to 'asc'
+	 * @apiparam	int		page	Page number
+	 * @return		\IPS\Api\PaginatedResponse<IPS\blog\Entry>
+	 */
+	public function GETindex()
+	{
+		/* Where clause */
+		$where = array();
+		
+		/* Owners */
+		if ( isset( \IPS\Request::i()->owners ) and isset( \IPS\Request::i()->groups ) )
+		{
+			$where[] = array( '( ' . \IPS\Db::i()->in( 'blog_member_id', array_filter( explode( ',', \IPS\Request::i()->owners ) ) ) . ' OR ' . \IPS\Db::i()->findInSet( 'blog_groupblog_ids', array_filter( explode( ',', \IPS\Request::i()->groups ) ) ) . ' )' );
+		}
+		elseif ( isset( \IPS\Request::i()->owners ) )
+		{
+			$where[] = array( '( ' . \IPS\Db::i()->in( 'blog_member_id', array_filter( explode( ',', \IPS\Request::i()->owners ) ) ) . ' OR blog_groupblog_ids<>? )', '' );
+		}
+		elseif ( isset( \IPS\Request::i()->groups ) )
+		{
+			$where[] = array( '( blog_member_id>0 OR ' . \IPS\Db::i()->findInSet( 'blog_groupblog_ids', array_filter( explode( ',', \IPS\Request::i()->groups ) ) ) . ' )' );
+		}
+		
+		/* Pinned */
+		if ( isset( \IPS\Request::i()->pinned ) )
+		{
+			$where[] = array( 'blog_pinned=?', intval( \IPS\Request::i()->pinned ) );
+		}
+	
+		/* Sort */
+		if ( isset( \IPS\Request::i()->sortBy ) and in_array( \IPS\Request::i()->sortBy, array( 'count_entries', 'last_edate' ) ) )
+		{
+			$sortBy = 'blog_' . \IPS\Request::i()->sortBy;
+		}
+		else
+		{
+			$sortBy = 'blog_id';
+		}
+		$sortDir = ( isset( \IPS\Request::i()->sortDir ) and in_array( mb_strtolower( \IPS\Request::i()->sortDir ), array( 'asc', 'desc' ) ) ) ? \IPS\Request::i()->sortDir : 'asc';
+		
+		/* Return */
+		return new \IPS\Api\PaginatedResponse(
+			200,
+			\IPS\Db::i()->select( '*', 'blog_blogs', $where, "{$sortBy} {$sortDir}" ),
+			isset( \IPS\Request::i()->page ) ? \IPS\Request::i()->page : 1,
+			'IPS\blog\Blog',
+			\IPS\Db::i()->select( 'COUNT(*)', 'blog_blogs', $where )->first()
+		);
+	}
+	
+	/**
+	 * GET /blog/blogs/{id}
+	 * Get information about a specific blog
+	 *
+	 * @param		int		$id			ID Number
+	 * @throws		2B302/1	INVALID_ID	The blog ID does not exist
+	 * @return		\IPS\blog\Blog
+	 */
+	public function GETitem( $id )
+	{
+		try
+		{			
+			return new \IPS\Api\Response( 200, \IPS\blog\Blog::load( $id )->apiOutput() );
+		}
+		catch ( \OutOfRangeException $e )
+		{
+			throw new \IPS\Api\Exception( 'INVALID_ID', '2B302/1', 404 );
+		}
+	}
+}

applications/blog/api/comments.php

@@ -0,0 +1,193 @@
+<?php
+/**
+ * @brief		Blog Entry Comments API
+ * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
+ * @license		http://www.invisionpower.com/legal/standards/
+ * @package		IPS Community Suite
+ * @subpackage	Blog
+ * @since		8 Dec 2015
+ * @version		SVN_VERSION_NUMBER
+ */
+
+namespace IPS\blog\api;
+
+/* To prentry PHP errors (extending class does not exist) revealing path */
+if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+{
+	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
+	exit;
+}
+
+/**
+ * @brief	Blog Entry Comments API
+ */
+class _comments extends \IPS\Content\Api\CommentController
+{
+	/**
+	 * Class
+	 */
+	protected $class = 'IPS\blog\Entry\Comment';
+	
+	/**
+	 * GET /blog/comments
+	 * Get list of comments
+	 *
+	 * @apiparam	string	blogs			Comma-delimited list of calendar IDs
+	 * @apiparam	string	authors			Comma-delimited list of member IDs - if provided, only topics started by those members are returned
+	 * @apiparam	int		locked			If 1, only comments from entries which are locked are returned, if 0 only unlocked
+	 * @apiparam	int		hidden			If 1, only comments which are hidden are returned, if 0 only not hidden
+	 * @apiparam	int		pinned			If 1, only posts from  topics which are pinned are returned, if 0 only not pinned
+	 * @apiparam	int		featured		If 1, only comments from  entries which are featured are returned, if 0 only not featured
+	 * @apiparam	int		draft			If 1, only draft entries are returned, if 0 only published
+	 * @apiparam	string	sortBy			What to sort by. Can be 'date', 'title' or leave unspecified for ID
+	 * @apiparam	string	sortDir			Sort direction. Can be 'asc' or 'desc' - defaults to 'asc'
+	 * @apiparam	int		page			Page number
+	 * @return		\IPS\Api\PaginatedResponse<IPS\blog\Entry\Comment>
+	 */
+	public function GETindex()
+	{
+		/* Where clause */
+		$where = array();
+		
+		/* Draft */
+		if ( isset( \IPS\Request::i()->draft ) )
+		{
+			$where[] = array( 'entry_status=?', \IPS\Request::i()->draft ? 'draft' : 'published' );
+		}
+				
+		/* Return */
+		return $this->_list( $where, 'blogs' );
+	}
+	
+	/**
+	 * GET /blog/comments/{id}
+	 * View information about a specific comment
+	 *
+	 * @param		int		$id			ID Number
+	 * @throws		2B301/1	INVALID_ID	The comment ID does not exist
+	 * @return		\IPS\blog\Entry\Comment
+	 */
+	public function GETitem( $id )
+	{
+		try
+		{
+			return new \IPS\Api\Response( 200, \IPS\blog\Entry\Comment::load( $id )->apiOutput() );
+		}
+		catch ( \OutOfRangeException $e )
+		{
+			throw new \IPS\Api\Exception( 'INVALID_ID', '2B301/1', 404 );
+		}
+	}
+	
+	/**
+	 * POST /blog/comments
+	 * Create a comment
+	 *
+	 * @reqapiparam	int			entry				The ID number of the entry the comment is for
+	 * @reqapiparam	int			author				The ID number of the member making the comment (0 for guest)
+	 * @apiparam	string		author_name			If author is 0, the guest name that should be used
+	 * @reqapiparam	string		content				The comment content as HTML (e.g. "<p>This is a comment.</p>")
+	 * @apiparam	datetime	date				The date/time that should be used for the comment date. If not provided, will use the current date/time
+	 * @apiparam	string		ip_address			The IP address that should be stored for the comment. If not provided, will use the IP address from the API request
+	 * @apiparam	int			hidden				0 = unhidden; 1 = hidden, pending moderator approval; -1 = hidden (as if hidden by a moderator)
+	 * @throws		2B301/2		INVALID_ID	The comment ID does not exist
+	 * @throws		1B301/3		NO_AUTHOR	The author ID does not exist
+	 * @throws		1B301/4		NO_CONTENT	No content was supplied
+	 * @return		\IPS\blog\Entry\Comment
+	 */
+	public function POSTindex()
+	{
+		/* Get topic */
+		try
+		{
+			$entry = \IPS\blog\Entry::load( \IPS\Request::i()->entry );
+		}
+		catch ( \OutOfRangeException $e )
+		{
+			throw new \IPS\Api\Exception( 'INVALID_ID', '2B301/2', 403 );
+		}
+		
+		/* Get author */
+		if ( \IPS\Request::i()->author )
+		{
+			$author = \IPS\Member::load( \IPS\Request::i()->author );
+			if ( !$author->member_id )
+			{
+				throw new \IPS\Api\Exception( 'NO_AUTHOR', '1B301/3', 404 );
+			}
+		}
+		else
+		{
+			$author = new \IPS\Member;
+			$author->name = \IPS\Request::i()->author_name;
+		}
+		
+		/* Check we have a post */
+		if ( !\IPS\Request::i()->content )
+		{
+			throw new \IPS\Api\Exception( 'NO_CONTENT', '1B301/4', 403 );
+		}
+		
+		/* Do it */
+		return $this->_create( $entry, $author );
+	}
+	
+	/**
+	 * POST /blog/comments/{id}
+	 * Edit a comment
+	 *
+	 * @param		int			$id				ID Number
+	 * @apiparam	int			author			The ID number of the member making the comment (0 for guest)
+	 * @apiparam	string		author_name		If author is 0, the guest name that should be used
+	 * @apiparam	string		content			The comment content as HTML (e.g. "<p>This is a comment.</p>")
+	 * @apiparam	int			hidden				1/0 indicating if the topic should be hidden
+	 * @throws		2B301/5		INVALID_ID			The comment ID does not exist
+	 * @throws		1B301/6		NO_AUTHOR			The author ID does not exist
+	 * @return		\IPS\blog\Entry\Comment
+	 */
+	public function POSTitem( $id )
+	{
+		try
+		{
+			/* Load */
+			$comment = \IPS\blog\Entry\Comment::load( $id );
+						
+			/* Do it */
+			try
+			{
+				return $this->_edit( $comment );
+			}
+			catch ( \InvalidArgumentException $e )
+			{
+				throw new \IPS\Api\Exception( 'NO_AUTHOR', '1B301/6', 400 );
+			}
+		}
+		catch ( \OutOfRangeException $e )
+		{
+			throw new \IPS\Api\Exception( 'INVALID_ID', '2B301/5', 404 );
+		}
+	}
+		
+	/**
+	 * DELETE /blog/comments/{id}
+	 * Deletes a comment
+	 *
+	 * @param		int			$id			ID Number
+	 * @throws		2B301/7		INVALID_ID	The comment ID does not exist
+	 * @return		void
+	 */
+	public function DELETEitem( $id )
+	{
+		try
+		{			
+			\IPS\blog\Entry\Comment::load( $id )->delete();
+			
+			return new \IPS\Api\Response( 200, NULL );
+		}
+		catch ( \OutOfRangeException $e )
+		{
+			throw new \IPS\Api\Exception( 'INVALID_ID', '2B301/7', 404 );
+		}
+	}
+}

applications/blog/api/entries.php

@@ -0,0 +1,266 @@
+<?php
+/**
+ * @brief		Blog Entries API
+ * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
+ * @license		http://www.invisionpower.com/legal/standards/
+ * @package		IPS Community Suite
+ * @subpackage	Blog
+ * @since		9 Dec 2015
+ * @version		SVN_VERSION_NUMBER
+ */
+
+namespace IPS\blog\api;
+
+/* To prevent PHP errors (extending class does not exist) revealing path */
+if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+{
+	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
+	exit;
+}
+
+/**
+ * @brief	Blog Entries API
+ */
+class _entries extends \IPS\Content\Api\ItemController
+{
+	/**
+	 * Class
+	 */
+	protected $class = 'IPS\blog\Entry';
+	
+	/**
+	 * GET /blog/entries
+	 * Get list of entries
+	 *
+	 * @apiparam	string	blogs			Comma-delimited list of blog IDs
+	 * @apiparam	string	authors			Comma-delimited list of member IDs - if provided, only entries started by those members are returned
+	 * @apiparam	int		locked			If 1, only entries which are locked are returned, if 0 only unlocked
+	 * @apiparam	int		hidden			If 1, only entries which are hidden are returned, if 0 only not hidden
+	 * @apiparam	int		pinned			If 1, only entries which are pinned are returned, if 0 only not pinned
+	 * @apiparam	int		featured		If 1, only entries which are featured are returned, if 0 only not featured
+	 * @apiparam	int		draft			If 1, only draft entries are returned, if 0 only published
+	 * @apiparam	string	sortBy			What to sort by. Can be 'date' for creation date, 'title' or leave unspecified for ID
+	 * @apiparam	string	sortDir			Sort direction. Can be 'asc' or 'desc' - defaults to 'asc'
+	 * @apiparam	int		page			Page number
+	 * @return		\IPS\Api\PaginatedResponse<IPS\blog\Entry>
+	 */
+	public function GETindex()
+	{
+		/* Where clause */
+		$where = array();
+		
+		/* Draft */
+		if ( isset( \IPS\Request::i()->draft ) )
+		{
+			$where[] = array( 'entry_status=?', \IPS\Request::i()->draft ? 'draft' : 'published' );
+		}
+				
+		/* Return */
+		return $this->_list( $where, 'blogs' );
+	}
+	
+	/**
+	 * GET /blog/entries/{id}
+	 * View comments on an entry
+	 *
+	 * @param		int		$id			ID Number
+	 * @apiparam	int		page		Page number
+	 * @throws		2B300/1	INVALID_ID	The entry ID does not exist
+	 * @return		\IPS\Api\PaginatedResponse<IPS\blog\Entry\Comment>
+	 */
+	public function GETitem( $id )
+	{
+		try
+		{
+			return $this->_comments( $id, 'IPS\blog\Entry\Comment' );
+		}
+		catch ( \OutOfRangeException $e )
+		{
+			throw new \IPS\Api\Exception( 'INVALID_ID', '2B300/1', 404 );
+		}
+	}
+	
+	/**
+	 * POST /blog/entries
+	 * Create an entry
+	 *
+	 * @reqapiparam	int					blog			The ID number of the blog the entry should be created in
+	 * @reqapiparam	int					author			The ID number of the member creating the entry (0 for guest)
+	 * @reqapiparam	string				title			The entry title
+	 * @reqapiparam	string				entry			The entry content as HTML (e.g. "<p>This is a blog entry.</p>")
+	 * @apiparam	bool				draft			If this is a draft
+	 * @apiparam	string				prefix			Prefix tag
+	 * @apiparam	string				tags			Comma-separated list of tags (do not include prefix)
+	 * @apiparam	datetime			date			The date/time that should be used for the entry date. If not provided, will use the current date/time
+	 * @apiparam	string				ip_address		The IP address that should be stored for the entry/post. If not provided, will use the IP address from the API request
+	 * @apiparam	int					locked			1/0 indicating if the entry should be locked
+	 * @apiparam	int					hidden			0 = unhidden; 1 = hidden, pending moderator approval; -1 = hidden (as if hidden by a moderator)
+	 * @apiparam	int					pinned			1/0 indicating if the entry should be pinned
+	 * @apiparam	int					featured		1/0 indicating if the entry should be featured
+	 * @throws		1B300/2				NO_BLOG			The blog ID does not exist
+	 * @throws		1B300/3				NO_AUTHOR		The author ID does not exist
+	 * @throws		1B300/4				NO_TITLE		No title was supplied
+	 * @throws		1B300/5				NO_CONTENT		No content was supplied
+	 * @return		\IPS\blog\Entry
+	 */
+	public function POSTindex()
+	{
+		/* Get blog */
+		try
+		{
+			$blog = \IPS\blog\Blog::load( \IPS\Request::i()->blog );
+		}
+		catch ( \OutOfRangeException $e )
+		{
+			throw new \IPS\Api\Exception( 'NO_BLOG', '1B300/2', 400 );
+		}
+		
+		/* Get author */
+		if ( \IPS\Request::i()->author )
+		{
+			$author = \IPS\Member::load( \IPS\Request::i()->author );
+			if ( !$author->member_id )
+			{
+				throw new \IPS\Api\Exception( 'NO_AUTHOR', '1B300/3', 400 );
+			}
+		}
+		else
+		{
+			$author = new \IPS\Member;
+		}
+		
+		/* Check we have a title and a description */
+		if ( !\IPS\Request::i()->title )
+		{
+			throw new \IPS\Api\Exception( 'NO_TITLE', '1B300/4', 400 );
+		}
+		if ( !\IPS\Request::i()->entry )
+		{
+			throw new \IPS\Api\Exception( 'NO_CONTENT', '1B300/5', 400 );
+		}
+		
+		/* Do it */
+		return new \IPS\Api\Response( 201, $this->_create( $blog, $author )->apiOutput() );
+	}
+	
+	/**
+	 * POST /blog/entries/{id}
+	 * Edit a blog entry
+	 *
+	 * @reqapiparam	int					blog			The ID number of the blog the entry should be created in
+	 * @reqapiparam	int					author			The ID number of the member creating the entry (0 for guest)
+	 * @reqapiparam	string				title			The entry title
+	 * @reqapiparam	string				entry			The entry content as HTML (e.g. "<p>This is a blog entry.</p>")
+	 * @apiparam	bool				draft			If this is a draft
+	 * @apiparam	string				prefix			Prefix tag
+	 * @apiparam	string				tags			Comma-separated list of tags (do not include prefix)
+	 * @apiparam	datetime			date			The date/time that should be used for the entry date. If not provided, will use the current date/time
+	 * @apiparam	string				ip_address		The IP address that should be stored for the entry/post. If not provided, will use the IP address from the API request
+	 * @apiparam	int					locked			1/0 indicating if the entry should be locked
+	 * @apiparam	int					hidden			0 = unhidden; 1 = hidden, pending moderator approval; -1 = hidden (as if hidden by a moderator)
+	 * @apiparam	int					pinned			1/0 indicating if the entry should be pinned
+	 * @apiparam	int					featured		1/0 indicating if the entry should be featured
+	 * @throws		2B300/6				INVALID_ID		The entry ID is invalid
+	 * @throws		1B300/7				NO_BLOG			The blog ID does not exist
+	 * @throws		1B300/8				NO_AUTHOR		The author ID does not exist
+	 * @return		\IPS\blog\Entry
+	 */
+	public function POSTitem( $id )
+	{
+		try
+		{
+			$entry = \IPS\blog\Entry::load( $id );
+			
+			/* New blog */
+			if ( isset( \IPS\Request::i()->blog ) and \IPS\Request::i()->blog != $entry->forum_id )
+			{
+				try
+				{
+					$newBlog = \IPS\blog\Blog::load( \IPS\Request::i()->blog );
+					$entry->move( $newBlog );
+				}
+				catch ( \OutOfRangeException $e )
+				{
+					throw new \IPS\Api\Exception( 'NO_BLOG', '1B300/7', 400 );
+				}
+			}
+			
+			/* New author */
+			if ( isset( \IPS\Request::i()->author ) )
+			{				
+				try
+				{
+					$member = \IPS\Member::load( \IPS\Request::i()->author );
+					if ( !$member->member_id )
+					{
+						throw new \OutOfRangeException;
+					}
+					
+					$entry->changeAuthor( $member );
+				}
+				catch ( \OutOfRangeException $e )
+				{
+					throw new \IPS\Api\Exception( 'NO_AUTHOR', '1B300/8', 400 );
+				}
+			}
+			
+			/* Everything else */
+			$this->_createOrUpdate( $entry );
+			
+			/* Save and return */
+			$entry->save();
+			return new \IPS\Api\Response( 200, $entry->apiOutput() );
+		}
+		catch ( \OutOfRangeException $e )
+		{
+			throw new \IPS\Api\Exception( 'INVALID_ID', '2B300/6', 404 );
+		}
+	}
+
+	/**
+	 * Create or update entry
+	 *
+	 * @param	\IPS\Content\Item	$item	The item
+	 * @return	\IPS\Content\Item
+	 */
+	protected function _createOrUpdate( \IPS\Content\Item $item )
+	{
+		/* Is draft */
+		if ( isset( \IPS\Request::i()->draft ) )
+		{
+			$item->status = \IPS\Request::i()->draft ? 'draft' : 'published';
+		}
+		
+		/* Content */
+		if ( isset( \IPS\Request::i()->entry ) )
+		{
+			$item->content = \IPS\Request::i()->entry;
+		}
+		
+		/* Pass up */
+		return parent::_createOrUpdate( $item );
+	}
+		
+	/**
+	 * DELETE /blog/entries/{id}
+	 * Delete an entry
+	 *
+	 * @param		int		$id			ID Number
+	 * @throws		2B300/9	INVALID_ID	The entry ID does not exist
+	 * @return		void
+	 */
+	public function DELETEitem( $id )
+	{
+		try
+		{
+			\IPS\blog\Entry::load( $id )->delete();
+			
+			return new \IPS\Api\Response( 200, NULL );
+		}
+		catch ( \OutOfRangeException $e )
+		{
+			throw new \IPS\Api\Exception( 'INVALID_ID', '2B300/9', 404 );
+		}
+	}
+}

applications/blog/data/acpsearch.json

@@ -1 +1,163 @@
-{"app=blog&module=blogs&controller=settings&searchResult=form_blog_enable_rating":{"lang_key":"blog_enable_rating","restriction":"settings_manage","keywords":["blog ratings"]},"app=blog&module=blogs&controller=settings&searchResult=form_blog_allow_rssimport":{"lang_key":"blog_allow_rssimport","restriction":"settings_manage","keywords":["blog rss import"]},"app=blog&module=blogs&controller=settings&searchResult=form_blog_allow_rss":{"lang_key":"blog_allow_rss","restriction":"settings_manage","keywords":["blog rss export"]},"app=blog&module=blogs&controller=settings":{"lang_key":"menu__blog_blogs_settings","restriction":"settings_manage","keywords":["blog settings"]},"app=blog&module=blogs&controller=blogs":{"lang_key":"menu__blog_blogs_blogs","restriction":"blogs_manage","keywords":["blogs","manage blogs","group blogs"]}}
+{
+    "app=blog&module=blogs&controller=blogs": {
+        "lang_key": "menu__blog_blogs_blogs",
+        "restriction": "blogs_manage",
+        "keywords": [
+            "blogs",
+            "group blogs",
+            "manage blogs",
+			"блоги",
+			"управление блогами",
+			"групповые блоги"
+        ]
+    },
+    "app=blog&module=blogs&controller=blogs&do=form": {
+        "lang_key": "menu__blog_blogs_blogs",
+        "restriction": "blogs_manage",
+        "keywords": [
+            "add blog",
+			"создать блог",
+			"добавить блог"
+        ]
+    },
+    "app=blog&module=blogs&controller=blogs&searchResult=blog_desc_wrap": {
+        "lang_key": "blog_desc",
+        "restriction": "blogs_manage",
+        "keywords": [
+            "blog description",
+			"описание блога"
+        ]
+    },
+    "app=blog&module=blogs&controller=blogs&searchResult=blog_member_id": {
+        "lang_key": "blog_member_id",
+        "restriction": "blogs_manage",
+        "keywords": [
+            "blog author",
+			"автор блога"
+        ]
+    },
+    "app=blog&module=blogs&controller=blogs&searchResult=blog_name": {
+        "lang_key": "blog_name",
+        "restriction": "blogs_manage",
+        "keywords": [
+            "blog name",
+			"название блога",
+			"имя блога"
+        ]
+    },
+    "app=blog&module=blogs&controller=blogs&searchResult=form_1_blog_enable_rss": {
+        "lang_key": "blog_enable_rss",
+        "restriction": "blogs_manage",
+        "keywords": [
+            "blog rss feed",
+			"rss лента",
+			"rss лента блога"
+        ]
+    },
+    "app=blog&module=blogs&controller=blogs&searchResult=form_1_blog_type": {
+        "lang_key": "blog_type",
+        "restriction": "blogs_manage",
+        "keywords": [
+            "blog author",
+            "group blog",
+			"автор блога",
+			"блог группы",
+			"групповой блог"
+        ]
+    },
+    "app=blog&module=blogs&controller=blogs&searchResult=form_new_blog_enable_rss": {
+        "lang_key": "blog_enable_rss",
+        "restriction": "blogs_manage",
+        "keywords": [
+            "blog rss feed",
+            "rss feed",
+			"rss лента",
+			"rss лента блога"
+        ]
+    },
+    "app=blog&module=blogs&controller=blogs&searchResult=form_new_blog_type": {
+        "lang_key": "blog_type",
+        "restriction": "blogs_manage",
+        "keywords": [
+            "blog type",
+            "group blog",
+			"тип блога",
+			"блог группы",
+			"групповой блог"
+        ]
+    },
+    "app=blog&module=blogs&controller=settings": {
+        "lang_key": "menu__blog_blogs_settings",
+        "restriction": "settings_manage",
+        "keywords": [
+            "blog settings",
+			"настройки блога"
+        ]
+    },
+    "app=blog&module=blogs&controller=settings&searchResult=form_blog_allow_rss": {
+        "lang_key": "blog_allow_rss",
+        "restriction": "settings_manage",
+        "keywords": [
+            "blog rss export",
+            "rss export",
+			"rss лента",
+			"rss лента блога",
+			"экспорт RSS"
+        ]
+    },
+    "app=blog&module=blogs&controller=settings&searchResult=form_blog_allow_rssimport": {
+        "lang_key": "blog_allow_rssimport",
+        "restriction": "settings_manage",
+        "keywords": [
+            "blog rss import",
+            "rss import",
+			"импорт rss",
+			"rss импорт",
+			"rss импорт блога"
+        ]
+    },
+    "app=blog&module=blogs&controller=settings&searchResult=form_blog_enable_rating": {
+        "lang_key": "blog_enable_rating",
+        "restriction": "settings_manage",
+        "keywords": [
+            "blog ratings",
+            "ratings",
+			"рейтинги блога",
+			"рейтинг",
+			"рейтинги"
+        ]
+    },
+    "app=core&module=members&controller=groups&searchResult=4_g_blog_allowlocal": {
+        "lang_key": "g_blog_allowlocal",
+        "restriction": "groups_manage",
+        "keywords": [
+            "blogs",
+            "blogs permission",
+            "create blogs",
+            "post blogs",
+            "создать блог",
+            "блоги",
+            "создавать блоги"
+        ]
+    },
+    "app=core&module=members&controller=groups&searchResult=g_blog_allowdelete": {
+        "lang_key": "g_blog_allowdelete",
+        "restriction": "groups_manage",
+        "keywords": [
+            "delete blogs",
+            "delete own blogs",
+            "удаление блога",
+            "удалять свои блоги",
+            "удалить свой блог"
+        ]
+    },
+    "app=core&module=members&controller=groups&searchResult=g_blog_allowprivate": {
+        "lang_key": "g_blog_allowprivate",
+        "restriction": "groups_manage",
+        "keywords": [
+            "private blogs",
+            "приватные блоги",
+            "личные блоги"
+        ]
+    }
+}

applications/blog/data/emails.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <emails><template><template_app>blog</template_app><template_name>digests__item</template_name><template_content_html><![CDATA[<tr style='border-bottom: 1px solid #eeeeee'>
 	<td dir='{dir}' width='40' align='center' valign='top' class=' '>
-		<img src='{$entry->author()->photo}' width='32' height='32' style='border: 1px solid #000; vertical-align: middle;'>
+		<img src='{$entry->author()->get_photo( true, true )}' width='32' height='32' style='border: 1px solid #000; vertical-align: middle;'>
 	</td>
 	<td dir='{dir}' align='left'>
 		<p style='font-family: "Helvetica Neue", helvetica, sans-serif; margin: 0; font-size: 13px; font-weight: bold'>
@@ -17,7 +17,7 @@
 		<p style='font-family: "Helvetica Neue", helvetica, sans-serif; margin: 0; font-size: 13px; margin-bottom: 15px'>
 
 			{{if \IPS\Settings::i()->blog_enable_rating}}
-				{{foreach range( 1, 5 ) as $i}}{{if $i <= $entry->averageRating()}}<img src='{resource="email/rating_on.png" location="interface" app="core"}' width='14' height='13' style='vertical-align: middle; margin-right: 2px'>{{else}}<img src='{resource="email/rating_off.png" location="interface" app="core"}' width='14' height='13' style='vertical-align: middle; margin-right: 2px'>{{endif}}{{endforeach}}
+				{{foreach range( 1, 5 ) as $i}}{{if $i <= $entry->averageRating()}}<img src='{resource="email/rating_on.png" location="interface" app="core"}' width='14' height='13' style='vertical-align: middle; margin-right: 2px'>{{elseif ( $i - 0.5 ) <= $entry->averageRating()}}<img src='{resource="email/rating_half.png" location="interface" app="core"}' width='14' height='13' style='vertical-align: middle; margin-right: 2px'>{{else}}<img src='{resource="email/rating_off.png" location="interface" app="core"}' width='14' height='13' style='vertical-align: middle; margin-right: 2px'>{{endif}}{{endforeach}}
 				&nbsp;&nbsp;
  			{{endif}}	
 			<strong style='font-family: "Helvetica Neue", helvetica, sans-serif; font-size: 13px;'>
@@ -28,7 +28,7 @@
 </tr>]]></template_content_html><template_data>$entry, $email</template_data><template_content_plaintext><![CDATA[{$email->language->addToStack("x_created_entry_in", FALSE, array( 'sprintf' => array( $entry->author()->name, $entry->container()->_title ) ) )}: {$entry->title} ({$entry->url()})
 ]]></template_content_plaintext></template><template><template_app>blog</template_app><template_name>digests__comment</template_name><template_content_html><![CDATA[<tr style='border-bottom: 1px solid #eeeeee'>
 	<td dir='{dir}' width='40' align='center' valign='top' class=' '>
-		<img src='{$comment->author()->photo}' width='32' height='32' style='border: 1px solid #000; vertical-align: middle;'>
+		<img src='{$comment->author()->get_photo( true, true )}' width='32' height='32' style='border: 1px solid #000; vertical-align: middle;'>
 	</td>
 	<td dir='{dir}' align='left'>
 		<p style='font-family: "Helvetica Neue", helvetica, sans-serif; margin: 0; font-size: 13px; font-weight: bold'>
@@ -38,7 +38,7 @@
 			<a href='{$comment->item()->url()}' style='text-decoration: none;'>{$comment->item()->name}</a>
 		</h2>
 		<div style='font-family: "Helvetica Neue", helvetica, sans-serif; line-height: 22px; margin-top: 5px; margin-bottom: 5px; border-left: 3px solid #8c8c8c; padding-left: 15px; font-size: 14px; margin-left: 15px'>
-			{$email->parseTextForEmail( $comment->content() )|raw}
+			{$email->parseTextForEmail( $comment->content(), $email->language )|raw}
 		</div>
 	</td>
 </tr>]]></template_content_html><template_data>$comment, $email</template_data><template_content_plaintext><![CDATA[{$email->language->addToStack("x_commented_entry", FALSE, array( 'sprintf' => array( $comment->author()->name ) ) )}: {$comment->item()->name} ({$comment->url()})

applications/blog/data/furl.json

@@ -38,7 +38,7 @@
 		    "friendly": "entry/{#id}-{?}", 
 		    "real": "app=blog&module=blogs&controller=entry",
 		    "verify": "\\IPS\\blog\\Entry",
-		    "alias": "blog/{#blogid}/entry-{#id}-{?}"
+		    "alias": "blog/{!}/entry-{#id}-{?}"
 	    },
 	    "blog_submit": {
 	        "friendly": "submit",

applications/blog/data/javascript.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <javascript app="blog">
- <file javascript_app="blog" javascript_location="front" javascript_path="controllers/browse" javascript_name="ips.browse.list.js" javascript_type="controller" javascript_version="101012" javascript_position="1000050">/**
- * IPS Social Suite 4
+ <file javascript_app="blog" javascript_location="front" javascript_path="controllers/browse" javascript_name="ips.browse.list.js" javascript_type="controller" javascript_version="101093" javascript_position="1000050">/**
+ * IPS Community Suite 4
  * (c) 2013 Invision Power Services - http://www.invisionpower.com
  *
  * ips.browse.list.js - Blog browse list controller
@@ -30,6 +30,7 @@
 	});
 }(jQuery, _));</file>
  <order app="global" path="/dev/js//framework/">templates
+common/ips.loader.js
 common/ui
 common/utils
 common
@@ -43,6 +44,4 @@ app.js</order>
  <order app="global" path="/dev/js//library//jquery">jquery.js
 jquery.history.js
 jquery.transform.js</order>
- <order app="global" path="/dev/js//library//xregexp">xregexp-all.js
-xregexp-lookbehind.js</order>
 </javascript>

applications/blog/data/lang.xml

@@ -1,33 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <language>
- <app key="blog" version="101012">
+ <app key="blog" version="101093">
   <word key="__app_blog" js="0">Blogs</word>
   <word key="frontnavigation_blogs" js="0">Blogs</word>
   <word key="__indefart_blog_entry_comment" js="0">a comment on a blog entry</word>
   <word key="__indefart_blog_entry" js="0">a blog entry</word>
+  <word key="__defart_blog_entry_comment" js="0">comment on a blog entry</word>
+  <word key="__defart_blog_entry" js="0">blog entry</word>
   <word key="blog_entry_container" js="0">blog</word>
+  <word key="blog_entry_pl_lc" js="0">blog entries</word>
   <word key="module__blog_blogs" js="0">Blogs</word>
   <word key="menu__blog_blogs" js="0">Blogs</word>
   <word key="menu__blog_blogs_settings" js="0">Settings</word>
   <word key="menu__blog_blogs_blogs" js="0">Blogs</word>
   <word key="acp_search_title_blog_Blogs" js="0">Blogs</word>
   <word key="acplog__entries_published" js="0">Automatically published blog entries (%s published)</word>
-  <word key="filestorage__blog_Entries" js="0">IP.Blog Entries</word>
+  <word key="filestorage__blog_Entries" js="0">Blog Entries</word>
   <word key="add_blog" js="0">Add Blog</word>
   <word key="block_blog_Overview" js="0">Blog Overview</word>
   <word key="editor__blog_Blogs" js="0">Blogs</word>
   <word key="editor__blog_Entries" js="0">Blog Entries</word>
-  <word key="task__blogrssimport" js="0">Checks RSS/Atom feeds for new articles and imports into Blog.</word>
+  <word key="task__blogrssimport" js="0">Checks RSS/Atom feeds for new articles and imports into Blogs.</word>
   <word key="filestorage__blog_Blogs" js="0">Blog Cover Photos</word>
   <word key="entry_blog_id" js="0">Blog</word>
   <word key="r__blogs" js="0">Blogs</word>
   <word key="r__blog_settings_manage" js="0">Can edit blog settings?</word>
   <word key="r__blogs_manage" js="0">Can manage blogs?</word>
+  <word key="blog_member_deleted" js="0">Member has been deleted</word>
+  <word key="rebuilding_blog_entry_images" js="0">Rebuilding blog entry images</word>
   <word key="acplogs__blog_settings" js="0">Updated blog settings</word>
   <word key="blog_enable_rating" js="0">Enable blog ratings?</word>
   <word key="blog_settings_rss" js="0">RSS Settings</word>
   <word key="blog_allow_rssimport" js="0">Allow RSS imports</word>
   <word key="blog_allow_rss" js="0">Allow RSS exports</word>
+  <word key="blog_allow_rss_desc" js="0"><![CDATA[Only content that is available to guests will be shown. For more options, create a <a href='{internal.app=core&module=discovery&controller=rss}'>Custom RSS Feed</a>]]></word>
   <word key="blogs" js="0">Blogs</word>
   <word key="blog_word_custom" js="0">Blog Name</word>
   <word key="blog_blog_member_id" js="0">Blog Author</word>
@@ -41,13 +47,18 @@
   <word key="add_blog_entry" js="0">Add Blog Entry</word>
   <word key="entry_pl" js="0">Blog Entries</word>
   <word key="blog_entry_comment_pl" js="0">Blog Comments</word>
+  <word key="blog_entry_comment_pl_lc" js="0">blog comments</word>
   <word key="entry_comments" js="0">Comments</word>
   <word key="blog_num_views" js="0">{!# [1:view][?:views]}</word>
   <word key="manage_blog" js="0">Manage Blog</word>
   <word key="select_blog" js="0">Select Blog</word>
+  <word key="search_contextual_item_blogs" js="0">This Blog</word>
+  <word key="search_contextual_item_blog_entry" js="0">This Entry</word>
   <word key="blog_settings" js="0">Blog Settings</word>
   <word key="blog_name" js="0">Name</word>
+  <word key="blog_name_group" js="0">Name</word>
   <word key="blog_desc" js="0">Description</word>
+  <word key="blog_desc_group" js="0">Description</word>
   <word key="blog_desc_placeholder" js="0">Add a description...</word>
   <word key="blog_type" js="0">Type</word>
   <word key="blog_type_normal" js="0">Single author</word>
@@ -58,12 +69,14 @@
   <word key="blog_groupblog_name" js="0">Group Name</word>
   <word key="blog_groupblog_name_desc" js="0">Used in place of the owner's name when viewing a Group Blog.</word>
   <word key="edit_blog" js="0">Edit Blog</word>
-  <word key="delete_blog" js="0">Delete</word>
+  <word key="delete_blog" js="0">Delete Blog</word>
   <word key="blog_privacy" js="0">Privacy</word>
   <word key="blog_privacy_open" js="0">Everyone can read this blog</word>
   <word key="blog_privacy_private" js="0">Only the members I choose can read this blog</word>
   <word key="blog_social_group" js="0">Members allowed to read this blog</word>
   <word key="no_blog_author_selected" js="0">No Blog Author selected</word>
+  <word key="modlog__action_delete_blog" js="0">Deleted Blog %s</word>
+  <word key="delete_blog_confirm" js="0">Are you sure you want to delete this blog?</word>
   <word key="submit_entry" js="0">Submit New Blog Entry</word>
   <word key="blog_entry_title" js="0">Title</word>
   <word key="blog_entry_tags" js="0">Tags</word>
@@ -79,7 +92,7 @@
   <word key="entry_submit" js="0">Submit Entry</word>
   <word key="entry_information" js="0">Entry Details</word>
   <word key="blog_entry__save" js="0">Save</word>
-  <word key="immediately" js="0">Immediately</word>
+  <word key="entry_ip_address" js="0">IP Address</word>
   <word key="entry_gallery_album" js="0">Album</word>
   <word key="entry_gallery_album_desc" js="0">You can associate an album from the Gallery with this entry to display images alongside the entry content</word>
   <word key="block_entryFeed" js="0">Blog Entry Feed</word>
@@ -92,6 +105,8 @@
   <word key="block_blogStatistics_desc" js="0">Shows general blog statistics</word>
   <word key="total_blogs" js="0">Total Blogs</word>
   <word key="total_entries" js="0">Total Entries</word>
+  <word key="block_recentEntries" js="0">Recent Entries</word>
+  <word key="block_recentEntries_desc" js="0">Shows recent entries</word>
   <word key="prev_entry" js="0">Previous entry</word>
   <word key="next_entry" js="0">Next entry</word>
   <word key="blog_entry__comment_placeholder" js="0">Add a comment...</word>
@@ -135,7 +150,7 @@
   <word key="this_is_group" js="0">This is a group blog</word>
   <word key="unread_blog" js="0">This entry is unread</word>
   <word key="read_blog" js="0">You've read this entry</word>
-  <word key="go_to_blog" js="0">Go to the blog &quot;%s&quot;</word>
+  <word key="go_to_blog" js="0">Go to the blog %s</word>
   <word key="latest_entry" js="0">Latest Entry</word>
   <word key="no_entries" js="0">No blog entries have been created</word>
   <word key="pin_blog" js="0">Pin</word>
@@ -172,7 +187,8 @@
   <word key="most_recent_entry" js="0">Most recent entry</word>
   <word key="blog_byline_nodate" js="0">A blog by %s</word>
   <word key="blog_last_entry_date" js="0">Last entry posted %s</word>
-  <word key="digest_area_entry" js="0">Entries</word>
+  <word key="digest_area_blog_blog" js="0">Blogs</word>
+  <word key="digest_area_blog_entry" js="0">Entries</word>
   <word key="x_created_entry_in" js="0">%s posted a blog entry in %s</word>
   <word key="x_commented_entry" js="0">%s commented on an entry</word>
   <word key="loc_blog_viewing_index" js="0">Browsing Blogs</word>
@@ -219,5 +235,8 @@
   <word key="widget__blog_edate" js="0">Last entry date</word>
   <word key="widget__blog_count_entries" js="0">Number of entries</word>
   <word key="widget__blog_count_comments" js="0">Number of comments</word>
+  <word key="__api_blog_comments" js="0">Comments</word>
+  <word key="__api_blog_entries" js="0">Entries</word>
+  <word key="__api_blog_blogs" js="0">Blogs</word>
  </app>
 </language>

applications/blog/data/lang_rus.xml

@@ -0,0 +1,242 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<language>
+ <app key="blog" version="101093">
+  <word key_rus="Блоги" key="__app_blog" js="0">Blogs</word>
+  <word key_rus="Блоги" key="frontnavigation_blogs" js="0">Blogs</word>
+  <word key_rus="комментарий на запись в блоге" key="__indefart_blog_entry_comment" js="0">a comment on a blog entry</word>
+  <word key_rus="блог" key="blog_entry_container" js="0">blog</word>
+  <word key_rus="записи блога" key="blog_entry_pl_lc" js="0">blog entries</word>
+  <word key_rus="запись в блоге" key="__indefart_blog_entry" js="0">a blog entry</word>
+  <word key_rus="комментарий к записи блога" key="__defart_blog_entry_comment" js="0">comment on a blog entry</word>
+  <word key_rus="запись блога" key="__defart_blog_entry" js="0">blog entry</word>
+  <word key_rus="Блоги" key="module__blog_blogs" js="0">Blogs</word>
+  <word key_rus="Блоги" key="menu__blog_blogs" js="0">Blogs</word>
+  <word key_rus="Настройки" key="menu__blog_blogs_settings" js="0">Settings</word>
+  <word key_rus="Блоги" key="menu__blog_blogs_blogs" js="0">Blogs</word>
+  <word key_rus="Блоги" key="acp_search_title_blog_Blogs" js="0">Blogs</word>
+  <word key_rus="Автоматически опубликованные записи блога (%s опубликовано)" key="acplog__entries_published" js="0">Automatically published blog entries (%s published)</word>
+  <word key_rus="Записи блогов" key="filestorage__blog_Entries" js="0">Blog Entries</word>
+  <word key_rus="Добавить блог" key="add_blog" js="0">Add Blog</word>
+  <word key_rus="Обзор блога" key="block_blog_Overview" js="0">Blog Overview</word>
+  <word key_rus="Блоги" key="editor__blog_Blogs" js="0">Blogs</word>
+  <word key_rus="Записи блога" key="editor__blog_Entries" js="0">Blog Entries</word>
+  <word key_rus="Проверка RSS/Atom лент на новые статьи и импорт в Блоги." key="task__blogrssimport" js="0">Checks RSS/Atom feeds for new articles and imports into Blogs.</word>
+  <word key_rus="Обложки блогов" key="filestorage__blog_Blogs" js="0">Blog Cover Photos</word>
+  <word key_rus="Блог" key="entry_blog_id" js="0">Blog</word>
+  <word key_rus="Блоги" key="r__blogs" js="0">Blogs</word>
+  <word key_rus="Можно редактировать настройки блога?" key="r__blog_settings_manage" js="0">Can edit blog settings?</word>
+  <word key_rus="Можно управлять блогами?" key="r__blogs_manage" js="0">Can manage blogs?</word>
+  <word key_rus="Пользователь был удалён" key="blog_member_deleted" js="0">Member has been deleted</word>
+  <word key_rus="Перестроение изображений записей блога" key="rebuilding_blog_entry_images" js="0">Rebuilding blog entry images</word>
+  <word key_rus="Обновленные настройки блога" key="acplogs__blog_settings" js="0">Updated blog settings</word>
+  <word key_rus="Включить рейтинги блогов?" key="blog_enable_rating" js="0">Enable blog ratings?</word>
+  <word key_rus="Настройки RSS" key="blog_settings_rss" js="0">RSS Settings</word>
+  <word key_rus="Разрешить RSS импорт" key="blog_allow_rssimport" js="0">Allow RSS imports</word>
+  <word key_rus="Разрешить RSS экспорт" key="blog_allow_rss" js="0">Allow RSS exports</word>
+  <word key_rus="Будет отображён контент, доступный для гостей. Для получения дополнительных возможностей, создайте &lt;a href='{internal.app=core&amp;module=discovery&amp;controller=rss}'&gt;Пользовательскую RSS ленту&lt;/a&gt;" key="blog_allow_rss_desc" js="0"><![CDATA[Only content that is available to guests will be shown. For more options, create a <a href='{internal.app=core&module=discovery&controller=rss}'>Custom RSS Feed</a>]]></word>
+  <word key_rus="Блоги" key="blogs" js="0">Blogs</word>
+  <word key_rus="Название блога" key="blog_word_custom" js="0">Blog Name</word>
+  <word key_rus="Автор блога" key="blog_blog_member_id" js="0">Blog Author</word>
+  <word key_rus="Блог" key="blogs_sg" js="0">Blog</word>
+  <word key_rus="Создать блог" key="create_blog" js="0">Create a blog</word>
+  <word key_rus="Создать новый блог" key="create_new_blog" js="0">Create a new blog</word>
+  <word key_rus="Добавить запись в блог" key="add_entry_to" js="0">Add entry to a blog</word>
+  <word key_rus="Запись блога" key="blog_entry" js="0">Blog Entry</word>
+  <word key_rus="Записи блога" key="blog_entry_pl" js="0">Blog Entries</word>
+  <word key_rus="Комментарии блога" key="blog_entry_comment" js="0">Blog Comment</word>
+  <word key_rus="Добавить запись" key="add_blog_entry" js="0">Add Blog Entry</word>
+  <word key_rus="Записи блога" key="entry_pl" js="0">Blog Entries</word>
+  <word key_rus="Комментарии блога" key="blog_entry_comment_pl" js="0">Blog Comments</word>
+  <word key_rus="комментарии блога" key="blog_entry_comment_pl_lc" js="0">blog comments</word>
+  <word key_rus="Комментарии" key="entry_comments" js="0">Comments</word>
+  <word key_rus="{!# [*1:просмотр][*2:просмотра][*3:просмотра][*4:просмотра][11:просмотров][12:просмотров][13:просмотров][14:просмотров][?:просмотров]}" key="blog_num_views" js="0">{!# [1:view][?:views]}</word>
+  <word key_rus="Управление блогом" key="manage_blog" js="0">Manage Blog</word>
+  <word key_rus="Выбор блога" key="select_blog" js="0">Select Blog</word>
+  <word key_rus="Этот блог" key="search_contextual_item_blogs" js="0">This Blog</word>
+  <word key_rus="Эта запись" key="search_contextual_item_blog_entry" js="0">This Entry</word>
+  <word key_rus="Настройки блога" key="blog_settings" js="0">Blog Settings</word>
+  <word key_rus="Название" key="blog_name" js="0">Name</word>
+  <word key_rus="Название" key="blog_name_group" js="0">Name</word>
+  <word key_rus="Описание" key="blog_desc" js="0">Description</word>
+  <word key_rus="Описание" key="blog_desc_group" js="0">Description</word>
+  <word key_rus="Добавить описание..." key="blog_desc_placeholder" js="0">Add a description...</word>
+  <word key_rus="Тип" key="blog_type" js="0">Type</word>
+  <word key_rus="Один автор" key="blog_type_normal" js="0">Single author</word>
+  <word key_rus="Группа" key="blog_type_group" js="0">Group</word>
+  <word key_rus="Групповые блоги управляются всеми пользователям выбранных групп." key="blog_type_group_desc" js="0">Group blogs are jointly managed by all members in selected groups.</word>
+  <word key_rus="Группы" key="blog_groupblog_ids" js="0">Groups</word>
+  <word key_rus="Автор" key="blog_member_id" js="0">Author</word>
+  <word key_rus="Название группы" key="blog_groupblog_name" js="0">Group Name</word>
+  <word key_rus="Используется вместо имени владельца при просмотре группового блога." key="blog_groupblog_name_desc" js="0">Used in place of the owner's name when viewing a Group Blog.</word>
+  <word key_rus="Изменить блог" key="edit_blog" js="0">Edit Blog</word>
+  <word key_rus="Удалить блог" key="delete_blog" js="0">Delete Blog</word>
+  <word key_rus="Приватность" key="blog_privacy" js="0">Privacy</word>
+  <word key_rus="Все пользователи могут читать этот блог" key="blog_privacy_open" js="0">Everyone can read this blog</word>
+  <word key_rus="Только выбранные мной пользователи могут читать этот блог" key="blog_privacy_private" js="0">Only the members I choose can read this blog</word>
+  <word key_rus="Кто может читать этот блог" key="blog_social_group" js="0">Members allowed to read this blog</word>
+  <word key_rus="Автор блога не выбран" key="no_blog_author_selected" js="0">No Blog Author selected</word>
+  <word key_rus="Удалён блог %s" key="modlog__action_delete_blog" js="0">Deleted Blog %s</word>
+  <word key_rus="Вы уверены, что хотите удалить этот блог?" key="delete_blog_confirm" js="0">Are you sure you want to delete this blog?</word>
+  <word key_rus="Создать новую запись в блоге" key="submit_entry" js="0">Submit New Blog Entry</word>
+  <word key_rus="Название" key="blog_entry_title" js="0">Title</word>
+  <word key_rus="Теги" key="blog_entry_tags" js="0">Tags</word>
+  <word key_rus="Автоподписка" key="blog_entry_auto_follow" js="0">Auto Follow</word>
+  <word key_rus="Сообщить мне при публикации комментариев" key="blog_entry_auto_follow_suffix" js="0">Notify me when other comments are posted</word>
+  <word key_rus="Контент" key="blog_entry_content" js="0">Content</word>
+  <word key_rus="Дата публикации" key="blog_entry_date" js="0">Publish Time</word>
+  <word key_rus="Опубликовать" key="blog_entry_publish" js="0">Publish</word>
+  <word key_rus="Запись блога" key="blog_entry_mainTab" js="0">Blog Entry</word>
+  <word key_rus="Опрос" key="blog_entry_pollTab" js="0">Poll</word>
+  <word key_rus="" key="blog_entry_poll" js="0"></word>
+  <word key_rus="Добавить запись в блог" key="create_blog_entry" js="0">Create Blog Entry</word>
+  <word key_rus="Добавить запись" key="entry_submit" js="0">Submit Entry</word>
+  <word key_rus="Детали записи" key="entry_information" js="0">Entry Details</word>
+  <word key_rus="Сохранить" key="blog_entry__save" js="0">Save</word>
+  <word key_rus="IP-адрес" key="entry_ip_address" js="0">IP Address</word>
+  <word key_rus="Альбом" key="entry_gallery_album" js="0">Album</word>
+  <word key_rus="Вы можете связать альбом из Галереи с этой записью для отображения изображений рядом с содержимым данной записи" key="entry_gallery_album_desc" js="0">You can associate an album from the Gallery with this entry to display images alongside the entry content</word>
+  <word key_rus="Лента записей блогов" key="block_entryFeed" js="0">Blog Entry Feed</word>
+  <word key_rus="Создание ленты записей из блогов" key="block_entryFeed_desc" js="0">Create a feed of blog entries</word>
+  <word key_rus="Блоги" key="widget_feed_container_blog_entry" js="0">Blogs</word>
+  <word key_rus="Последние комментарии из ваших блогов" key="block_latestComments" js="0">Latest Comments From Your Blogs</word>
+  <word key_rus="Отображение списка последних комментариев" key="block_latestComments_desc" js="0">Shows a list of latest comments from the logged in member's blogs</word>
+  <word key_rus="Просмотр записи %s" key="view_this_entry" js="0">View the entry %s</word>
+  <word key_rus="Статистика Блогов" key="block_blogStatistics" js="0">Blog Statistics</word>
+  <word key_rus="Отображение основной статистики блогов" key="block_blogStatistics_desc" js="0">Shows general blog statistics</word>
+  <word key_rus="Всего блогов" key="total_blogs" js="0">Total Blogs</word>
+  <word key_rus="Всего записей" key="total_entries" js="0">Total Entries</word>
+  <word key_rus="Последние записи" key="block_recentEntries" js="0">Recent Entries</word>
+  <word key_rus="Отображение последних записей блогов" key="block_recentEntries_desc" js="0">Shows recent entries</word>
+  <word key_rus="Предыдущая запись" key="prev_entry" js="0">Previous entry</word>
+  <word key_rus="Следующая запись" key="next_entry" js="0">Next entry</word>
+  <word key_rus="Добавить комментарий..." key="blog_entry__comment_placeholder" js="0">Add a comment...</word>
+  <word key_rus="Добавить комментарий" key="blog_entry_submit_comment" js="0">Submit Comment</word>
+  <word key_rus="Действия" key="entry_actions" js="0">Entry Actions</word>
+  <word key_rus="Изменить эту запись" key="edit_title_blog" js="0">Edit this blog entry</word>
+  <word key_rus="Сделать популярной эту запись" key="feature_title_blog" js="0">Feature this blog entry</word>
+  <word key_rus="Сделать эту запись непопулярной" key="unfeature_title_blog" js="0">Unfeature this blog entry</word>
+  <word key_rus="Закрепить эту запись" key="pin_title_blog" js="0">Pin this blog entry</word>
+  <word key_rus="Открепить эту запись" key="unpin_title_blog" js="0">Unpin this blog entry</word>
+  <word key_rus="Скрыть  эту запись" key="hide_title_blog" js="0">Hide this blog entry</word>
+  <word key_rus="Показать  эту запись" key="unhide_title_blog" js="0">Unhide this blog entry</word>
+  <word key_rus="Заблокировать  эту запись" key="blog_lock_title" js="0">Lock this blog entry</word>
+  <word key_rus="Разблокировать  эту запись" key="blog_unlock_title" js="0">Unlock this blog entry</word>
+  <word key_rus="Переместить  эту запись" key="blog_move_title" js="0">Move this blog entry</word>
+  <word key_rus="Удалить  эту запись" key="blog_delete_title" js="0">Delete this blog entry</word>
+  <word key_rus="Одобрить  эту запись" key="approve_title_blog" js="0">Approve this blog entry</word>
+  <word key_rus="Жалоба" key="report_entry" js="0">Report Entry</word>
+  <word key_rus="Неопубликовано" key="unpublished" js="0">Unpublished</word>
+  <word key_rus="Эта запись блога заблокирована, но вы можете добавлять новые комментарии к ней." key="blog_entry_locked_can_comment" js="0">This blog entry is locked, but your permissions allow you to add new comments.</word>
+  <word key_rus="Эта запись блога заблокирована для комментирования." key="blog_entry_locked_cannot_comment" js="0">This blog entry is now closed to further comments.</word>
+  <word key_rus="Запись опубликовал %s" key="entry_posted" js="0">Entry posted by %s</word>
+  <word key_rus="%s опубликовует запись" key="entry_future_posted" js="0">Entry by %s publishes on</word>
+  <word key_rus="Изображения" key="entry_images" js="0">Images</word>
+  <word key_rus="{!#[*1:комментарий][*2:комментария][*3:комментария][*4:комментария][11:комментариев][12:комментариев][13:комментариев][14:комментариев][?:комментариев]}" key="blog_comments" js="0">{!#[1:comment][?:comments]}</word>
+  <word key_rus="{!#[*1:запись][*2:записи][*3:записи][*4:записи][11:записей][12:записей][13:записей][14:записей][?:записей]}" key="blog_entries" js="0">{!#[1:entry][?:entries]}</word>
+  <word key_rus="{!#[*1:просмотр][*2:просмотра][*3:просмотра][*4:просмотра][11:просмотров][12:просмотров][13:просмотров][14:просмотров][?:просмотров]}" key="blog_views" js="0">{!#[1:view][?:views]}</word>
+  <word key_rus="Последние записи" key="recent_entries" js="0">Recent Entries</word>
+  <word key_rus="Популярные записи" key="featured_entries" js="0">Featured Entries</word>
+  <word key_rus="Блоги нашего сообщества" key="our_community_blogs" js="0">Our community blogs</word>
+  <word key_rus="Мои блоги" key="my_blogs" js="0">My Blogs</word>
+  <word key_rus="Блоги с записями" key="blogs_with_content" js="0">Blogs With Entries</word>
+  <word key_rus="По последней записи" key="sort_last_edate" js="0">Last Entry</word>
+  <word key_rus="По рейтингу" key="sort_rating_total" js="0">Rating</word>
+  <word key_rus="Из блога" key="from_the_blog" js="0">From the blog</word>
+  <word key_rus="Просмотреть больше записей из %s" key="see_more_entries" js="0">See more entries from %s</word>
+  <word key_rus="В блоге ещё нет записей" key="no_entries_yet" js="0">No blog entries yet</word>
+  <word key_rus="Подробнее о данной записи" key="read_more_entry" js="0">Read more of this entry</word>
+  <word key_rus="Просмотр комментариев этой записи" key="see_comments_on_entry" js="0">See comments for this entry</word>
+  <word key_rus="Добавить новую запись" key="add_entry" js="0">Add new entry</word>
+  <word key_rus="Это групповой блог" key="this_is_group" js="0">This is a group blog</word>
+  <word key_rus="Запись не прочитана" key="unread_blog" js="0">This entry is unread</word>
+  <word key_rus="Вы прочитали эту запись" key="read_blog" js="0">You've read this entry</word>
+  <word key_rus="Перейти в блог %s" key="go_to_blog" js="0">Go to the blog %s</word>
+  <word key_rus="Последняя запись" key="latest_entry" js="0">Latest Entry</word>
+  <word key_rus="Ни одной записи в блоге ещё не создано" key="no_entries" js="0">No blog entries have been created</word>
+  <word key_rus="Закрепить" key="pin_blog" js="0">Pin</word>
+  <word key_rus="Открепить" key="unpin_blog" js="0">Unpin</word>
+  <word key_rus="Блог %s" key="blog_by" js="0">A blog by %s</word>
+  <word key_rus="Групповой блог %s" key="group_blog_by" js="0">A group blog by %s</word>
+  <word key_rus="Авторы этого блога" key="contributors_to_this" js="0">Contributors to this blog</word>
+  <word key_rus="О блоге" key="about_this_blog" js="0">About this blog</word>
+  <word key_rus="Записи в этом блоге" key="entries_in_this_blog" js="0">Entries in this blog</word>
+  <word key_rus="RSS лента отключена" key="blog_rss_offline" js="0">RSS feed disabled</word>
+  <word key_rus="Эта RSS лента отключена, т.к. настройка &quot;Разрешить RSS экспорт&quot; в настоящее время неактивна в админцентре или отключена в настройках блога." key="blog_rss_offline_admin" js="0">This RSS feed is disabled either because the setting &quot;Allow RSS exports&quot; is currently disabled in the ACP or it is disabled in the individual blog settings.</word>
+  <word key_rus="Включить RSS ленту" key="blog_enable_rss" js="0">Enable RSS Feed</word>
+  <word key_rus="Разрешить этому блогу присутствовать в RSS ленте" key="blog_enable_rss_desc" js="0">Allow this blog to be syndicated with others by enabling RSS</word>
+  <word key_rus="Последние записи" key="blog_rss_title" js="0">Latest Entries</word>
+  <word key_rus="Импорт RSS/Atom" key="blog_rss_import" js="0">Atom/RSS Import</word>
+  <word key_rus="URL" key="blog_rss_import_url" js="0">URL</word>
+  <word key_rus="Имя пользователя HTTP авторизации" key="blog_rss_import_auth_user" js="0">HTTP Authorization Username</word>
+  <word key_rus="Большинство лент не запрашивают авторизацию и вы может оставить это поле пустым." key="blog_rss_import_auth_user_desc" js="0">Most feeds do not require authorization and you can leave this blank.</word>
+  <word key_rus="Пароль HTTP авторизации" key="blog_rss_import_auth_pass" js="0">HTTP Authorization Password</word>
+  <word key_rus="Большинство лент не запрашивают авторизацию и вы может оставить это поле пустым." key="blog_rss_import_auth_pass_desc" js="0">Most feeds do not require authorization and you can leave this blank.</word>
+  <word key_rus="Теги" key="blog_rss_import_tags" js="0">Tags</word>
+  <word key_rus="Текст ссылки" key="blog_rss_import_show_link" js="0">Text to use for link</word>
+  <word key_rus="Появится в нижней части сообщения, ссылаясь на оригинал статьи." key="blog_rss_import_show_link_desc" js="0">Will appear at the bottom of the post, linking to the original article.</word>
+  <word key_rus="Посмотреть полный текст статьи" key="blog_rss_import_show_link_default" js="0">View the full article</word>
+  <word key_rus="Включить импорт RSS" key="blog_enable_rss_import" js="0">Enable RSS import</word>
+  <word key_rus="Импорт записей из внешних источников" key="blog_enable_rss_import_desc" js="0">Import entries from an external source using RSS</word>
+  <word key_rus="Запись блога" key="embed_blog_entry" js="0">Blog Entry</word>
+  <word key_rus="Блог" key="embed_blog" js="0">Blog</word>
+  <word key_rus="Посмотреть этот блог" key="view_this_blog" js="0">View this blog</word>
+  <word key_rus="Блоги" key="user_blogs" js="0">Blogs</word>
+  <word key_rus="Блоги" key="profile_blog_blog" js="0">Blogs</word>
+  <word key_rus="Также содействует с:" key="also_contributes" js="0">Also contributes to:</word>
+  <word key_rus="Содействует с" key="contributes_to" js="0">Contributes To</word>
+  <word key_rus="Последняя запись" key="most_recent_entry" js="0">Most recent entry</word>
+  <word key_rus="Блог %s" key="blog_byline_nodate" js="0">A blog by %s</word>
+  <word key_rus="Последняя запись размещена %s" key="blog_last_entry_date" js="0">Last entry posted %s</word>
+  <word key_rus="Блоги" key="digest_area_blog_blog" js="0">Blogs</word>
+  <word key_rus="Записи" key="digest_area_blog_entry" js="0">Entries</word>
+  <word key_rus="%s опубликовал запись блога в %s" key="x_created_entry_in" js="0">%s posted a blog entry in %s</word>
+  <word key_rus="%s прокомментировал запись" key="x_commented_entry" js="0">%s commented on an entry</word>
+  <word key_rus="Просмотр Блогов" key="loc_blog_viewing_index" js="0">Browsing Blogs</word>
+  <word key_rus="Создание блога" key="loc_blog_creating" js="0">Creating a Blog</word>
+  <word key_rus="Просмотр блога: %s" key="loc_blog_viewing_blog" js="0">Viewing Blog: %s</word>
+  <word key_rus="Добавление записи блога в: %s" key="loc_blog_adding_entry" js="0">Adding a Blog Entry in: %s</word>
+  <word key_rus="Просмотр записи: %s" key="loc_blog_viewing_entry" js="0">Viewing Entry: %s</word>
+  <word key_rus="Блоги" key="modperms__core_Content_blog_Entry" js="0">Blogs</word>
+  <word key_rus="Можно закреплять записи?" key="can_pin_blog_entry" js="0">Can pin entries?</word>
+  <word key_rus="Можно откреплять записи?" key="can_unpin_blog_entry" js="0">Can unpin entries?</word>
+  <word key_rus="Можно устанавливать записи популярными?" key="can_feature_blog_entry" js="0">Can feature entries?</word>
+  <word key_rus="Можно устанавливать записи непопулярными?" key="can_unfeature_blog_entry" js="0">Can unfeature entries?</word>
+  <word key_rus="Можно редактировать записи?" key="can_edit_blog_entry" js="0">Can edit entries?</word>
+  <word key_rus="Можно скрывать записи?" key="can_hide_blog_entry" js="0">Can hide entries?</word>
+  <word key_rus="Можно отображать записи?" key="can_unhide_blog_entry" js="0">Can unhide entries?</word>
+  <word key_rus="Можно просматривать скрытые записи?" key="can_view_hidden_blog_entry" js="0">Can view hidden entries?</word>
+  <word key_rus="Можно перемещать записи?" key="can_move_blog_entry" js="0">Can move entries?</word>
+  <word key_rus="Можно блокировать записи?" key="can_lock_blog_entry" js="0">Can lock entries?</word>
+  <word key_rus="Можно разблокировать записи?" key="can_unlock_blog_entry" js="0">Can unlock entries?</word>
+  <word key_rus="Можно отвечать на заблокированные записи?" key="can_reply_to_locked_blog_entry" js="0">Can reply to locked entries?</word>
+  <word key_rus="Можно удалять записи?" key="can_delete_blog_entry" js="0">Can delete entries?</word>
+  <word key_rus="Можно редактировать комментарии?" key="can_edit_blog_entry_comment" js="0">Can edit comments?</word>
+  <word key_rus="Можно скрывать комментарии?" key="can_hide_blog_entry_comment" js="0">Can hide comments?</word>
+  <word key_rus="Можно отображать комментарии?" key="can_unhide_blog_entry_comment" js="0">Can unhide comments?</word>
+  <word key_rus="Можно просматривать скрытые комментарии?" key="can_view_hidden_blog_entry_comment" js="0">Can view hidden comments?</word>
+  <word key_rus="Можно удалять комментарии?" key="can_delete_blog_entry_comment" js="0">Can delete comments?</word>
+  <word key_rus="Можно устанавливать дату будующих публикаций?" key="can_future_publish_blog_entry" js="0">Can set a future publishing date?</word>
+  <word key_rus="Можно просматривать записи блога других пользователей, ожидающие публикации?" key="can_view_future_blog_entry" js="0">Can view pending publishing blog entries authored by other members?</word>
+  <word key_rus="Блог" key="group__blog_Blog" js="0">Blog</word>
+  <word key_rus="Можно создавать блоги?" key="g_blog_allowlocal" js="0">Can create blogs?</word>
+  <word key_rus="Максимальное количество блогов" key="g_blog_maxblogs" js="0">Maximum number of blogs</word>
+  <word key_rus="Можно создавать приватные блоги?" key="g_blog_allowprivate" js="0">Can create private blogs?</word>
+  <word key_rus="Приватные блоги могут просматриваться только выбранными автором пользователями." key="g_blog_allowprivate_desc" js="0">Private blogs can only be seen by the members that the creator chooses.</word>
+  <word key_rus="Можно добавлять опросы к записям блога?" key="g_blog_allowpoll" js="0">Can add polls to blog entries?</word>
+  <word key_rus="Можно комментировать записи блога?" key="g_blog_allowcomment" js="0">Can comment on blog entries?</word>
+  <word key_rus="Можно модерировать записи собственного блога?" key="g_blog_allowownmod" js="0">Can moderate own blog entries?</word>
+  <word key_rus="Пользователь сможет: редактировать комментарии и записи, удалять комментарии и записи, и блокировать записи от комментирования." key="g_blog_allowownmod_desc" js="0">The user will be able to: edit comments and entries, delete comments and entries, and lock entries from further comments.</word>
+  <word key_rus="Можно удалять свои блоги?" key="g_blog_allowdelete" js="0">Can delete own blogs?</word>
+  <word key_rus="Комментарии в блогах" key="block_blogCommentFeed" js="0">Blog Comments</word>
+  <word key_rus="Отображение комментариев из блогов" key="block_blogCommentFeed_desc" js="0">Display comments from blogs.</word>
+  <word key_rus="Блоги" key="block_blogs" js="0">Blogs</word>
+  <word key_rus="Отображение списка блогов" key="block_blogs_desc" js="0">Display a list of blogs.</word>
+  <word key_rus="Последняя запись размещена" key="widget_blog_last_date" js="0">Last entry posted</word>
+  <word key_rus="Дата последней записи" key="widget__blog_edate" js="0">Last entry date</word>
+  <word key_rus="Количество записей" key="widget__blog_count_entries" js="0">Number of entries</word>
+  <word key_rus="Количество комментариев" key="widget__blog_count_comments" js="0">Number of comments</word>
+  <word key_rus="Комментарии" key="__api_blog_comments" js="0">Comments</word>
+  <word key_rus="Записи" key="__api_blog_entries" js="0">Entries</word>
+  <word key_rus="Блоги" key="__api_blog_blogs" js="0">Blogs</word>
+ </app>
+</language>

applications/blog/data/schema.json

@@ -23,10 +23,10 @@
                 "comment": "",
                 "decimals": null,
                 "default": "0",
-                "length": 8,
+                "length": 20,
                 "name": "blog_member_id",
-                "type": "MEDIUMINT",
-                "unsigned": false,
+                "type": "BIGINT",
+                "unsigned": true,
                 "values": [],
                 "zerofill": false
             },
@@ -184,20 +184,6 @@
                 "values": [],
                 "zerofill": false
             },
-            "blog_groupblog": {
-                "allow_null": false,
-                "auto_increment": false,
-                "binary": false,
-                "comment": "",
-                "decimals": null,
-                "default": "0",
-                "length": 1,
-                "name": "blog_groupblog",
-                "type": "INT",
-                "unsigned": false,
-                "values": [],
-                "zerofill": false
-            },
             "blog_last_edate": {
                 "allow_null": false,
                 "auto_increment": false,
@@ -212,34 +198,6 @@
                 "values": [],
                 "zerofill": false
             },
-            "blog_owner_only": {
-                "allow_null": false,
-                "auto_increment": false,
-                "binary": false,
-                "comment": "",
-                "decimals": null,
-                "default": "0",
-                "length": 1,
-                "name": "blog_owner_only",
-                "type": "INT",
-                "unsigned": false,
-                "values": [],
-                "zerofill": false
-            },
-            "blog_authorized_users": {
-                "allow_null": true,
-                "auto_increment": false,
-                "binary": false,
-                "comment": "",
-                "decimals": null,
-                "default": null,
-                "length": 255,
-                "name": "blog_authorized_users",
-                "type": "VARCHAR",
-                "unsigned": false,
-                "values": [],
-                "zerofill": false
-            },
             "blog_count_entries": {
                 "allow_null": false,
                 "auto_increment": false,
@@ -297,18 +255,18 @@
                 "zerofill": false
             },
             "blog_rating_average": {
-                "allow_null": false,
-                "auto_increment": false,
-                "binary": false,
-                "comment": "",
-                "decimals": null,
-                "default": "0",
-                "length": 11,
                 "name": "blog_rating_average",
-                "type": "INT",
-                "unsigned": true,
+                "type": "DECIMAL",
+                "length": 11,
+                "decimals": 1,
                 "values": [],
-                "zerofill": false
+                "allow_null": false,
+                "default": "0",
+                "comment": "",
+                "unsigned": true,
+                "zerofill": false,
+                "auto_increment": false,
+                "binary": false
             },
             "blog_cover_photo": {
                 "allow_null": true,
@@ -365,6 +323,34 @@
                 "unsigned": true,
                 "values": [],
                 "zerofill": false
+            },
+            "blog_name": {
+                "name": "blog_name",
+                "type": "TEXT",
+                "length": null,
+                "decimals": null,
+                "values": [],
+                "allow_null": true,
+                "default": null,
+                "comment": "",
+                "unsigned": false,
+                "zerofill": false,
+                "auto_increment": false,
+                "binary": false
+            },
+            "blog_desc": {
+                "name": "blog_desc",
+                "type": "TEXT",
+                "length": null,
+                "decimals": null,
+                "values": [],
+                "allow_null": true,
+                "default": null,
+                "comment": "",
+                "unsigned": false,
+                "zerofill": false,
+                "auto_increment": false,
+                "binary": false
             }
         },
         "indexes": {
@@ -378,16 +364,6 @@
                     "blog_id"
                 ]
             },
-            "blog_groupblog": {
-                "type": "key",
-                "name": "blog_groupblog",
-                "length": [
-                    null
-                ],
-                "columns": [
-                    "blog_groupblog"
-                ]
-            },
             "blog_grabber": {
                 "type": "key",
                 "name": "blog_grabber",
@@ -428,18 +404,6 @@
                     "blog_member_id"
                 ]
             },
-            "auth_user": {
-                "type": "key",
-                "name": "auth_user",
-                "length": [
-                    null,
-                    190
-                ],
-                "columns": [
-                    "blog_owner_only",
-                    "blog_authorized_users"
-                ]
-            },
             "as_list_view": {
                 "type": "key",
                 "name": "as_list_view",
@@ -457,8 +421,7 @@
                 ]
             }
         },
-        "collation": "utf8mb4_unicode_ci",
-        "engine": "InnoDB"
+        "collation": "utf8mb4_unicode_ci"
     },
     "blog_entries": {
         "name": "blog_entries",
@@ -548,18 +511,18 @@
                 "zerofill": false
             },
             "entry_content": {
-                "allow_null": true,
-                "auto_increment": false,
-                "binary": false,
-                "comment": "",
-                "decimals": null,
-                "default": null,
-                "length": 0,
                 "name": "entry_content",
-                "type": "TEXT",
-                "unsigned": false,
+                "type": "MEDIUMTEXT",
+                "length": 0,
+                "decimals": null,
                 "values": [],
-                "zerofill": false
+                "allow_null": true,
+                "default": null,
+                "comment": "",
+                "unsigned": false,
+                "zerofill": false,
+                "auto_increment": false,
+                "binary": false
             },
             "entry_status": {
                 "allow_null": true,
@@ -1027,10 +990,10 @@
                 "comment": "",
                 "decimals": null,
                 "default": null,
-                "length": 10,
+                "length": 20,
                 "name": "comment_member_id",
-                "type": "INT",
-                "unsigned": false,
+                "type": "BIGINT",
+                "unsigned": true,
                 "values": [],
                 "zerofill": false
             },
@@ -1319,8 +1282,8 @@
             },
             "rss_member": {
                 "name": "rss_member",
-                "type": "MEDIUMINT",
-                "length": 8,
+                "type": "BIGINT",
+                "length": 20,
                 "decimals": null,
                 "values": [],
                 "allow_null": false,

applications/blog/data/theme.xml

@@ -4,7 +4,7 @@
 <div class='ipsBox ipsSpacer_bottom'>
 	<h2 class='ipsType_sectionTitle ipsType_reset'>{lang="featured_entries"}</h2>
 	<div class='ipsClearfix'>
-		<div class="cFeaturedTopics ipsCarousel ipsClearfix" data-ipsCarousel data-ipsCarousel-fullSizeItems data-ipsCarousel-shadows='false'>
+		<div class="cFeaturedTopics ipsCarousel ipsClearfix" data-ipsCarousel data-ipsCarousel-slideshow data-ipsCarousel-fullSizeItems data-ipsCarousel-shadows='false'>
 			<ul class='cTopicCarousel ipsClearfix ipsList_reset' data-role='carouselItems'>
 				{{foreach $featured as $entry}}
 					<li class='ipsCarousel_item ipsAreaBackground_reset ipsClearfix'>
@@ -121,14 +121,14 @@
 							<ul class='ipsDataList ipsDataList_reducedSpacing ipsType_medium ipsList_reset ipsType_light'>
 								{{foreach $blog->_recentEntries as $entry}}
 									<li class='ipsDataItem'>
-										<div class='ipsDataItem_main'>
+										<div class='ipsDataItem_main ipsType_break ipsContained'>
 											{{if $entry->unread()}}
 												<a href='{$entry->url()}' title='{lang="view_this_entry" sprintf="$entry->name"}' class=''>
 													<span class='ipsItemStatus ipsItemStatus_tiny'><i class='fa fa-circle'></i></span>
 												</a>
 											{{endif}}
-											<a href='{$entry->url()}' title='{lang="view_this_entry" sprintf="$entry->name"}' class='ipsType_break'>
-												{wordbreak="$entry->name"}
+											<a href='{$entry->url()}' title='{lang="view_this_entry" sprintf="$entry->name"}'>
+												{truncate="$entry->name" length="50"}
 											</a>
 										</div>
 									</li>
@@ -148,33 +148,35 @@
 							{template="userPhoto" app="core" params="$blog->latestEntry()->author(), 'mini'" group="global"}
 							<div>
 								<strong class='ipsType_minorHeading'>{lang="latest_entry"}</strong><br>
-								<h3 class='ipsType_reset ipsType_sectionHead ipsType_blendLinks'>
-									{{if $blog->latestEntry()->locked()}}<i class='fa fa-lock'></i> {{endif}}{$blog->latestEntry()->caption}
+								<h3 class='ipsType_reset ipsType_sectionHead ipsType_blendLinks ipsContained_container'>
+									{{if $blog->latestEntry()->locked()}}<span><i class='fa fa-lock'></i></span> {{endif}}{$blog->latestEntry()->caption}
 										{{if $blog->latestEntry()->isFutureDate() || $blog->latestEntry()->mapped('pinned') || $blog->latestEntry()->mapped('featured') || $blog->latestEntry()->hidden() === -1 || $blog->latestEntry()->hidden() === 1 || $blog->latestEntry()->status === 'draft'}}
 										{{if $blog->latestEntry()->isFutureDate()}}
-											<span class="ipsBadge ipsBadge_icon ipsBadge_warning" data-ipsTooltip title='{$blog->latestEntry()->futureDateBlurb()}'><i class='fa fa-clock-o'></i></span>
+											<span><span class="ipsBadge ipsBadge_icon ipsBadge_warning" data-ipsTooltip title='{$blog->latestEntry()->futureDateBlurb()}'><i class='fa fa-clock-o'></i></span></span>
 										{{elseif $blog->latestEntry()->hidden() === -1}}
-											<span class="ipsBadge ipsBadge_icon ipsBadge_warning" data-ipsTooltip title='{$blog->latestEntry()->hiddenBlurb()}'><i class='fa fa-eye-slash'></i></span>
+											<span><span class="ipsBadge ipsBadge_icon ipsBadge_warning" data-ipsTooltip title='{$blog->latestEntry()->hiddenBlurb()}'><i class='fa fa-eye-slash'></i></span></span>
 										{{elseif $blog->latestEntry()->hidden() === 1}}
-											<span class="ipsBadge ipsBadge_icon ipsBadge_warning" data-ipsTooltip title='{lang="pending_approval"}'><i class='fa fa-warning'></i></span>
+											<span><span class="ipsBadge ipsBadge_icon ipsBadge_warning" data-ipsTooltip title='{lang="pending_approval"}'><i class='fa fa-warning'></i></span></span>
 										{{endif}}
 										{{if $blog->latestEntry()->status === 'draft'}}
-											<span class="ipsBadge ipsBadge_icon ipsBadge_warning" data-ipsTooltip title='{lang="unpublished"}'><i class='fa fa-pencil-square-o'></i></span>
+											<span><span class="ipsBadge ipsBadge_icon ipsBadge_warning" data-ipsTooltip title='{lang="unpublished"}'><i class='fa fa-pencil-square-o'></i></span></span>
 										{{endif}}
 										{{if $blog->latestEntry()->mapped('pinned')}}
-											<span class="ipsBadge ipsBadge_icon ipsBadge_positive" data-ipsTooltip title='{lang="pinned"}'><i class='fa fa-thumb-tack'></i></span>
+											<span><span class="ipsBadge ipsBadge_icon ipsBadge_positive" data-ipsTooltip title='{lang="pinned"}'><i class='fa fa-thumb-tack'></i></span></span>
 										{{endif}}
 										{{if $blog->latestEntry()->mapped('featured')}}
-											<span class="ipsBadge ipsBadge_icon ipsBadge_positive" data-ipsTooltip title='{lang="featured"}'><i class='fa fa-star'></i></span>
+											<span><span class="ipsBadge ipsBadge_icon ipsBadge_positive" data-ipsTooltip title='{lang="featured"}'><i class='fa fa-star'></i></span></span>
 										{{endif}}
 									{{endif}}
 									
-									<a href='{$blog->latestEntry()->url()}' title='{lang="view_this_entry" sprintf="$blog->latestEntry()->name"}'>
-										{{if $blog->latestEntry()->unread()}}
-											<span class='ipsItemStatus' data-ipsTooltip title="{lang="unread_blog"}"><i class="fa fa-circle"></i></span>
-										{{endif}}
-										{wordbreak="$blog->latestEntry()->name"}
-									</a>
+									<div class='ipsType_break ipsContained'>
+										<a href='{$blog->latestEntry()->url()}' title='{lang="view_this_entry" sprintf="$blog->latestEntry()->name"}' class='ipsTruncate ipsTruncate_line'>
+											{{if $blog->latestEntry()->unread()}}
+												<span class='ipsItemStatus' data-ipsTooltip title="{lang="unread_blog"}"><i class="fa fa-circle"></i></span>
+											{{endif}}
+											{$blog->latestEntry()->name}
+										</a>
+									</div>
 								</h3>
 								{{if !( $blog->owner() instanceof \IPS\Member )}}
 									<p class='ipsType_medium ipsType_reset ipsType_light'>{lang="byline" htmlsprintf="trim( $blog->latestEntry()->author()->link() )"} {datetime="$blog->latestEntry()->date"}</p>
@@ -189,7 +191,7 @@
 								<strong><a href='{$blog->latestEntry()->url()}' title='{lang="read_more_entry"}'>{lang="read_more"}</a></strong>
 							</li>
 							{{if \IPS\Settings::i()->blog_enable_rating}}
-								<li>{template="rating" app="core" params="'small', $blog->latestEntry()->averageRating()" group="global"}</li>
+								<li>{template="rating" app="core" params="'small', $blog->latestEntry()->averageRating(), 5, $blog->latestEntry()->memberRating()" group="global"}</li>
 							{{endif}}
 							{{if !$blog->latestEntry()->num_comments}}
 								<li class='ipsType_light'>{lang="num_comments" pluralize="$blog->latestEntry()->num_comments"}</li>
@@ -249,7 +251,7 @@
 	</div>
 
 	<div class='ipsEmbedded_content'>
-		<div class='ipsPhotoPanel ipsPhotoPanel_mini ipsClearfix ipsType_medium'>
+		<div class='ipsPhotoPanel ipsPhotoPanel_notPhone ipsPhotoPanel_mini ipsClearfix ipsType_medium'>
 			{{if $blog->owner() instanceof \IPS\Member}}
 				{template="userPhoto" group="global" app="core" params="$blog->owner(), 'mini', NULL, '', FALSE"}
 			{{endif}}
@@ -281,7 +283,7 @@
 		<div class='ipsColumns ipsColumns_collapsePhone'>
 			<div class='ipsColumn ipsColumn_fluid'>
 				<h3 class='ipsType_sectionHead ipsType_break ipsTruncate ipsTruncate_line'>
-					<a href='{$blog->url()}'>{lang="blogs_blog_{$blog->id}" wordbreak="true"}</a> {{if $showSmall && !($blog->owner() instanceof \IPS\Member)}}&nbsp;&nbsp;<span class='ipsType_light ipsType_medium' data-ipsTooltip title='{lang="this_is_group"}'><i class='fa fa-users'></i> {lang="byline_nodate" sprintf="\IPS\Member::loggedIn()->language()->addToStack( 'blogs_groupblog_name_' . $blog->id )"}</span>{{endif}}
+					<a href='{$blog->url()}'>{{if $blog->member_id}}{$blog->_title}{{else}}{lang="blogs_blog_{$blog->id}"}{{endif}}</a> {{if $showSmall && !($blog->owner() instanceof \IPS\Member)}}&nbsp;&nbsp;<span class='ipsType_light ipsType_medium' data-ipsTooltip title='{lang="this_is_group"}'><i class='fa fa-users'></i> {lang="byline_nodate" sprintf="\IPS\Member::loggedIn()->language()->addToStack( 'blogs_groupblog_name_' . $blog->id )"}</span>{{endif}}
 				</h3>
 				<ul class='ipsGrid cProfileBlog_stats'>
 					<li class='ipsGrid_span4'><strong class='ipsType_normal'>{$blog->_items}</strong><br>{lang="blog_entries" pluralize="$blog->_items"}</li>
@@ -296,12 +298,12 @@
 						{{if $blog->latestEntry()->unread()}}
 							<span class='ipsItemStatus' data-ipsTooltip title="{lang="unread_blog"}"><i class="fa fa-circle"></i></span>
 						{{endif}}
-						{wordbreak="$blog->latestEntry()->name"}
+						{$blog->latestEntry()->name}
 					</a>
 					<ul class='ipsList_inline ipsType_medium ipsType_light'>
 						<li>{datetime="$blog->latestEntry()->date"}</li>
 						{{if \IPS\Settings::i()->blog_enable_rating}}
-							<li>{template="rating" app="core" params="'small', $blog->latestEntry()->averageRating()" group="global"}</li>
+							<li>{template="rating" app="core" params="'small', $blog->latestEntry()->averageRating(), 5, $blog->latestEntry()->memberRating()" group="global"}</li>
 						{{endif}}
 						{{if !$blog->latestEntry()->num_comments}}
 							<li class='ipsType_light'>{lang="num_comments" pluralize="$blog->latestEntry()->num_comments"}</li>
@@ -357,8 +359,7 @@
 {template="pageHeader" if="!\IPS\Request::i()->isAjax()" group="global" app="core" params="\IPS\Member::loggedIn()->language()->addToStack( 'create_blog_entry' )"}
 {$form|raw}
 ]]></template>
- <template template_group="submit" template_name="submitFormTemplate" template_data="$id, $action, $elements, $hiddenValues, $actionButtons, $uploadField, $class=''" template_location="front" template_app="blog"><![CDATA[{{$modOptions=array('blog_entry_date');}}
-<form accept-charset='utf-8' class="ipsForm {$class}" action="{$action}" method="post" {{if $uploadField}}enctype="multipart/form-data"{{endif}} data-ipsForm>
+ <template template_group="submit" template_name="submitFormTemplate" template_data="$id, $action, $elements, $hiddenValues, $actionButtons, $uploadField, $class=''" template_location="front" template_app="blog"><![CDATA[<form accept-charset='utf-8' class="ipsForm {$class}" action="{$action}" method="post" {{if $uploadField}}enctype="multipart/form-data"{{endif}} data-ipsForm>
 	<input type="hidden" name="{$id}_submitted" value="1">
 	{{foreach $hiddenValues as $k => $v}}
 		<input type="hidden" name="{$k}" value="{$v}">
@@ -386,7 +387,7 @@
 				<div id='ipsTabs_tabs_{$id}_{$id}_tab_{$name}_panel' class="ipsTabs_panel ipsPad" aria-labelledby="{$id}_tab_{$name}" aria-hidden="false">
 					<ul class='ipsForm ipsForm_vertical'>
 						{{foreach $contents as $inputName => $input}}
-								{$input|raw}
+							{$input|raw}
 						{{endforeach}}
 					</ul>
 				</div>
@@ -396,9 +397,7 @@
 		<ul class='ipsForm ipsForm_vertical'>
 			{{foreach $elements as $collection}}
 				{{foreach $collection as $inputName => $input}}
-					{{if !in_array( $inputName, $modOptions )}}
-						{$input|raw}
-					{{endif}}
+					{$input|raw}
 				{{endforeach}}
 			{{endforeach}}
 		</ul>
@@ -432,7 +431,7 @@
 			</li>
 		</ul>
 	</div>
-	{{if !( $blog->owner() instanceof \IPS\Member )}}
+	{{if !( $blog->owner() instanceof \IPS\Member ) and count( $blog->contributors() )}}
 		<div class='cBlogContributors ipsClearfix ipsResponsive_hidePhone'>
 			<h2 class='ipsType_minorHeading'>{lang="contributors_to_this"}</h2>
 			<ul class='cBlogView_contributors'>
@@ -523,7 +522,7 @@
 	{{endif}}
 
 	{{if $table->canModerate()}}
-		<form action="{$table->baseUrl}" method="post" data-role='moderationTools' data-ipsPageAction>
+		<form action="{$table->baseUrl->csrf()}" method="post" data-role='moderationTools' data-ipsPageAction>
 			<div class='ipsClear ipsPad {{foreach $table->classes as $class}}{$class} {{endforeach}}' id='elTable_{$table->uniqueId}' data-role="tableRows" data-controller='blog.front.browse.list'>
 				{template="$table->rowsTemplate[1]" params="$table, $headers, $rows" object="$table->rowsTemplate[0]"}
 			</div>
@@ -611,7 +610,7 @@
 	{{endif}}
 </div>]]></template>
  <template template_group="view" template_name="blogViewLarge" template_data="$entry, $table, $first = FALSE" template_location="front" template_app="blog"><![CDATA[
-<article class='cBlogView_entry ipsContained {{if $entry->hidden()}}ipsModerated{{endif}}' data-controller="core.front.core.lightboxedImages">
+<article class='cBlogView_entry ipsContained ipsType_break {{if $entry->hidden()}}ipsModerated{{endif}}' data-controller="core.front.core.lightboxedImages">
 	<header class='ipsPhotoPanel ipsPhotoPanel_notPhone ipsPhotoPanel_small ipsSpacer_bottom'>
 		{template="userPhoto" app="core" params="$entry->author()" group="global"}
 		<div>
@@ -639,11 +638,11 @@
 				{{if $entry->prefix()}}
 					{template="prefix" group="global" app="core" params="$entry->prefix( TRUE ), $entry->prefix()"}
 				{{endif}}
-				<a href="{$entry->url()}" class='ipsType_blendLinks' title="{lang="read_more_about" sprintf="$entry->name"}" {{if $entry->canEdit()}}data-role="editableTitle"{{endif}}>
+				<a href="{$entry->url()}" class='ipsType_blendLinks' title="{lang="read_more_about" sprintf="$entry->name"} {{if $entry->canEdit()}}{lang="click_hold_edit"}{{endif}}" {{if $entry->canEdit()}}data-role="editableTitle"{{endif}}>
 					{{if $entry->unread()}}
 						<span class='ipsItemStatus' data-ipsTooltip title="{lang="unread_blog"}"><i class="fa fa-circle"></i></span>
 					{{endif}}
-					{{if $entry->canEdit()}}<span data-role="editableTitle">{wordbreak="$entry->name"}</span>{{else}}{wordbreak="$entry->name"}{{endif}}
+					{{if $entry->canEdit()}}<span data-role="editableTitle">{$entry->name}</span>{{else}}{$entry->name}{{endif}}
 				</a>
 			</h2>
 			<p class='ipsType_light ipsType_reset ipsType_blendLinks'>
@@ -653,7 +652,7 @@
 	</header>
 
 	<section class='ipsType_normal ipsType_richText ipsType_break ipsSpacer_both' data-ipsTruncate {{if $first}}data-ipsTruncate-size='20 lines'{{else}}data-ipsTruncate-size='7 lines'{{endif}}>
-		{$entry->content|raw}
+		{$entry->content()|raw}
 	</section>
 	{{if count( $entry->tags() )}}
 		<div class='ipsSpacer_top'>		
@@ -670,47 +669,49 @@
 		{{endif}}
 		<li><strong><a href='{$entry->url()}' title="{lang="read_more_about" sprintf="$entry->name"}">{lang="read_more"}</a></strong></li>
 		{{if \IPS\Settings::i()->blog_enable_rating}}
-			<li>{template="rating" app="core" params="'small', $entry->averageRating()" group="global"}</li>
+			<li>{template="rating" app="core" params="'small', $entry->averageRating(), 5, $entry->memberRating()" group="global"}</li>
 		{{endif}}
 		<li><a href='{$entry->url()}#comments' title='{lang="view_comments"}' class='ipsType_light'>{lang="num_comments" pluralize="$entry->num_comments"}</a></li>
 		<li class='ipsType_light'>{lang="num_views_with_number" pluralize="$entry->views"}</li>
 	</ul>		
 </article>]]></template>
  <template template_group="view" template_name="blogViewMedium" template_data="$entry, $table" template_location="front" template_app="blog"><![CDATA[
-<article class='cBlogView_entry ipsContained {{if $entry->hidden()}}ipsModerated{{endif}}' data-controller="core.front.core.lightboxedImages">
+<article class='cBlogView_entry {{if $entry->hidden()}}ipsModerated{{endif}}' data-controller="core.front.core.lightboxedImages">
 	<header class='ipsPhotoPanel ipsPhotoPanel_mini ipsPhotoPanel_notPhone'>
 		{template="userPhoto" app="core" params="$entry->author(), 'mini'" group="global"}
 		<div>
-			<h2 class='ipsType_sectionHead ipsType_blendLinks ipsTruncate ipsTruncate_line'>
+			<h2 class='ipsType_sectionHead ipsType_blendLinks ipsContained_container'>
 				{{if $entry->isFutureDate() || $entry->mapped('pinned') || $entry->mapped('featured') || $entry->hidden() === -1 || $entry->hidden() === 1}}
 					{{if $entry->isFutureDate() and $entry->status !== 'draft'}}
-						<span class="ipsBadge ipsBadge_icon ipsBadge_small ipsBadge_warning" data-ipsTooltip title='{$entry->futureDateBlurb()}'><i class='fa fa-clock-o'></i></span>
+						<span><span class="ipsBadge ipsBadge_icon ipsBadge_small ipsBadge_warning" data-ipsTooltip title='{$entry->futureDateBlurb()}'><i class='fa fa-clock-o'></i></span></span>
 					{{elseif $entry->hidden() === 1}}
-						<span class="ipsBadge ipsBadge_icon ipsBadge_small ipsBadge_warning" data-ipsTooltip title='{lang="pending_approval"}'><i class='fa fa-warning'></i></span>
+						<span><span class="ipsBadge ipsBadge_icon ipsBadge_small ipsBadge_warning" data-ipsTooltip title='{lang="pending_approval"}'><i class='fa fa-warning'></i></span></span>
 					{{endif}}
 					{{if $entry->mapped('pinned')}}
-						<span class="ipsBadge ipsBadge_icon ipsBadge_small ipsBadge_positive" data-ipsTooltip title='{lang="pinned"}'><i class='fa fa-thumb-tack'></i></span>
+						<span><span class="ipsBadge ipsBadge_icon ipsBadge_small ipsBadge_positive" data-ipsTooltip title='{lang="pinned"}'><i class='fa fa-thumb-tack'></i></span></span>
 					{{endif}}
 					{{if $entry->mapped('featured')}}
-						<span class="ipsBadge ipsBadge_icon ipsBadge_small ipsBadge_positive" data-ipsTooltip title='{lang="featured"}'><i class='fa fa-star'></i></span>
+						<span><span class="ipsBadge ipsBadge_icon ipsBadge_small ipsBadge_positive" data-ipsTooltip title='{lang="featured"}'><i class='fa fa-star'></i></span></span>
 					{{endif}}
 				{{endif}}
 				
 				{{if $entry->prefix()}}
-					{template="prefix" group="global" app="core" params="$entry->prefix( TRUE ), $entry->prefix()"}
+					<span>{template="prefix" group="global" app="core" params="$entry->prefix( TRUE ), $entry->prefix()"}</span>
 				{{endif}}
-				<a href="{$entry->url()}" title="{lang="read_more_about" sprintf="$entry->name"}" {{if $entry->canEdit()}}data-role="editableTitle"{{endif}}>
-					{{if $entry->unread()}}
-						<span class='ipsItemStatus' data-ipsTooltip title="{lang="unread_blog"}"><i class="fa fa-circle"></i></span>
-					{{endif}}
-					{wordbreak="$entry->name"}
-				</a>
+				<div class='ipsContained ipsType_break'>
+					<a href="{$entry->url()}" title="{lang="read_more_about" sprintf="$entry->name"} {{if $entry->canEdit()}}{lang="click_hold_edit"}{{endif}}" {{if $entry->canEdit()}}data-role="editableTitle"{{endif}}>
+						{{if $entry->unread()}}
+							<span class='ipsItemStatus' data-ipsTooltip title="{lang="unread_blog"}"><i class="fa fa-circle"></i></span>
+						{{endif}}
+						{$entry->name}
+					</a>
+				</div>
 			</h2>
 			<p class='ipsType_light ipsType_reset ipsType_blendLinks'>
 				{lang="byline" htmlsprintf="$entry->author()->link()"}{datetime="$entry->date"}
 			</p>
 			{{if \IPS\Settings::i()->blog_enable_rating}}
-				{template="rating" app="core" params="'large', $entry->averageRating()" group="global"}
+				{template="rating" app="core" params="'large', $entry->averageRating(), 5, $entry->memberRating()" group="global"}
 			{{endif}}	
 		</div>
 	</header>
@@ -732,12 +733,12 @@
 	</ul>		
 </article>]]></template>
  <template template_group="view" template_name="comments" template_data="$entry" template_location="front" template_app="blog"><![CDATA[<div class='ipsBox'>
-	<div data-controller='core.front.core.commentFeed' {{if settings.auto_polling_enabled}}data-autoPoll{{endif}} data-baseURL='{$entry->url()}' data-feedID='entry-{$entry->id}' id='comments'>
+	<div data-controller='core.front.core.commentFeed, core.front.core.ignoredComments' {{if settings.auto_polling_enabled}}data-autoPoll{{endif}} data-baseURL='{$entry->url()}' data-feedID='entry-{$entry->id}' id='comments'>
 		<div class='ipsPad'>
 			<h2 class='ipsType_sectionHead' data-role="comment_count">{lang="num_comments_uc" pluralize="$entry->num_comments"}</h2>
 			<hr class='ipsHr'>
 			{{if $entry->commentPageCount() > 1}}
-				{$entry->commentPagination()|raw}
+				{$entry->commentPagination( array('tab') )|raw}
 				<br><br>
 			{{endif}}
 			<div data-role='commentFeed' data-controller='core.front.core.moderation'>
@@ -761,7 +762,7 @@
 			</div>
 			{{if $entry->commentPageCount() > 1}}
 				<hr class='ipsHr'>
-				{$entry->commentPagination()|raw}
+				{$entry->commentPagination( array('tab') )|raw}
 			{{endif}}
 			{{if $entry->commentForm() || $entry->locked() || \IPS\Member::loggedin()->restrict_post || \IPS\Member::loggedIn()->members_bitoptions['unacknowledged_warnings']}}
 				<div class='ipsAreaBackground ipsPad ipsClear ipsSpacer_top' data-role='replyArea'>
@@ -783,7 +784,8 @@
 			{{endif}}
 		</div>
 	</div>
-</div>]]></template>
+</div>
+]]></template>
  <template template_group="view" template_name="coverPhotoOverlay" template_data="$blog" template_location="front" template_app="blog"><![CDATA[{{if ( $blog->owner() instanceof \IPS\Member ) && \IPS\Request::i()->module == 'view'}}
 	<div class='ipsPhotoPanel ipsPhotoPanel_mini'>
 		{template="userPhoto" group="global" app="core" params="$blog->owner(), 'mini'"}
@@ -814,33 +816,40 @@
 	{template="blogHeader" group="view" app="blog" params="$entry->container()"}
 </header>
 
-<article class='ipsBox ipsPad ipsSpacer_top'>
+<article class='ipsBox ipsPad ipsSpacer_top ipsType_break'>
 	<header>
-		<h1 class='ipsType_pageTitle ipsType_largeTitle ipsType_break'>
+		<h1 class='ipsType_pageTitle ipsType_largeTitle ipsContained_container'>
 			{{if $entry->isFutureDate() || $entry->mapped('pinned') || $entry->mapped('featured') || $entry->hidden() === -1 || $entry->hidden() === 1 || $entry->status === 'draft'}}
 				{{if $entry->isFutureDate() and $entry->status !== 'draft'}}
-					<span class="ipsBadge ipsBadge_icon ipsBadge_warning" data-ipsTooltip title='{$entry->futureDateBlurb()}'><i class='fa fa-clock-o'></i></span>
+					<span><span class="ipsBadge ipsBadge_icon ipsBadge_warning" data-ipsTooltip title='{$entry->futureDateBlurb()}'><i class='fa fa-clock-o'></i></span></span>
 				{{elseif $entry->hidden() === -1}}
-					<span class="ipsBadge ipsBadge_icon ipsBadge_warning" data-ipsTooltip title='{$entry->hiddenBlurb()}'><i class='fa fa-eye-slash'></i></span>
+					<span><span class="ipsBadge ipsBadge_icon ipsBadge_warning" data-ipsTooltip title='{$entry->hiddenBlurb()}'><i class='fa fa-eye-slash'></i></span></span>
 				{{elseif $entry->hidden() === 1}}
-					<span class="ipsBadge ipsBadge_icon ipsBadge_warning" data-ipsTooltip title='{lang="pending_approval"}'><i class='fa fa-warning'></i></span>
+					<span><span class="ipsBadge ipsBadge_icon ipsBadge_warning" data-ipsTooltip title='{lang="pending_approval"}'><i class='fa fa-warning'></i></span></span>
 				{{endif}}
 				{{if $entry->status === 'draft'}}
-					<span class="ipsBadge ipsBadge_icon ipsBadge_warning" data-ipsTooltip title='{lang="unpublished"}'><i class='fa fa-pencil-square-o'></i></span>
+					<span><span class="ipsBadge ipsBadge_icon ipsBadge_warning" data-ipsTooltip title='{lang="unpublished"}'><i class='fa fa-pencil-square-o'></i></span></span>
 				{{endif}}
 				{{if $entry->mapped('pinned')}}
-					<span class="ipsBadge ipsBadge_icon ipsBadge_positive" data-ipsTooltip title='{lang="pinned"}'><i class='fa fa-thumb-tack'></i></span>
+					<span><span class="ipsBadge ipsBadge_icon ipsBadge_positive" data-ipsTooltip title='{lang="pinned"}'><i class='fa fa-thumb-tack'></i></span></span>
 				{{endif}}
 				{{if $entry->mapped('featured')}}
-					<span class="ipsBadge ipsBadge_icon ipsBadge_positive" data-ipsTooltip title='{lang="featured"}'><i class='fa fa-star'></i></span>
+					<span><span class="ipsBadge ipsBadge_icon ipsBadge_positive" data-ipsTooltip title='{lang="featured"}'><i class='fa fa-star'></i></span></span>
 				{{endif}}
 			{{endif}}
 			
-			{{if $entry->prefix()}}
-				{template="prefix" group="global" app="core" params="$entry->prefix( TRUE ), $entry->prefix()"}
+			{{if $entry->prefix() OR ( $entry->canEdit() AND $entry::canTag() AND $entry::canPrefix() )}}
+				<span {{if !$entry->prefix()}}class='ipsHide'{{endif}} {{if ( $entry->canEdit() AND $entry::canTag() AND $entry::canPrefix() )}}data-editablePrefix{{endif}}>
+					{template="prefix" group="global" app="core" params="$entry->prefix( TRUE ), $entry->prefix()"}
+				</span>
+			{{endif}}
+			{{if $entry->canEdit()}}
+				<div class='ipsType_break ipsContained' data-controller="core.front.core.moderation">
+					{{if $entry->locked()}}<i class='fa fa-lock'></i> {{endif}}<span data-role="editableTitle" title='{lang="click_hold_edit"}'>{$entry->name}</span>
+				</div>
+			{{else}}
+				<div class='ipsType_break ipsContained'>{{if $entry->locked()}}<i class='fa fa-lock'></i> {{endif}}{$entry->name}</div>
 			{{endif}}
-			{wordbreak="$entry->name"}
-			{{if $entry->locked()}}<i class='fa fa-lock'></i> {{endif}}{$entry->caption}
 		</h1>
 		
 		<div class='ipsPhotoPanel ipsPhotoPanel_tiny ipsSpacer_top'>
@@ -854,8 +863,8 @@
 				{{if \IPS\Settings::i()->blog_enable_rating}}
 					{$entry->rating()|raw}
 				{{endif}}
-				{{if count( $entry->tags() )}}		
-					{template="tags" group="global" app="core" params="$entry->tags()"}
+				{{if count( $entry->tags() ) OR ( $entry->canEdit() AND $entry::canTag() )}}		
+					{template="tags" group="global" app="core" params="$entry->tags(), FALSE, FALSE, ( $entry->canEdit() AND $entry::canTag() ) ? $entry->url() : NULL"}
 				{{endif}}
 			</div>
 		</div>
@@ -867,7 +876,7 @@
 				{$poll|raw}
 			{{endif}}
 
-			{$entry->content|raw}
+			{$entry->content()|raw}
 		</div>
 		
 		{{if $entry->_album}}
@@ -929,7 +938,7 @@
 				{{endif}}
 			</ul>
 		{{endif}}
-		{{if !\IPS\Member::loggedIn()->group['gbw_no_report'] }}
+		{{if ! $entry->container()->social_group and !\IPS\Member::loggedIn()->group['gbw_no_report'] }}
 			&nbsp;&nbsp;<a href='{$entry->url('report')}' data-ipsDialog data-ipsDialog-size='medium' data-ipsDialog-title="{lang="report_entry"}" data-ipsDialog-remoteSubmit data-ipsDialog-flashMessage="{lang="report_submit_success"}" title="{lang="report_entry"}">{lang="report_entry"}</a>
 		{{endif}}
 
@@ -942,21 +951,21 @@
 
 {{if $previous or $next}}
 <nav class="ipsPager ipsGrid ipsClearFix ipsList_inline">
-	<div class="ipsGrid_span6 ipsPager_prev">
 	{{if $previous}}
-		<a href="{$previous->url()}" title="{lang="prev_entry"}" rel="prev">
-			<span class="ipsPager_type">{lang="prev_entry"}</span>
-			<span class="ipsPager_title ipsType_break">{wordbreak="$previous->name"}</span>
-		</a>
+		<div class="ipsGrid_span6 ipsPager_prev">
+			<a href="{$previous->url()}" title="{lang="prev_entry"}">
+				<span class="ipsPager_type">{lang="prev_entry"}</span>
+				<span class="ipsPager_title ipsTruncate ipsTruncate_line">{$previous->name}</span>
+			</a>
+		</div>
 	{{endif}}
-	</div>
 	{{if $next}}
-	<div class="ipsGrid_span6 ipsType_right ipsPager_next">
-		<a href="{$next->url()}" title="{lang="next_entry"}" rel="next">
-			<span class="ipsPager_type">{lang="next_entry"}</span>
-			<span class="ipsPager_title ipsType_break">{wordbreak="$next->name"}</span>
-		</a>		
-	</div>
+		<div class="ipsGrid_span6 ipsType_right ipsPager_next">
+			<a href="{$next->url()}" title="{lang="next_entry"}">
+				<span class="ipsPager_type">{lang="next_entry"}</span>
+				<span class="ipsPager_title ipsTruncate ipsTruncate_line">{$next->name}</span>
+			</a>
+		</div>
 	{{endif}}
 </nav>
 <hr class='ipsHr'>
@@ -976,7 +985,7 @@
 <div class='ipsType_center'>
 	<p class='ipsType_large'>{lang="no_entries"}</p>
 	{{if $container->can('add')}}
-		<a href='{url="app=blog&module=blog&controller=submit&id={$container->_id}" seoTemplate="blog_submit"}' class='ipsButton ipsButton_primary ipsButton_medium'>{lang="submit_entry"}</a>
+		<a href='{url="app=blog&module=blogs&controller=submit&id={$container->_id}" seoTemplate="blog_submit"}' class='ipsButton ipsButton_primary ipsButton_medium'>{lang="submit_entry"}</a>
 	{{endif}}
 </div>]]></template>
  <template template_group="view" template_name="rows" template_data="$table, $headers, $entries" template_location="front" template_app="blog"><![CDATA[{{if count( $entries ) > 0}}
@@ -1035,7 +1044,7 @@
 				<a href='#elBlogManage_menu' id='elBlogManage' data-ipsMenu class='ipsButton ipsButton_link ipsButton_medium ipsButton_fullWidth'>{lang="manage_blog"} <i class='fa fa-caret-down'></i></a>
 				<ul id='elBlogManage_menu' class='ipsMenu ipsMenu_normal ipsHide'>
 				
-					{{if $blog->canEdit() }}
+					{{if $blog->canEdit() AND !$blog->groupblog_ids}}
 						<li class='ipsMenu_item'>
 							<a href='{$blog->url()->setQueryString( array( 'do' => 'editBlog', 'csrfKey' => \IPS\Session::i()->csrfKey ) )}' title="{lang="edit_blog"}" data-ipsDialog data-ipsDialog-title="{lang="edit_blog"}">{lang="edit_blog"}</a>
 						</li>
@@ -1059,7 +1068,7 @@
 					
 					{{if $blog->canDelete() }}
 						<li class='ipsMenu_item'>
-							<a href='{$blog->url()->setQueryString( array( 'do' => 'deleteBlog', 'csrfKey' => \IPS\Session::i()->csrfKey ) )}' data-confirm title="{lang="delete_blog"}">{lang="delete_blog"}</a>
+							<a href='{$blog->url()->setQueryString( array( 'do' => 'deleteBlog', 'csrfKey' => \IPS\Session::i()->csrfKey ) )}' data-confirm title="{lang="delete_blog"}" data-confirmMessage="{lang="delete_blog_confirm"}" >{lang="delete_blog"}</a>
 						</li>
 					{{endif}}
 				</ul>
@@ -1084,7 +1093,7 @@
 							{template="userPhoto" group="global" app="core" params="$comment->author(), 'tiny'"}
 						</div>
 						<div class='ipsDataItem_main'>
-							<a href="{$comment->url()}" class='ipsType_medium ipsType_break'>{wordbreak="$comment->item()->name"}</a><br>
+							<div class='ipsType_break ipsContained'><a href="{$comment->url()}" class='ipsType_medium ipsTruncate ipsTruncate_line'>{$comment->item()->name}</a></div>
 							<p class='ipsType_reset ipsType_medium ipsType_light ipsType_blendLinks'>{lang="byline_nodate" htmlsprintf="$comment->author()->link()"} &middot; <a href="{$comment->url()}" class='ipsDataItem_title ipsType_break ipsType_blendLinks'>{$comment->dateLine()|raw}</a></p>
 							<div class='ipsType_medium ipsType_textBlock ipsType_richText ipsType_break ipsContained ipsSpacer_top ipsSpacer_half' data-ipsTruncate data-ipsTruncate-type='remove' data-ipsTruncate-size='{{if $orientation == 'vertical'}}6 lines{{else}}2 lines{{endif}}'>
 								{$comment->truncated( true )|raw}
@@ -1110,7 +1119,7 @@
 									{template="reputationBadge" group="global" app="core" params="$comment->author()"}
 								</h3>
 								<p class='ipsComment_meta ipsType_light ipsType_medium'>
-									<a href='{$comment->item()->url()->setQueryString( array( 'do' => 'findComment', 'comment' => $comment->id ) )}' class='ipsType_blendLinks' title='{lang="share_this_comment"}'>{$comment->dateLine()|raw}</a>
+									<a href='{$comment->item()->url()->setQueryString( array( 'do' => 'findComment', 'comment' => $comment->id ) )}' class='ipsType_blendLinks'>{$comment->dateLine()|raw}</a>
 									{{if $comment->editLine()}}
 										({lang="edited_lc"})
 									{{endif}}
@@ -1129,10 +1138,10 @@
 						</div>
 
 						<div class='ipsPad ipsClearfix'>
-							{{if in_array( 'IPS\Content\Reputation', class_implements( $comment ) ) and settings.reputation_highlight and $comment->reputation() >= settings.reputation_highlight}}
+							{{if in_array( 'IPS\Content\Reputation', class_implements( $comment ) ) and settings.reputation_highlight and $comment->reputation() >= settings.reputation_highlight and settings.reputation_enabled}}
 								<strong class='ipsComment_popularFlag' data-ipsTooltip title='{lang="this_is_a_popular_comment"}'><i class='fa fa-star'></i></strong>
 							{{endif}}
-							<a href="{$comment->url()}" class='ipsDataItem_title ipsType_break'>{wordbreak="$comment->item()->name"}</a><br>
+							<div class='ipsType_break ipsContained'><a href="{$comment->url()}" class='ipsDataItem_title ipsTruncate ipsTruncate_line'>{$comment->item()->name}</a></div><br>
 							<div data-role='commentContent' class='ipsType_normal ipsType_richText ipsType_break ipsContained' data-controller='core.front.core.lightboxedImages'>
 								{{if $comment->hidden() === 1 && $comment->author()->member_id == \IPS\Member::loggedIn()->member_id}}
 									<strong class='ipsType_medium ipsType_warning'><i class='fa fa-info-circle'></i> {lang="comment_awaiting_approval"}</strong>
@@ -1162,7 +1171,7 @@
 		{{foreach $blogs as $blog}}
 			<li class='ipsDataItem'>
 			<div class='ipsColumns ipsColumns_collapsePhone'>
-				<h4 class='ipsType_large ipsType_reset'>{$blog->_title}</h4>
+				<h4 class='ipsSpacer_top ipsSpacer_half ipsType_reset ipsTruncate ipsTruncate_line'><a href="{$blog->url()}" title='{lang="view_this_blog" sprintf="$blog->_title"}'>{$blog->_title}</a></h4>
 				<div>
 					<ul class='ipsGrid'>
 						<li class='ipsGrid_span4'><strong class='ipsType_normal'>{$blog->_items}</strong><br>{lang="blog_entries" pluralize="$blog->_items"}</li>
@@ -1199,9 +1208,11 @@
 													<span class='ipsItemStatus ipsItemStatus_tiny'><i class='fa fa-circle'></i></span>
 												</a>
 											{{endif}}
-											<a href='{$entry->url()}' title='{lang="view_this_entry" sprintf="$entry->name"}' class='ipsType_break'>
-												{wordbreak="$entry->name"}
-											</a>
+											<div class='ipsContained ipsType_break'>
+												<a href='{$entry->url()}' title='{lang="view_this_entry" sprintf="$entry->name"}' class='ipsType_break'>
+													{$entry->name}
+												</a>
+											</div>
 										</div>
 									</li>
 								{{endforeach}}
@@ -1216,12 +1227,12 @@
 							<div>
 								<strong class='ipsType_minorHeading'>{lang="latest_entry"}</strong><br>
 								<h3 class='ipsType_reset ipsType_sectionHead ipsType_blendLinks'>
-									<a href='{$blog->latestEntry()->url()}' title='{lang="view_this_entry" sprintf="$blog->latestEntry()->name"}'>
+									<div class='ipsType_break ipsContained'><a href='{$blog->latestEntry()->url()}' title='{lang="view_this_entry" sprintf="$blog->latestEntry()->name"}'>
 										{{if $blog->latestEntry()->unread()}}
 											<span class='ipsItemStatus' data-ipsTooltip title="{lang="unread_blog"}"><i class="fa fa-circle"></i></span>
 										{{endif}}
-										{wordbreak="$blog->latestEntry()->name"}
-									</a>
+										{$blog->latestEntry()->name}
+									</a></div>
 									{{if $blog->latestEntry()->locked()}}<i class='fa fa-lock'></i> {{endif}}{$blog->latestEntry()->caption}
 										{{if $blog->latestEntry()->isFutureDate() || $blog->latestEntry()->mapped('pinned') || $blog->latestEntry()->mapped('featured') || $blog->latestEntry()->hidden() === -1 || $blog->latestEntry()->hidden() === 1 || $blog->latestEntry()->status === 'draft'}}
 										{{if $blog->latestEntry()->isFutureDate()}}
@@ -1255,7 +1266,7 @@
 								<strong><a href='{$blog->latestEntry()->url()}' title='{lang="read_more_entry"}'>{lang="read_more"}</a></strong>
 							</li>
 							{{if \IPS\Settings::i()->blog_enable_rating}}
-								<li>{template="rating" app="core" params="'small', $blog->latestEntry()->averageRating()" group="global"}</li>
+								<li>{template="rating" app="core" params="'small', $blog->latestEntry()->averageRating(), 5, $blog->latestEntry()->memberRating()" group="global"}</li>
 							{{endif}}
 							{{if !$blog->latestEntry()->num_comments}}
 								<li class='ipsType_light'>{lang="num_comments" pluralize="$blog->latestEntry()->num_comments"}</li>
@@ -1324,10 +1335,10 @@
 		{template="userPhoto" app="core" params="$entry->author(), 'tiny'" group="global"}
 	</div>
 	<div class='ipsDataItem_main'>
-		<a href="{$entry->url('getLastComment')}" title='{lang="view_this_entry" sprintf="$entry->_title"}' class='ipsType_medium ipsType_break'>{wordbreak="$entry->name"}</a><br>
-		<span class='ipsType_blendLinks ipsType_light ipsType_medium ipsType_break ipsContained'>{lang="byline_nodate" htmlsprintf="$entry->author()->link()"} {lang="in"} <a href='{$entry->container()->url()}' class='ipsType_blendLinks'>{$entry->container()->_title}</a></span>
+		<div class='ipsContained ipsType_break'><a href="{$entry->url('getLastComment')}" title='{lang="view_this_entry" sprintf="$entry->_title"}' class='ipsType_medium ipsTruncate ipsTruncate_line'>{$entry->name}</a></div>
+		<span class='ipsType_blendLinks ipsType_light ipsType_medium ipsType_break ipsContained'>{lang="byline_nodate" htmlsprintf="$entry->author()->link()"} {lang="in"} <a href='{$entry->container()->url()}' class='ipsType_blendLinks ipsTruncate ipsTruncate_line'>{$entry->container()->_title}</a></span>
 		{{if \IPS\Settings::i()->blog_enable_rating}}
-			{template="rating" group="global" location="front" app="core" params="'small', $entry->averageRating()"} &nbsp;&nbsp;
+			{template="rating" group="global" location="front" app="core" params="'small', $entry->averageRating(), 5, $entry->memberRating()"} &nbsp;&nbsp;
 		{{endif}}
 		<span class='ipsType_medium ipsType_reset'>{{if !$entry->num_comments}}<span class='ipsType_light'>{{endif}}<i class='fa fa-comment'></i> {number="$entry->num_comments"}{{if !$entry->num_comments}}</span>{{endif}}</span>
 		{{if $orientation == 'horizontal'}}

applications/blog/data/versions.json

@@ -97,5 +97,79 @@
     "101009": "4.1.0 Beta 10",
     "101010": "4.1.0",
     "101011": "4.1.1",
-    "101012": "4.1.2"
+    "101012": "4.1.2",
+    "101013": "4.1.3",
+    "101014": "4.1.3.1",
+    "101015": "4.1.3.2",
+    "101016": "4.1.4",
+    "101017": "4.1.4.1",
+    "101018": "4.1.5",
+    "101019": "4.1.5.1",
+    "101020": "4.1.5.2",
+    "101021": "4.1.6",
+    "101022": "4.1.6.1",
+    "101023": "4.1.7",
+    "101024": "4.1.8",
+    "101025": "4.1.8.1",
+    "101026": "4.1.9",
+    "101027": "4.1.10",
+    "101028": "4.1.11",
+    "101029": "4.1.11.1",
+    "101030": "4.1.12",
+    "101031": "4.1.12.1",
+    "101032": "4.1.12.2",
+    "101033": "4.1.12.3",
+    "101034": "4.1.13 Beta 1",
+    "101035": "4.1.13 Beta 2",
+    "101036": "4.1.13",
+    "101037": "4.1.13",
+    "101038": "4.1.13.1",
+    "101040": "4.1.13.2",
+    "101041": "4.1.13.2",
+    "101042": "4.1.14 Beta 1",
+    "101043": "4.1.14 Beta 2",
+    "101044": "4.1.14 Beta 3",
+    "101045": "4.1.14 Beta 4",
+    "101046": "4.1.14 Beta 5",
+    "101049": "4.1.14 Beta 6",
+    "101050": "4.1.14 Beta 7",
+    "101051": "4.1.14 RC",
+    "101052": "4.1.14",
+    "101053": "4.1.14.1",
+    "101054": "4.1.14.2",
+    "101055": "4.1.14.3",
+    "101056": "4.1.15",
+    "101057": "4.1.15 Beta 1",
+    "101058": "4.1.15 Beta 2",
+    "101059": "4.1.15 Beta 2a",
+    "101060": "4.1.15 Beta 3",
+    "101061": "4.1.15",
+    "101062": "4.1.15",
+    "101063": "4.1.15",
+    "101064": "4.1.16 Beta 1",
+    "101065": "4.1.16 Beta 2",
+    "101066": "4.1.16 Beta 3",
+    "101067": "4.1.16 Beta 4",
+    "101068": "4.1.16 Beta 5",
+    "101069": "4.1.16",
+    "101070": "4.1.16.1",
+    "101071": "4.1.17 Beta 1",
+    "101072": "4.1.17 Beta 1a",
+    "101073": "4.1.17 Beta 1b",
+    "101074": "4.1.17 Beta 2",
+    "101075": "4.1.17 Beta 3",
+    "101076": "4.1.17 Beta 3",
+    "101077": "4.1.17",
+    "101078": "4.1.17.1",
+    "101079": "4.1.18 Beta 1",
+    "101082": "4.1.18 Beta 1b",
+    "101083": "4.1.18 Beta 2",
+    "101084": "4.1.18 Beta 3",
+    "101085": "4.1.18",
+    "101088": "4.1.18.1",
+    "101089": "4.1.18.2",
+    "101090": "4.1.19 Beta 1",
+    "101091": "4.1.19 Beta 2",
+    "101092": "4.1.19 Beta 3",
+    "101093": "4.1.19"
 }

applications/blog/extensions/core/BBCode/blog.php

@@ -0,0 +1,72 @@
+<?php
+/**
+ * @brief		BBCode Tag
+ * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
+ * @license		http://www.invisionpower.com/legal/standards/
+ * @package		IPS Community Suite
+ * @subpackage	Blogs
+ * @since		05 Feb 2016
+ * @version		SVN_VERSION_NUMBER
+ */
+
+namespace IPS\blog\extensions\core\BBCode;
+
+/* To prevent PHP errors (extending class does not exist) revealing path */
+if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+{
+	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
+	exit;
+}
+
+/**
+ * BBCode Tag
+ */
+class _blog
+{	
+	/**
+	 * Permission Check
+	 *
+	 * @param	\IPS\Member	$member	The member
+	 * @param	string		$area	The Editor area
+	 * @return	bool
+	 */
+	public function permissionCheck( \IPS\Member $member, $area )
+	{
+		return \IPS\Text\Parser::canUse( $member, 'ipsLink', $area );
+	}
+	
+	/**
+	 * Get Configuration
+	 *
+	 * @code
+	 	return array(
+	 		'tag'			=> 'span',						// The HTML tag to use
+	 		'attributes'	=> array( ... )					// Key/Value pairs of attributes to use (optional) - can use {option} to get the [tag=option] value
+	 		'callback'		=> function( $node, $matches, $document )	// A callback to modify the DOMNode object
+	 		{
+	 			...
+	 		},
+	 		'block'			=> FALSE,						// If this is a block-level tag (optional, default false)
+	 		'single'		=> FALSE,						// If this is a single tag, with no content (optional, default false)
+	 	)
+	 * @endcode
+	 * @return	array
+	 */
+	public function getConfiguration()
+	{
+		return array(
+			'tag' 		=> 'a',
+			'callback'	=> function( \DOMElement $node, $matches, \DOMDocument $document )
+			{
+				try
+				{
+					$node->setAttribute( 'href', (string) \IPS\blog\Blog::load( intval( $matches[2] ) )->url() );
+				}
+				catch ( \Exception $e ) {}
+				
+				return $node;
+			},
+		);
+	}
+}

applications/blog/extensions/core/BBCode/entry.php

@@ -0,0 +1,72 @@
+<?php
+/**
+ * @brief		BBCode Tag
+ * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
+ * @license		http://www.invisionpower.com/legal/standards/
+ * @package		IPS Community Suite
+ * @subpackage	Blogs
+ * @since		08 Feb 2016
+ * @version		SVN_VERSION_NUMBER
+ */
+
+namespace IPS\blog\extensions\core\BBCode;
+
+/* To prevent PHP errors (extending class does not exist) revealing path */
+if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+{
+	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
+	exit;
+}
+
+/**
+ * BBCode Tag
+ */
+class _entry
+{	
+	/**
+	 * Permission Check
+	 *
+	 * @param	\IPS\Member	$member	The member
+	 * @param	string		$area	The Editor area
+	 * @return	bool
+	 */
+	public function permissionCheck( \IPS\Member $member, $area )
+	{
+		return \IPS\Text\Parser::canUse( $member, 'ipsLink', $area );
+	}
+	
+	/**
+	 * Get Configuration
+	 *
+	 * @code
+	 	return array(
+	 		'tag'			=> 'span',						// The HTML tag to use
+	 		'attributes'	=> array( ... )					// Key/Value pairs of attributes to use (optional) - can use {option} to get the [tag=option] value
+	 		'callback'		=> function( $node, $matches, $document )	// A callback to modify the DOMNode object
+	 		{
+	 			...
+	 		},
+	 		'block'			=> FALSE,						// If this is a block-level tag (optional, default false)
+	 		'single'		=> FALSE,						// If this is a single tag, with no content (optional, default false)
+	 	)
+	 * @endcode
+	 * @return	array
+	 */
+	public function getConfiguration()
+	{
+		return array(
+			'tag' 		=> 'a',
+			'callback'	=> function( \DOMElement $node, $matches, \DOMDocument $document )
+			{
+				try
+				{
+					$node->setAttribute( 'href', (string) \IPS\blog\Entry::load( intval( $matches[2] ) )->url() );
+				}
+				catch ( \Exception $e ) {}
+				
+				return $node;
+			},
+		);
+	}
+}

applications/blog/extensions/core/ContentRouter/Blog.php

@@ -2,10 +2,10 @@
 /**
  * @brief		Content Router extension: Blog
  * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - SVN_YYYY Invision Power Services, Inc.
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
  * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Social Suite
- * @subpackage	
+ * @package		IPS Community Suite
+ * @subpackage	Blog
  * @since		04 Mar 2014
  * @version		SVN_VERSION_NUMBER
  */

applications/blog/extensions/core/CreateMenu/Entry.php

@@ -2,10 +2,10 @@
 /**
  * @brief		Create Menu Extension : Entry
  * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - SVN_YYYY Invision Power Services, Inc.
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
  * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Social Suite
- * @subpackage	
+ * @package		IPS Community Suite
+ * @subpackage	Blog
  * @since		10 Mar 2014
  * @version		SVN_VERSION_NUMBER
  */

applications/blog/extensions/core/Dashboard/Overview.php

@@ -2,10 +2,10 @@
 /**
  * @brief		Dashboard extension: Overview
  * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - SVN_YYYY Invision Power Services, Inc.
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
  * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Social Suite
- * @subpackage	
+ * @package		IPS Community Suite
+ * @subpackage	Blog
  * @since		20 Mar 2014
  * @version		SVN_VERSION_NUMBER
  */

applications/blog/extensions/core/EditorLocations/Blogs.php

@@ -2,10 +2,10 @@
 /**
  * @brief		Editor Extension: Blogs
  * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - SVN_YYYY Invision Power Services, Inc.
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
  * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Social Suite
- * @subpackage	
+ * @package		IPS Community Suite
+ * @subpackage	Blog
  * @since		04 Mar 2014
  * @version		SVN_VERSION_NUMBER
  */
@@ -54,11 +54,20 @@ class _Blogs
 	 * @param	int|null	$id1	Primary ID
 	 * @param	int|null	$id2	Secondary ID
 	 * @param	string|null	$id3	Arbitrary data
+	 * @param	array		$attachment	The attachment data
 	 * @return	bool
 	 */
-	public function attachmentPermissionCheck( $member, $id1, $id2, $id3 )
+	public function attachmentPermissionCheck( $member, $id1, $id2, $id3, $attachment )
 	{
-		return \IPS\blog\Blog::load( $id1 )->can( 'view', $member );
+		/* The attachment is attached to a comment */
+		if ( $id2 )
+		{
+			return \IPS\blog\Entry\Comment::load( $id2 )->canView( $member );
+		}
+		else
+		{
+			return \IPS\blog\Blog::load( $id1 )->can( 'view', $member );
+		}
 	}
 	
 	/**
@@ -72,7 +81,15 @@ class _Blogs
 	 */
 	public function attachmentLookup( $id1, $id2, $id3 )
 	{
-		return \IPS\blog\Blog::load( $id1 );
+		/* The attachment is attached to a comment */
+		if ( $id2 )
+		{
+			return \IPS\blog\Entry\Comment::load( $id2 )->canView( $member );
+		}
+		else
+		{
+			return \IPS\blog\Blog::load( $id1 );
+		}
 	}
 
 	/**

applications/blog/extensions/core/EditorLocations/Entries.php

@@ -2,10 +2,10 @@
 /**
  * @brief		Editor Extension: Blog Entries
  * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - SVN_YYYY Invision Power Services, Inc.
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
  * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Social Suite
- * @subpackage	
+ * @package		IPS Community Suite
+ * @subpackage	Blog
  * @since		10 Mar 2014
  * @version		SVN_VERSION_NUMBER
  */
@@ -46,7 +46,7 @@ class _Entries
 	{
 		return NULL;
 	}
-	
+
 	/**
 	 * Permission check for attachments
 	 *
@@ -54,9 +54,10 @@ class _Entries
 	 * @param	int|null	$id1	Primary ID
 	 * @param	int|null	$id2	Secondary ID
 	 * @param	string|null	$id3	Arbitrary data
+	 * @param	array		$attachment	The attachment data
 	 * @return	bool
 	 */
-	public function attachmentPermissionCheck( $member, $id1, $id2, $id3 )
+	public function attachmentPermissionCheck( $member, $id1, $id2, $id3, $attachment )
 	{
 		return \IPS\blog\Entry::load( $id1 )->canView( $member );
 	}

applications/blog/extensions/core/FileStorage/Blogs.php

@@ -2,9 +2,9 @@
 /**
  * @brief		File Storage Extension: Blogs (cover photos)
  * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - SVN_YYYY Invision Power Services, Inc.
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
  * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Social Suite
+ * @package		IPS Community Suite
  * @subpackage	Blog
  * @since		16 Jun 2014
  * @version		SVN_VERSION_NUMBER

applications/blog/extensions/core/FileStorage/Entries.php

@@ -2,9 +2,9 @@
 /**
  * @brief		File Storage Extension: Blog Entries (cover photos)
  * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - SVN_YYYY Invision Power Services, Inc.
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
  * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Social Suite
+ * @package		IPS Community Suite
  * @subpackage	Blog
  * @since		30 May 2014
  * @version		SVN_VERSION_NUMBER

applications/blog/extensions/core/FrontNavigation/Blogs.php

@@ -2,10 +2,10 @@
 /**
  * @brief		Front Navigation Extension: Blogs
  * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - SVN_YYYY Invision Power Services, Inc.
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
  * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Social Suite
- * @subpackage	
+ * @package		IPS Community Suite
+ * @subpackage	Blog
  * @since		03 Mar 2014
  * @version		SVN_VERSION_NUMBER
  */
@@ -35,13 +35,13 @@ class _Blogs extends \IPS\core\FrontNavigation\FrontNavigationAbstract
 	}
 	
 	/**
-	 * Can access?
+	 * Can the currently logged in user access the content this item links to?
 	 *
 	 * @return	bool
 	 */
-	public function canView()
+	public function canAccessContent()
 	{
-		return parent::canView() and \IPS\Member::loggedIn()->canAccessModule( \IPS\Application\Module::get( 'blog', 'blogs' ) );
+		return \IPS\Member::loggedIn()->canAccessModule( \IPS\Application\Module::get( 'blog', 'blogs' ) );
 	}
 	
 	/**

applications/blog/extensions/core/GroupForm/Blog.php

@@ -2,10 +2,10 @@
 /**
  * @brief		Admin CP Group Form
  * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - SVN_YYYY Invision Power Services, Inc.
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
  * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Social Suite
- * @subpackage	
+ * @package		IPS Community Suite
+ * @subpackage	Blog
  * @since		11 Jul 2014
  * @version		SVN_VERSION_NUMBER
  */
@@ -56,11 +56,12 @@ class _Blog
 	{
         if( $group->g_id != \IPS\Settings::i()->guest_group )
         {
-            $group->g_blog_allowlocal = $values['g_blog_allowlocal'];
-            $group->g_blog_maxblogs = $values['g_blog_maxblogs'];
-            $group->g_blog_allowprivate = $values['g_blog_allowprivate'];
-            $group->g_blog_allowownmod = $values['g_blog_allowownmod'];
-            $group->g_blog_allowdelete = $values['g_blog_allowdelete'];
+        	/* We intval here because (some of) the columns do not accept null values, but these are null when creating a new group */
+            $group->g_blog_allowlocal = (int) $values['g_blog_allowlocal'];
+            $group->g_blog_maxblogs = (int) $values['g_blog_maxblogs'];
+            $group->g_blog_allowprivate = (int) $values['g_blog_allowprivate'];
+            $group->g_blog_allowownmod = (int) $values['g_blog_allowownmod'];
+            $group->g_blog_allowdelete = (int) $values['g_blog_allowdelete'];
         }
 
          $group->g_blog_allowcomment = $values['g_blog_allowcomment'];

applications/blog/extensions/core/LiveSearch/Blogs.php

@@ -2,10 +2,10 @@
 /**
  * @brief		ACP Live Search Extension
  * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - SVN_YYYY Invision Power Services, Inc.
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
  * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Social Suite
- * @subpackage	
+ * @package		IPS Community Suite
+ * @subpackage	Blog
  * @since		20 Mar 2014
  * @version		SVN_VERSION_NUMBER
  */
@@ -73,4 +73,14 @@ class _Blogs
 		
 		return $results;
 	}
+	
+	/**
+	 * Is default for current page?
+	 *
+	 * @return	bool
+	 */
+	public function isDefault()
+	{
+		return \IPS\Dispatcher::i()->application->directory == 'blog';
+	}
 }

applications/blog/extensions/core/MemberSync/Blog.php

@@ -2,9 +2,9 @@
 /**
  * @brief		Member Sync
  * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - SVN_YYYY Invision Power Services, Inc.
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
  * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Social Suite
+ * @package		IPS Community Suite
  * @subpackage	Blog
  * @since		20 Mar 2014
  * @version		SVN_VERSION_NUMBER
@@ -55,8 +55,12 @@ class _Blog
 
 		foreach( \IPS\blog\Blog::loadByOwner( $member ) as $blog )
 		{
-			$blog->member_id = 0;
-			$blog->save();
+			/* We only want to do this if the blog is owned by the member - loadByOwner() also returns Blogs that are assigned to member groups */
+			if ( !$blog->groupblog_ids )
+			{
+				/* Delete blog entries & blog */
+				\IPS\Task::queue( 'core', 'DeleteOrMoveContent', array( 'class' => 'IPS\blog\Blog', 'id' => $blog->id, 'deleteWhenDone' => TRUE ) );
+			}
 		}
 	}
 }

applications/blog/extensions/core/Profile/blog.php

@@ -2,9 +2,9 @@
 /**
  * @brief		Profile extension: Blogs
  * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - SVN_YYYY Invision Power Services, Inc.
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
  * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Social Suite
+ * @package		IPS Community Suite
  * @subpackage	Blog
  * @since		02 Apr 2014
  * @version		SVN_VERSION_NUMBER

applications/blog/extensions/core/Queue/RebuildEntryImages.php

@@ -0,0 +1,128 @@
+<?php
+/**
+ * @brief		Background Task
+ * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
+ * @license		http://www.invisionpower.com/legal/standards/
+ * @package		IPS Community Suite
+ * @subpackage	Blogs
+ * @since		12 Apr 2016
+ * @version		SVN_VERSION_NUMBER
+ */
+
+namespace IPS\blog\extensions\core\Queue;
+
+/* To prevent PHP errors (extending class does not exist) revealing path */
+if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+{
+	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
+	exit;
+}
+
+/**
+ * Background Task
+ */
+class _RebuildEntryImages
+{
+	/**
+	 * @brief   Number of entry images to rebuild per cycle
+	 */
+	public $rebuild	= 10;
+
+	/**
+	 * Parse data before queuing
+	 *
+	 * @param	array	$data
+	 * @return	array
+	 */
+	public function preQueueData( $data )
+	{
+		$data['count'] = (int) \IPS\Db::i()->select( 'count(*)', 'blog_entries', "entry_image<>''" )->first();
+
+		if( $data['count'] == 0 )
+		{
+			return NULL;
+		}
+
+		return $data;
+	}
+
+	/**
+	 * Run Background Task
+	 *
+	 * @param	mixed						$data	Data as it was passed to \IPS\Task::queue()
+	 * @param	int							$offset	Offset
+	 * @return	int							New offset
+	 * @throws	\IPS\Task\Queue\OutOfRangeException	Indicates offset doesn't exist and thus task is complete
+	 */
+	public function run( $data, $offset )
+	{
+		$select = \IPS\Db::i()->select( '*', 'blog_entries', "entry_image<>''", 'entry_id ASC', array( $offset, $this->rebuild ) );
+
+		if ( !$select->count() )
+		{
+			throw new \IPS\Task\Queue\OutOfRangeException;
+		}
+
+		foreach ( $select as $entry )
+		{
+			try
+			{
+				$filePath = \IPS\ROOT_PATH . '/uploads/' . $entry['entry_image'];
+
+				if ( ! file_exists( $filePath ) )
+				{
+					continue;
+				}
+				
+				/* Have we processed this before? It's a bit crude but it is accurate */
+				if ( mb_substr( trim( $entry['entry_content'] ), 0, 37 ) === '<a href="<fileStore.core_Attachment>/' and mb_stristr( $entry['entry_content'], '/' . $entry['entry_image'] . '.' ) and mb_stristr( $entry['entry_content'], 'data-fileid="' ) )
+				{
+					continue;
+				}
+				
+				$file = \IPS\File::create( 'core_Attachment', $entry['entry_image'], NULL, NULL, FALSE, $filePath );
+				$attachment = $file->makeAttachment('', \IPS\Member::load( $entry['entry_author_id'] ) );
+				$fileName = htmlspecialchars( $attachment['attach_file'], \IPS\HTMLENTITIES, 'UTF-8', TRUE );
+				
+				$image = <<<IMAGE
+<a href="<fileStore.core_Attachment>/{$file}" class="ipsAttachLink ipsAttachLink_image" style="float:left;"><img data-fileid="{$attachment['attach_id']}" src="<fileStore.core_Attachment>/{$file}" class="ipsImage ipsImage_thumbnailed" style="margin:10px;" alt="{$fileName}"></a>
+IMAGE;
+				
+				\IPS\Db::i()->update( 'blog_entries', array( 'entry_content' => $image . $entry['entry_content'] ), array( 'entry_id=?', $entry['entry_id'] ) );
+
+				$map	= array(
+					'attachment_id'		=> $attachment['attach_id'],
+					'location_key'		=> 'blog_Entries',
+					'id1'				=> $entry['entry_id'],
+					'id2'				=> NULL,
+					'id3'				=> NULL,
+					'temp'				=> NULL,
+				);
+
+				\IPS\Db::i()->replace( 'core_attachments_map', $map );
+			}
+			catch ( \Exception $e ) {}
+		}
+
+		return $offset + $this->rebuild;
+	}
+	
+	/**
+	 * Get Progress
+	 *
+	 * @param	mixed					$data	Data as it was passed to \IPS\Task::queue()
+	 * @param	int						$offset	Offset
+	 * @return	array( 'text' => 'Doing something...', 'complete' => 50 )	Text explaining task and percentage complete
+	 * @throws	\OutOfRangeException	Indicates offset doesn't exist and thus task is complete
+	 */
+	public function getProgress( $data, $offset )
+	{
+		return array(
+			'text'      => \IPS\Member::loggedIn()->language()->addToStack( 'rebuilding_blog_entry_images', FALSE ),
+			'complete'  => ( isset( $data['count'] ) AND $data['count'] ) 
+				? ( round( 100 / $data['count'] * $offset, 2 ) ) 
+				: 100
+		);
+	}
+}

applications/blog/modules/admin/blogs/blogs.php

@@ -2,9 +2,9 @@
 /**
  * @brief		Group Blogs Controller
  * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - SVN_YYYY Invision Power Services, Inc.
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
  * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Social Suite
+ * @package		IPS Community Suite
  * @subpackage	Blog
  * @since		03 Mar 2014
  * @version		SVN_VERSION_NUMBER
@@ -56,7 +56,7 @@ class _blogs extends \IPS\Node\Controller
 		$table->mainColumn = 'word_custom';
 
 		$table->joins = array(
-			array( 'select' => 'w.word_custom', 'from' => array( 'core_sys_lang_words', 'w' ), 'where' => "w.word_key=CONCAT( 'blogs_blog_', blog_blogs.blog_id ) AND w.lang_id=" . \IPS\Member::loggedIn()->language()->id )
+			array( 'select' => 'CASE WHEN blog_blogs.blog_member_id THEN blog_blogs.blog_name ELSE w.word_custom END as word_custom', 'from' => array( 'core_sys_lang_words', 'w' ), 'where' => "w.word_key=CONCAT( 'blogs_blog_', blog_blogs.blog_id ) AND w.lang_id=" . \IPS\Member::loggedIn()->language()->id )
 		);
 
 		/* Sort stuff */
@@ -71,9 +71,30 @@ class _blogs extends \IPS\Node\Controller
 			);
 
 		$table->parsers = array(
-			'blog_member_id'		=> function( $val, $row )
+			'blog_member_id' => function( $val, $row )
 			{
-				return \IPS\Member::load( $val )->link();
+				try
+				{
+					return \IPS\Member::load( $val )->link();
+				}
+				catch( \OutOfRangeException $e )
+				{
+					return NULL;
+				}
+			},
+			'word_custom' 	=> function( $val, $row )
+			{
+				if ( ! $val )
+				{
+					return \IPS\Member::loggedIn()->language()->addToStack('blog_member_deleted');
+				}
+
+				if( $row['blog_member_id'] )
+				{
+					$val = htmlspecialchars( $val, ENT_QUOTES | \IPS\HTMLENTITIES, 'UTF-8', FALSE );
+				}
+				
+				return $val;
 			}
 		);
 

applications/blog/modules/admin/blogs/settings.php

@@ -2,9 +2,9 @@
 /**
  * @brief		Blog Settings
  * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - SVN_YYYY Invision Power Services, Inc.
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
  * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Social Suite
+ * @package		IPS Community Suite
  * @subpackage	Blog
  * @since		03 Mar 2014
  * @version		SVN_VERSION_NUMBER
@@ -31,7 +31,7 @@ class _settings extends \IPS\Dispatcher\Controller
 	 */
 	public function execute()
 	{
-		\IPS\Dispatcher::i()->checkAcpPermission( 'blog_settings_manage' );
+		\IPS\Dispatcher::i()->checkAcpPermission( 'settings_manage', 'blog' );
 		parent::execute();
 	}
 

applications/blog/modules/front/blogs/browse.php

@@ -2,10 +2,10 @@
 /**
  * @brief		All Blogs
  * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - SVN_YYYY Invision Power Services, Inc.
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
  * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Social Suite
- * @subpackage	
+ * @package		IPS Community Suite
+ * @subpackage	Blog
  * @since		03 Mar 2014
  * @version		SVN_VERSION_NUMBER
  */
@@ -24,16 +24,6 @@ if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
  */
 class _browse extends \IPS\Dispatcher\Controller
 {
-	/**
-	 * Execute
-	 *
-	 * @return	void
-	 */
-	public function execute()
-	{		
-		parent::execute();
-	}
-
 	/**
 	 * Manage
 	 *

applications/blog/modules/front/blogs/create.php

@@ -2,9 +2,9 @@
 /**
  * @brief		Create Blog
  * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - SVN_YYYY Invision Power Services, Inc.
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
  * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Social Suite
+ * @package		IPS Community Suite
  * @subpackage	Blog
  * @since		24 Mar 2014
  * @version		SVN_VERSION_NUMBER

applications/blog/modules/front/blogs/entry.php

@@ -2,9 +2,9 @@
 /**
  * @brief		View Blog Entry Controller
  * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - SVN_YYYY Invision Power Services, Inc.
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
  * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Social Suite
+ * @package		IPS Community Suite
  * @subpackage	Blog
  * @since		03 Mar 2014
  * @version		SVN_VERSION_NUMBER
@@ -44,10 +44,10 @@ class _entry extends \IPS\Content\Controller
 			{
 				\IPS\Output::i()->error( 'node_error', '2B202/1', 403, '' );
 			}
-				
-			if ( $this->entry->cover_photo )
+
+			if ( $this->entry->container()->cover_photo )
 			{
-				\IPS\Output::i()->metaTags['og:image'] = $this->entry->cover_photo;
+				\IPS\Output::i()->metaTags['og:image'] = \IPS\File::get( 'blog_Blogs', $this->entry->container()->cover_photo )->url;
 			}
 		}
 		catch ( \OutOfRangeException $e )
@@ -79,7 +79,7 @@ class _entry extends \IPS\Content\Controller
 			$previous = \IPS\Db::i()->select( 
 					'*', 
 					'blog_entries',
-					array( 'entry_blog_id=? AND entry_date<?', $this->entry->blog_id, $this->entry->date ),
+					array( 'entry_blog_id=? AND entry_date<? AND entry_status=? AND entry_is_future_entry=0', $this->entry->blog_id, $this->entry->date, "published" ),
 					'entry_date DESC'
 					,1
 					)->first();
@@ -94,7 +94,7 @@ class _entry extends \IPS\Content\Controller
 			$next = \IPS\Db::i()->select( 
 					'*', 
 					'blog_entries',
-					array( 'entry_blog_id=? AND entry_date>?', $this->entry->blog_id, $this->entry->date ),
+					array( 'entry_blog_id=? AND entry_date>? AND entry_status=? AND entry_is_future_entry=0', $this->entry->blog_id, $this->entry->date, "published" ),
 					'entry_date ASC'
 					,1
 					)->first();

applications/blog/modules/front/blogs/submit.php

@@ -2,9 +2,9 @@
 /**
  * @brief		Submit
  * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - SVN_YYYY Invision Power Services, Inc.
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
  * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Social Suite
+ * @package		IPS Community Suite
  * @subpackage	Blog
  * @since		10 Mar 2014
  * @version		SVN_VERSION_NUMBER
@@ -55,7 +55,7 @@ class _submit extends \IPS\Dispatcher\Controller
 			$form = \IPS\blog\Entry::create( $blog );
 			$formTemplate = $form->customTemplate( array( call_user_func_array( array( \IPS\Theme::i(), 'getTemplate' ), array( 'submit', 'blog' ) ), 'submitFormTemplate' ) );
 			
-			\IPS\Session::i()->setLocation( $blog->url(), array(), 'loc_blog_adding_entry', array( "blogs_blog_{$blog->id}" => TRUE ) );
+			\IPS\Session::i()->setLocation( $blog->url(), array(), 'loc_blog_adding_entry', $blog->member_id ? array( $blog->_title => FALSE ) : array( "blogs_blog_{$blog->id}" => TRUE ) );
             \IPS\Output::i()->breadcrumb[] = array( $blog->url(), $blog->_title );
 			\IPS\Output::i()->sidebar['enabled'] = FALSE;
 			\IPS\Output::i()->output	= \IPS\Theme::i()->getTemplate( 'submit' )->submit( $formTemplate );

applications/blog/modules/front/blogs/view.php

@@ -2,9 +2,9 @@
 /**
  * @brief		View Blog Entry Controller
  * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - SVN_YYYY Invision Power Services, Inc.
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
  * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Social Suite
+ * @package		IPS Community Suite
  * @subpackage	Blog
  * @since		03 Mar 2014
  * @version		SVN_VERSION_NUMBER
@@ -46,6 +46,11 @@ class _view extends \IPS\Helpers\CoverPhoto\Controller
 		{
 			\IPS\Output::i()->error( 'node_error', '2B201/1', 404, '' );
 		}
+
+		if ( $this->blog->cover_photo )
+		{
+			\IPS\Output::i()->metaTags['og:image'] = \IPS\File::get( $this->_coverPhotoStorageExtension(), $this->blog->cover_photo )->url;
+		}
 		
 		parent::execute();
 	}
@@ -81,7 +86,7 @@ class _view extends \IPS\Helpers\CoverPhoto\Controller
 		);
 
 		/* Online User Location */
-		\IPS\Session::i()->setLocation( $this->blog->url(), array(), 'loc_blog_viewing_blog', array( "blogs_blog_{$this->blog->id}" => TRUE ) );
+		\IPS\Session::i()->setLocation( $this->blog->url(), array(), 'loc_blog_viewing_blog', $this->blog->member_id ? array( $this->blog->_title => FALSE ) : array( "blogs_blog_{$this->blog->id}" => TRUE ) );
 		
 		/* Output */
 		\IPS\Output::i()->title = $this->blog->_title;
@@ -93,7 +98,7 @@ class _view extends \IPS\Helpers\CoverPhoto\Controller
 
 		\IPS\Output::i()->jsFiles = array_merge( \IPS\Output::i()->jsFiles, \IPS\Output::i()->js( 'front_browse.js', 'blog', 'front' ) );
 		\IPS\Output::i()->output	= \IPS\Theme::i()->getTemplate( 'view' )->view( $this->blog, (string) $table );
-		\IPS\Output::i()->contextualSearchOptions[ \IPS\Member::loggedIn()->language()->addToStack( 'search_contextual_item', FALSE, array( 'sprintf' => array( \IPS\Member::loggedIn()->language()->addToStack( 'blog' ) ) ) ) ] = array( 'type' => 'blog_entry', 'nodes' => $this->blog->_id );
+		\IPS\Output::i()->contextualSearchOptions[ \IPS\Member::loggedIn()->language()->addToStack( 'search_contextual_item_blogs' ) ] = array( 'type' => 'blog_entry', 'nodes' => $this->blog->_id );
 	}
 	
 	/**
@@ -103,7 +108,7 @@ class _view extends \IPS\Helpers\CoverPhoto\Controller
 	 */
 	protected function editBlog()
 	{
-		if( !$this->blog->canEdit() )
+		if( !$this->blog->canEdit() OR $this->blog->groupblog_ids )
 		{
 			\IPS\Output::i()->error( 'no_module_permission', '2B201/2', 403, '' );
 		}
@@ -151,10 +156,16 @@ class _view extends \IPS\Helpers\CoverPhoto\Controller
 		{
 			\IPS\Output::i()->error( 'no_module_permission', '2B201/3', 403, '' );
 		}
+
+		/* Make sure the user confirmed the deletion */
+		\IPS\Request::i()->confirmedDelete();
 		
 		$this->blog->disabled = TRUE;
 		$this->blog->save();
-		
+
+		/* Log */
+		\IPS\Session::i()->modLog( 'modlog__action_delete_blog', array( $this->blog->name => FALSE ) );
+
 		\IPS\Task::queue( 'core', 'DeleteOrMoveContent', array( 'class' => 'IPS\blog\Blog', 'id' => $this->blog->id, 'deleteWhenDone' => TRUE ) );
 		\IPS\Output::i()->redirect( \IPS\Http\Url::internal( 'app=blog&module=blogs&controller=browse', 'front', 'blogs' ) );
 	}
@@ -199,10 +210,13 @@ class _view extends \IPS\Helpers\CoverPhoto\Controller
 		{
 			\IPS\Output::i()->error( 'blog_rss_offline', '2B201/5', 403, 'blog_rss_offline_admin' );
 		}
-		
-		$document = \IPS\Xml\Rss::newDocument( $this->blog->url(), \IPS\Member::loggedIn()->language()->get("blogs_blog_{$this->blog->id}"), \IPS\Member::loggedIn()->language()->get("blogs_blog_{$this->blog->id}_desc") );
+
+		/* We have to use get() to ensure CDATA tags wrap the blog title properly */
+		$title	= $this->blog->member_id ? $this->blog->name : \IPS\Member::loggedIn()->language()->get( "blogs_blog_{$this->blog->id}" );
+
+		$document = \IPS\Xml\Rss::newDocument( $this->blog->url(), $title, $this->blog->description );
 	
-		foreach ( \IPS\blog\Entry::getItemsWithPermission( array( array( 'entry_blog_id=?', $this->blog->id ), array( 'entry_status!=?', 'draft' ) ), 'entry_date DESC', 25, 'read', FALSE, 0, new \IPS\Member ) as $entry )
+		foreach ( \IPS\blog\Entry::getItemsWithPermission( array( array( 'entry_blog_id=?', $this->blog->id ), array( 'entry_status!=?', 'draft' ) ), 'entry_date DESC', 25, 'read', \IPS\Content\Hideable::FILTER_PUBLIC_ONLY, 0, new \IPS\Member ) as $entry )
 		{
 			$document->addItem( $entry->name, $entry->url(), $entry->content, \IPS\DateTime::ts( $entry->date ), $entry->id );
 		}
@@ -244,10 +258,10 @@ class _view extends \IPS\Helpers\CoverPhoto\Controller
 		$form->add( new \IPS\Helpers\Form\YesNo( 'blog_enable_rss_import', $feed->url ? TRUE : FALSE, FALSE, array( 'togglesOn' => array( 'blog_rss_import_url', 'blog_rss_import_auth_user', 'blog_rss_import_auth_pass', 'blog_rss_import_show_link', 'blog_rss_import_tags' ) ) ) );
 
 		$form->add( new \IPS\Helpers\Form\Url( 'blog_rss_import_url', $feed ? $feed->url : NULL, TRUE, array(), NULL, NULL, NULL, 'blog_rss_import_url' ) );
-		$form->add( new \IPS\Helpers\Form\Text( 'blog_rss_import_auth_user', $feed ? $feed->rss_auth_user : NULL, FALSE, array(), NULL, NULL, NULL, 'blog_rss_import_auth_user' ) );
-		$form->add( new \IPS\Helpers\Form\Text( 'blog_rss_import_auth_pass', $feed ? $feed->rss_auth_pass : NULL, FALSE, array(), NULL, NULL, NULL, 'blog_rss_import_auth_pass' ) );
-		$form->add( new \IPS\Helpers\Form\Text( 'blog_rss_import_show_link', $feed->rss_import_show_link ?: \IPS\Member::loggedIn()->language()->addToStack('blog_rss_import_show_link_default' ), FALSE, array(), NULL, NULL, NULL, 'blog_rss_import_show_link' ) );
-		
+		$form->add( new \IPS\Helpers\Form\Text( 'blog_rss_import_auth_user', $feed ? $feed->auth_user : NULL, FALSE, array(), NULL, NULL, NULL, 'blog_rss_import_auth_user' ) );
+		$form->add( new \IPS\Helpers\Form\Text( 'blog_rss_import_auth_pass', $feed ? $feed->auth_pass : NULL, FALSE, array(), NULL, NULL, NULL, 'blog_rss_import_auth_pass' ) );
+		$form->add( new \IPS\Helpers\Form\Text( 'blog_rss_import_show_link', $feed->import_show_link ?: \IPS\Member::loggedIn()->language()->addToStack('blog_rss_import_show_link_default' ), FALSE, array(), NULL, NULL, NULL, 'blog_rss_import_show_link' ) );
+
 		$options = array( 'autocomplete' => array( 'unique' => TRUE, 'source' => \IPS\Content\Item::definedTags( $this->blog ), 'freeChoice' => ( \IPS\Settings::i()->tags_open_system ? TRUE : FALSE ) ) );
 		if ( \IPS\Settings::i()->tags_force_lower )
 		{
@@ -275,7 +289,8 @@ class _view extends \IPS\Helpers\CoverPhoto\Controller
 		}
 			
 		$options['autocomplete']['prefix'] = \IPS\Content\Item::canPrefix( NULL, $this->blog );
-		
+		$options['autocomplete']['disallowedCharacters'] = array( '#' ); // @todo Pending \IPS\Http\Url rework, hashes cannot be used in URLs
+
 		/* Language strings for tags description */
 		if ( \IPS\Settings::i()->tags_open_system )
 		{
@@ -351,7 +366,7 @@ class _view extends \IPS\Helpers\CoverPhoto\Controller
 						$feed->save();
 						$feed->run();
 
-						\IPS\DB::i()->update( 'core_tasks', array( 'enabled' => 1 ), array( '`key`=?', 'blogrssimport' ) );
+						\IPS\Db::i()->update( 'core_tasks', array( 'enabled' => 1 ), array( '`key`=?', 'blogrssimport' ) );
 
 						/* Redirect */
 						\IPS\Output::i()->redirect( $this->blog->url() );
@@ -399,7 +414,7 @@ class _view extends \IPS\Helpers\CoverPhoto\Controller
 	protected function _coverPhotoSet( \IPS\Helpers\CoverPhoto $photo )
 	{
 		$this->blog->cover_photo = (string) $photo->file;
-		$this->blog->cover_photo_offset = $photo->offset;
+		$this->blog->cover_photo_offset = (int) $photo->offset;
 		$this->blog->save();
 	}
 	

applications/blog/setup/upg_100002/upgrade.php

@@ -2,9 +2,9 @@
 /**
  * @brief		4.0.0 Upgrade Code
  * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - SVN_YYYY Invision Power Services, Inc.
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
  * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Social Suite
+ * @package		IPS Community Suite
  * @subpackage	Blog
  * @since		30 Oct 2014
  * @version		SVN_VERSION_NUMBER
@@ -148,8 +148,6 @@ class _Upgrade
 			
 			unset( $poll['poll_id'] );
 			$poll['choices'] = $result;
-			$poll['tid'] = 0;
-			$poll['forum_id'] = 0;
 			$poll['poll_only'] = 0;
 			$poll['poll_view_voters'] = 0;
 			

applications/blog/setup/upg_100015/upgrade.php

@@ -2,9 +2,10 @@
 /**
  * @brief		4.0.0 Upgrade Code
  * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - SVN_YYYY Invision Power Services, Inc.
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
  * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Social Suite
+ * @package		IPS Community Suite
+ * @subpackage	Blog
  * @since		15 Jan 2015
  * @version		SVN_VERSION_NUMBER
  */

applications/blog/setup/upg_100016/upgrade.php

@@ -2,9 +2,9 @@
 /**
  * @brief		4.0.0 Upgrade Code
  * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - SVN_YYYY Invision Power Services, Inc.
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
  * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Social Suite
+ * @package		IPS Community Suite
  * @subpackage	Blog
  * @since		24 Feb 2015
  * @version		SVN_VERSION_NUMBER

applications/blog/setup/upg_100018/upgrade.php

@@ -2,9 +2,9 @@
 /**
  * @brief		4.0.0 RC 5 Upgrade Code
  * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - SVN_YYYY Invision Power Services, Inc.
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
  * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Social Suite
+ * @package		IPS Community Suite
  * @subpackage	Blog
  * @since		5 May 2015
  * @version		SVN_VERSION_NUMBER

applications/blog/setup/upg_100021/upgrade.php

@@ -2,9 +2,9 @@
 /**
  * @brief		4.0.0 Upgrade Code
  * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - SVN_YYYY Invision Power Services, Inc.
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
  * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Social Suite
+ * @package		IPS Community Suite
  * @subpackage	Blog
  * @since		15 Mar 2015
  * @version		SVN_VERSION_NUMBER

applications/blog/setup/upg_100027/upgrade.php

@@ -2,9 +2,9 @@
 /**
  * @brief		4.0.4 Upgrade Code
  * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - SVN_YYYY Invision Power Services, Inc.
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
  * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Social Suite
+ * @package		IPS Community Suite
  * @subpackage	Blog
  * @since		5 May 2015
  * @version		SVN_VERSION_NUMBER
@@ -24,63 +24,17 @@ if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
  */
 class _Upgrade
 {
-	
 	/**
-	 * Convert entry images
+	 * Finish - This is run after all apps have been upgraded
 	 *
-	 * @return	array	If returns TRUE, upgrader will proceed to next step. If it returns any other value, it will set this as the value of the 'extra' GET parameter and rerun this step (useful for loops)
+	 * @return	mixed	If returns TRUE, upgrader will proceed to next step. If it returns any other value, it will set this as the value of the 'extra' GET parameter and rerun this step (useful for loops)
+	 * @note	We opted not to let users run this immediately during the upgrade because of potential issues (it taking a long time and users stopping it or getting frustrated) but we can revisit later
 	 */
-	public function step1()
-	{
-		$limit = isset( \IPS\Request::i()->extra ) ? intval( \IPS\Request::i()->extra ) : 0;
-		
-		$select = \IPS\Db::i()->select( '*', 'blog_entries', "entry_image<>''", 'entry_id ASC', array( $limit, 1000 ) );
-		
-		if ( !$select->count() )
-		{
-			return TRUE;
-		}
-		
-		foreach ( $select as $entry )
-		{
-			try
-			{
-				$filePath = \IPS\ROOT_PATH . '/uploads/' . $entry['entry_image'];
-				
-				$file = \IPS\File::create( 'core_Attachment', $entry['entry_image'], NULL, NULL, FALSE, $filePath );
-				$attachment = $file->makeAttachment('');
-				$fileName = htmlspecialchars( $attachment['attach_file'], \IPS\HTMLENTITIES, 'UTF-8', TRUE );
-				
-				$image = <<<IMAGE
-<a href="<fileStore.core_Attachment>/{$file}" class="ipsAttachLink ipsAttachLink_image" style="float:left;"><img data-fileid="{$attachment['attach_id']}" src="<fileStore.core_Attachment>/{$file}" class="ipsImage ipsImage_thumbnailed" style="margin:10px;" alt="{$fileName}"></a>
-IMAGE;
-				
-				\IPS\Db::i()->update( 'blog_entries', array( 'entry_content' => $image . $entry['entry_content'] ), array( 'entry_id=?', $entry['entry_id'] ) );
+	public function finish()
+    {
+	   /* Rebuild old blog entry images as attachments */
+	   \IPS\Task::queue( 'blog', 'RebuildEntryImages', NULL, 2 );
 
-				$map	= array(
-					'attachment_id'		=> $attachment['attach_id'],
-					'location_key'		=> 'blog_Entries',
-					'id1'				=> $entry['entry_id'],
-					'id2'				=> NULL,
-					'id3'				=> NULL,
-					'temp'				=> NULL,
-				);
-
-				\IPS\Db::i()->replace( 'core_attachments_map', $map );
-			}
-			catch ( \Exception $e ) {}
-		}
-		
-		return $limit + 1000;
-	}
-
-	/**
-	 * Custom title for this step
-	 *
-	 * @return string
-	 */
-	public function step1CustomTitle()
-	{
-		return "Converting entry images";
-	}
+        return TRUE;
+    }
 }

applications/blog/setup/upg_100028/upgrade.php

@@ -2,9 +2,9 @@
 /**
  * @brief		4.0.5 Upgrade Code
  * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - SVN_YYYY Invision Power Services, Inc.
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
  * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Social Suite
+ * @package		IPS Community Suite
  * @subpackage	Blog
  * @since		5 May 2015
  * @version		SVN_VERSION_NUMBER

applications/blog/setup/upg_100035/upgrade.php

@@ -2,9 +2,10 @@
 /**
  * @brief		4.0.9 Upgrade Code
  * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - SVN_YYYY Invision Power Services, Inc.
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
  * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Social Suite
+ * @package		IPS Community Suite
+ * @subpackage	Blog
  * @since		19 Jun 2015
  * @version		SVN_VERSION_NUMBER
  */

applications/blog/setup/upg_100038/upgrade.php

@@ -2,10 +2,10 @@
 /**
  * @brief		4.0.10 Upgrade Code
  * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - SVN_YYYY Invision Power Services, Inc.
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
  * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Social Suite
- * @subpackage	Blogs
+ * @package		IPS Community Suite
+ * @subpackage	Blog
  * @since		07 Jul 2015
  * @version		SVN_VERSION_NUMBER
  */
@@ -25,7 +25,7 @@ if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
 class _Upgrade
 {
 	/**
-	 * ...
+	 * Update future entry flag
 	 *
 	 * @return	array	If returns TRUE, upgrader will proceed to next step. If it returns any other value, it will set this as the value of the 'extra' GET parameter and rerun this step (useful for loops)
 	 */
@@ -49,6 +49,13 @@ class _Upgrade
 		return TRUE;
 	}
 	
-	// You can create as many additional methods (step2, step3, etc.) as is necessary.
-	// Each step will be executed in a new HTTP request
+	/**
+	 * Custom title for this step
+	 *
+	 * @return string
+	 */
+	public function step1CustomTitle()
+	{
+		return "Updating blog future entry flag";
+	}
 }

applications/blog/setup/upg_101016/queries.json

@@ -0,0 +1,70 @@
+{
+    "1": {
+        "method": "addColumn",
+        "params": [
+            "blog_blogs",
+            {
+                "name": "blog_name",
+                "type": "TEXT",
+                "length": null,
+                "decimals": null,
+                "values": [],
+                "allow_null": true,
+                "default": null,
+                "comment": "",
+                "unsigned": false,
+                "zerofill": false,
+                "auto_increment": false,
+                "binary": false
+            }
+        ]
+    },
+    "2": {
+        "method": "addColumn",
+        "params": [
+            "blog_blogs",
+            {
+                "name": "blog_desc",
+                "type": "TEXT",
+                "length": null,
+                "decimals": null,
+                "values": [],
+                "allow_null": true,
+                "default": null,
+                "comment": "",
+                "unsigned": false,
+                "zerofill": false,
+                "auto_increment": false,
+                "binary": false
+            }
+        ]
+    },
+    "3": {
+        "method": "dropColumn",
+        "params": [
+            "blog_blogs",
+            "blog_groupblog"
+        ]
+    },
+    "4": {
+        "method": "dropIndex",
+        "params": [
+            "blog_blogs",
+            "auth_user"
+        ]
+    },
+    "5": {
+        "method": "dropColumn",
+        "params": [
+            "blog_blogs",
+            "blog_authorized_users"
+        ]
+    },
+    "6": {
+        "method": "dropColumn",
+        "params": [
+            "blog_blogs",
+            "blog_owner_only"
+        ]
+    }
+}

applications/blog/setup/upg_101016/upgrade.php

@@ -0,0 +1,105 @@
+<?php
+/**
+ * @brief		4.1.4 Upgrade Code
+ * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
+ * @license		http://www.invisionpower.com/legal/standards/
+ * @package		IPS Community Suite
+ * @subpackage	Blog
+ * @since		05 Nov 2015
+ * @version		SVN_VERSION_NUMBER
+ */
+
+namespace IPS\blog\setup\upg_101016;
+
+/* To prevent PHP errors (extending class does not exist) revealing path */
+if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+{
+	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
+	exit;
+}
+
+/**
+ * 4.1.4 Upgrade Code
+ */
+class _Upgrade
+{
+	/**
+	 * Convert user blog name/desc to database
+	 *
+	 * @return	array	If returns TRUE, upgrader will proceed to next step. If it returns any other value, it will set this as the value of the 'extra' GET parameter and rerun this step (useful for loops)
+	 */
+	public function step1()
+	{
+		/* Some init */
+		$did		= 0;
+		$limit		= 0;
+		
+		if( isset( \IPS\Request::i()->extra ) )
+		{
+			$limit	= \IPS\Request::i()->extra;
+		}
+
+		/* Try to prevent timeouts to the extent possible */
+		$cutOff			= \IPS\core\Setup\Upgrade::determineCutoff();
+
+		/* Get owned blogs - group blogs are still translatable */
+		foreach( \IPS\Db::i()->select( '*', 'blog_blogs', "blog_member_id > 0", 'blog_id ASC', array( $limit, 500 ) ) as $blog )
+		{
+			if( $cutOff !== null AND time() >= $cutOff )
+			{
+				return ( $limit + $did );
+			}
+
+			$did++;
+
+			$blog	= \IPS\blog\Blog::constructFromData( $blog );
+
+			try
+			{
+				$language	= \IPS\Lang::load( \IPS\Member::load( $blog->member_id )->language ?: \IPS\Lang::defaultLanguage() );
+			}
+			catch( \Exception $e )
+			{
+				$language	= \IPS\Lang::load( \IPS\Lang::defaultLanguage() );
+			}
+
+			/* We will now store the name and desc in the blog_blogs table */
+			$blog->name = $language->get( 'blogs_blog_' . $blog->_id );
+			$blog->desc = $language->get( 'blogs_blog_' . $blog->_id . '_desc' );
+
+			$blog->save();
+
+			/* Remove the translatable language strings */
+			\IPS\Lang::deleteCustom( 'blog', 'blogs_blog_' . $blog->_id );
+			\IPS\Lang::deleteCustom( 'blog', 'blogs_blog_' . $blog->_id . '_desc' );
+		}
+		
+		if( $did )
+		{
+			return $limit + $did;
+		}
+		else
+		{
+			unset( $_SESSION['_step1Count'] );
+			return TRUE;
+		}
+	}
+	
+	/**
+	 * Custom title for this step
+	 *
+	 * @return string
+	 */
+	public function step1CustomTitle()
+	{
+		$limit = isset( \IPS\Request::i()->extra ) ? \IPS\Request::i()->extra : 0;
+
+		if( !isset( $_SESSION['_step1Count'] ) )
+		{
+			$_SESSION['_step1Count'] = \IPS\Db::i()->select( 'COUNT(*)', 'blog_blogs', "blog_member_id > 0" )->first();
+		}
+
+		return "Converting blog names (Updated so far: " . ( ( $limit > $_SESSION['_step1Count'] ) ? $_SESSION['_step1Count'] : $limit ) . ' out of ' . $_SESSION['_step1Count'] . ')';
+	}
+}

applications/blog/setup/upg_101021/queries.json

@@ -0,0 +1,23 @@
+{
+    "1": {
+        "method": "changeColumn",
+        "params": [
+            "blog_entries",
+            "entry_content",
+            {
+                "name": "entry_content",
+                "type": "MEDIUMTEXT",
+                "length": 0,
+                "decimals": null,
+                "values": [],
+                "allow_null": true,
+                "default": null,
+                "comment": "",
+                "unsigned": false,
+                "zerofill": false,
+                "auto_increment": false,
+                "binary": false
+            }
+        ]
+    }
+}

applications/blog/setup/upg_101021/upgrade.php

@@ -0,0 +1,87 @@
+<?php
+/**
+ * @brief		4.1.6 Upgrade Code
+ * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
+ * @license		http://www.invisionpower.com/legal/standards/
+ * @package		IPS Community Suite
+ * @subpackage	Blog
+ * @since		14 Dec 2015
+ * @version		SVN_VERSION_NUMBER
+ */
+
+namespace IPS\blog\setup\upg_101021;
+
+/* To prevent PHP errors (extending class does not exist) revealing path */
+if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+{
+	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
+	exit;
+}
+
+/**
+ * 4.1.6 Upgrade Code
+ */
+class _Upgrade
+{
+	/**
+	 * Fix Blog RSS Feed Imports
+	 *
+	 * @return	array	If returns TRUE, upgrader will proceed to next step. If it returns any other value, it will set this as the value of the 'extra' GET parameter and rerun this step (useful for loops)
+	 */
+	public function step1()
+	{
+		$perCycle	= 1000;
+		$did		= 0;
+		$limit		= intval( \IPS\Request::i()->extra );
+		
+		/* Try to prevent timeouts to the extent possible */
+		$cutOff			= \IPS\core\Setup\Upgrade::determineCutoff();
+
+		foreach( \IPS\Db::i()->select( '*', 'blog_rss_import', array( "rss_member=?", 0 ), 'rss_id ASC', array( $limit, $perCycle ) ) as $rss )
+		{
+			if( $cutOff !== null AND time() >= $cutOff )
+			{
+				return ( $limit + $did );
+			}
+
+			$did++;
+			
+			try
+			{
+				$blog = \IPS\blog\Blog::load( $rss['rss_blog_id'] );
+
+				\IPS\Db::i()->update( 'blog_rss_import', array( 'rss_member' => $blog->member_id ), array( "rss_id=?", $rss['rss_id'] ) );
+			}
+			catch( \Exception $e ){}
+		}
+		
+		if ( $did )
+		{
+			return ( $limit + $did );
+		}
+		else
+		{
+			unset( $_SESSION['_step1Count'] );
+			
+			return TRUE;
+		}
+	}
+	
+	/**
+	 * Custom title for this step
+	 *
+	 * @return string
+	 */
+	public function step1CustomTitle()
+	{
+		$limit = isset( \IPS\Request::i()->extra ) ? \IPS\Request::i()->extra : 0;
+
+		if( !isset( $_SESSION['_step1Count'] ) )
+		{
+			$_SESSION['_step1Count'] = \IPS\Db::i()->select( 'COUNT(*)', 'blog_rss_import', array( "rss_member=?", 0 ) )->first();
+		}
+		
+		return "Fixing Blog RSS Imports (Upgraded so far: " . ( ( $limit > $_SESSION['_step1Count'] ) ? $_SESSION['_step1Count'] : $limit ) . ' out of ' . $_SESSION['_step1Count'] . ')';
+	}
+}

applications/blog/setup/upg_101030/queries.json

@@ -0,0 +1,23 @@
+{
+    "1": {
+        "method": "changeColumn",
+        "params": [
+            "blog_blogs",
+            "blog_rating_average",
+            {
+                "name": "blog_rating_average",
+                "type": "DECIMAL",
+                "length": 11,
+                "decimals": 1,
+                "values": [],
+                "allow_null": false,
+                "default": "0",
+                "comment": "",
+                "unsigned": true,
+                "zerofill": false,
+                "auto_increment": false,
+                "binary": false
+            }
+        ]
+    }
+}

applications/blog/setup/upg_101042/queries.json

@@ -0,0 +1,9 @@
+{
+    "1": {
+        "method": "delete",
+        "params": [
+            "core_sys_lang_words",
+            "word_app='blog' AND word_key='immediately'"
+        ]
+    }
+}

applications/blog/setup/upg_22000/queries.json

@@ -0,0 +1,9 @@
+{
+    "1": {
+        "method": "delete",
+        "params": [
+            "core_sys_conf_settings",
+            "conf_key IN('blog_use_friendlyurls', 'blog_friendly_url', 'blog_friendlyurl_path', 'blog_boardindex_path')"
+        ]
+    }
+}

applications/blog/setup/upg_22000/queries.php

@@ -1,3 +0,0 @@
-<?php
-
-$SQL[] = "DELETE FROM core_sys_conf_settings WHERE conf_key IN('blog_use_friendlyurls', 'blog_friendly_url', 'blog_friendlyurl_path', 'blog_boardindex_path');";

applications/blog/setup/upg_22002/queries.json

@@ -0,0 +1,24 @@
+{
+    "1": {
+        "method": "changeColumn",
+        "params": [
+            "blog_lastinfo",
+            "blog_tag_cloud",
+            {
+                "name": "blog_tag_cloud",
+                "type": "MEDIUMTEXT",
+                "default": null,
+                "allow_null": true
+            }
+        ]
+    },
+    "2": {
+        "method": "update",
+        "params": [
+            "blog_lastinfo",
+            {
+                "blog_tag_cloud": ""
+            }
+        ]
+    }
+}

applications/blog/setup/upg_22002/queries.php

@@ -1,9 +0,0 @@
-<?php
-
-$SQL[] = "ALTER TABLE blog_lastinfo CHANGE blog_tag_cloud blog_tag_cloud MEDIUMTEXT;";
-$SQL[] = "UPDATE blog_lastinfo SET blog_tag_cloud='';";
-
-if( ! \IPS\Db::i()->checkForColumn( 'blog_themes', 'theme_css_overwrite' ) )
-{
-	$SQL[] = "ALTER TABLE blog_themes ADD theme_css_overwrite TINYINT( 1 ) NOT NULL DEFAULT '0';";
-}

applications/blog/setup/upg_22002/upgrade.php

@@ -2,9 +2,9 @@
 /**
  * @brief		4.0.0 Upgrade Code
  * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - SVN_YYYY Invision Power Services, Inc.
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
  * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Social Suite
+ * @package		IPS Community Suite
  * @subpackage	Blog
  * @since		03 Mar 2014
  * @version		SVN_VERSION_NUMBER
@@ -31,7 +31,10 @@ class _Upgrade
 	 */
 	public function step1()
 	{
-		\IPS\core\Setup\Upgrade::runLegacySql( 'blog', 22002 );
+		if( ! \IPS\Db::i()->checkForColumn( 'blog_themes', 'theme_css_overwrite' ) )
+		{
+			\IPS\Db::i()->addColumn( 'blog_themes', array( 'name' => 'theme_css_overwrite', 'type' => 'tinyint', 'length' => 1, 'allow_null' => false, 'default' => 0 ) );
+		}
 		
 		return TRUE;
 	}

applications/blog/setup/upg_23000/queries.json

@@ -0,0 +1,41 @@
+{
+    "1": {
+        "method": "addColumn",
+        "params": [
+            "blog_comments",
+            {
+                "name": "comment_approved",
+                "type": "int",
+                "length": 1,
+                "allow_null": false,
+                "default": 0
+            }
+        ]
+    },
+    "2": {
+        "method": "update",
+        "params": [
+            "blog_comments",
+            {
+                "comment_approved": 1
+            },
+            [
+                "comment_queued=?",
+                "0"
+            ]
+        ]
+    },
+    "3": {
+        "method": "update",
+        "params": [
+            "blog_comments",
+            {
+                "comment_approved": 0
+            },
+            [
+                "comment_queued=?",
+                "1"
+            ]
+        ]
+    }
+}

applications/blog/setup/upg_23000/queries.php

@@ -1,29 +0,0 @@
-<?php
-
-// Add comment_approved for new comments functionality:
-$SQL[] = "ALTER TABLE blog_comments ADD comment_approved INT(1) DEFAULT '0'";
-$SQL[] = "UPDATE blog_comments SET comment_approved = 1 WHERE comment_queued = 0";
-$SQL[] = "UPDATE blog_comments SET comment_approved = 0 WHERE comment_queued = 1";
-
-// Get DB prefix:
-$PRE = \IPS\Db::i()->prefix;
-
-// Convert tracker to like:
-if ( \IPS\Db::i()->checkForTable('blog_tracker') )
-{
-	if( \IPS\Db::i()->checkForTable('core_like') )
-	{
-		$SQL[] = "INSERT IGNORE INTO `{$PRE}core_like` (like_id, like_lookup_id, like_app, like_area, like_rel_id, like_member_id, like_is_anon, like_added, like_notify_do, like_notify_freq) SELECT MD5(CONCAT('blog;blog;', blog_id, ';', member_id)), MD5(CONCAT('blog;blog;', blog_id)), 'blog', 'blog', blog_id, member_id, 0, UNIX_TIMESTAMP(), 1, 'immediate' FROM `{$PRE}blog_tracker`";
-
-		$SQL[] = "INSERT IGNORE INTO `{$PRE}core_like` (like_id, like_lookup_id, like_app, like_area, like_rel_id, like_member_id, like_is_anon, like_added, like_notify_do, like_notify_freq) SELECT MD5(CONCAT('blog;entries;', entry_id, ';', member_id)), MD5(CONCAT('blog;entries;', entry_id)), 'blog', 'entries', entry_id, member_id, 0, UNIX_TIMESTAMP(), 1,'immediate' FROM `{$PRE}blog_tracker` WHERE entry_id <> 0 AND entry_id IS NOT NULL";
-	}
-	else
-	{
-		$SQL[] = "INSERT IGNORE INTO `{$PRE}core_follow` (follow_id, follow_app, follow_area, follow_rel_id, follow_member_id, follow_is_anon, follow_added, follow_notify_do, follow_notify_freq) SELECT MD5(CONCAT('blog;blog;', blog_id, ';', member_id)), 'blog', 'blog', blog_id, member_id, 0, UNIX_TIMESTAMP(), 1, 'immediate' FROM `{$PRE}blog_tracker`";
-
-		$SQL[] = "INSERT IGNORE INTO `{$PRE}core_follow` (follow_id, follow_app, follow_area, follow_rel_id, follow_member_id, follow_is_anon, follow_added, follow_notify_do, follow_notify_freq) SELECT MD5(CONCAT('blog;entries;', entry_id, ';', member_id)), 'blog', 'entries', entry_id, member_id, 0, UNIX_TIMESTAMP(), 1,'immediate' FROM `{$PRE}blog_tracker` WHERE entry_id <> 0 AND entry_id IS NOT NULL";
-	}
-
-	$SQL[] = "DROP TABLE blog_tracker";
-	$SQL[] = "DROP TABLE blog_tracker_queue";
-}

applications/blog/setup/upg_23000/upgrade.php

@@ -2,9 +2,9 @@
 /**
  * @brief		4.0.0 Upgrade Code
  * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - SVN_YYYY Invision Power Services, Inc.
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
  * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Social Suite
+ * @package		IPS Community Suite
  * @subpackage	Blog
  * @since		03 Mar 2014
  * @version		SVN_VERSION_NUMBER
@@ -31,7 +31,42 @@ class _Upgrade
 	 */
 	public function step1()
 	{
-		\IPS\core\Setup\Upgrade::runLegacySql( 'blog', 23000 );
+		$queries	= array();
+
+		if ( \IPS\Db::i()->checkForTable('blog_tracker') )
+		{
+			$PRE = \IPS\Db::i()->prefix;
+
+			if( \IPS\Db::i()->checkForTable('core_like') )
+			{
+				$queries[] = array( 'table' => 'blog_tracker', 'query' => "INSERT IGNORE INTO `{$PRE}core_like` (like_id, like_lookup_id, like_app, like_area, like_rel_id, like_member_id, like_is_anon, like_added, like_notify_do, like_notify_freq) SELECT MD5(CONCAT('blog;blog;', blog_id, ';', member_id)), MD5(CONCAT('blog;blog;', blog_id)), 'blog', 'blog', blog_id, member_id, 0, UNIX_TIMESTAMP(), 1, 'immediate' FROM `{$PRE}blog_tracker`" );
+
+				$queries[] = array( 'table' => 'blog_tracker', 'query' => "INSERT IGNORE INTO `{$PRE}core_like` (like_id, like_lookup_id, like_app, like_area, like_rel_id, like_member_id, like_is_anon, like_added, like_notify_do, like_notify_freq) SELECT MD5(CONCAT('blog;entries;', entry_id, ';', member_id)), MD5(CONCAT('blog;entries;', entry_id)), 'blog', 'entries', entry_id, member_id, 0, UNIX_TIMESTAMP(), 1,'immediate' FROM `{$PRE}blog_tracker` WHERE entry_id <> 0 AND entry_id IS NOT NULL" );
+			}
+			else
+			{
+				$queries[] = array( 'table' => 'blog_tracker', 'query' => "INSERT IGNORE INTO `{$PRE}core_follow` (follow_id, follow_app, follow_area, follow_rel_id, follow_member_id, follow_is_anon, follow_added, follow_notify_do, follow_notify_freq) SELECT MD5(CONCAT('blog;blog;', blog_id, ';', member_id)), 'blog', 'blog', blog_id, member_id, 0, UNIX_TIMESTAMP(), 1, 'immediate' FROM `{$PRE}blog_tracker`" );
+
+				$queries[] = array( 'table' => 'blog_tracker', 'query' => "INSERT IGNORE INTO `{$PRE}core_follow` (follow_id, follow_app, follow_area, follow_rel_id, follow_member_id, follow_is_anon, follow_added, follow_notify_do, follow_notify_freq) SELECT MD5(CONCAT('blog;entries;', entry_id, ';', member_id)), 'blog', 'entries', entry_id, member_id, 0, UNIX_TIMESTAMP(), 1,'immediate' FROM `{$PRE}blog_tracker` WHERE entry_id <> 0 AND entry_id IS NOT NULL" );
+			}
+
+			$queries[] = array( 'table' => 'blog_tracker', 'query' => "DROP TABLE {$PRE}blog_tracker" );
+
+			if( \IPS\Db::i()->checkForTable( 'blog_tracker_queue' ) )
+			{
+				\IPS\Db::i()->dropTable( 'blog_tracker_queue' );
+			}
+		}
+
+		$toRun = \IPS\core\Setup\Upgrade::runManualQueries( $queries );
+		
+		if ( count( $toRun ) )
+		{
+			\IPS\core\Setup\Upgrade::adjustMultipleRedirect( array( 1 => 'blog', 'extra' => array( '_upgradeStep' => 2 ) ) );
+
+			/* Queries to run manually */
+			return array( 'html' => \IPS\Theme::i()->getTemplate( 'forms' )->queries( $toRun, \IPS\Http\Url::internal( 'controller=upgrade' )->setQueryString( array( 'key' => $_SESSION['uniqueKey'], 'mr_continue' => 1, 'mr' => \IPS\Request::i()->mr ) ) ) );
+		}
 		
 		return TRUE;
 	}

applications/blog/setup/upg_23002/queries.json

@@ -0,0 +1,22 @@
+{
+    "1": {
+        "method": "addIndex",
+        "params": [
+            "blog_views",
+            {
+                "type": "key",
+                "name": "blog_id",
+                "columns": [
+                    "blog_id"
+                ]
+            }
+        ]
+    },
+    "2": {
+        "method": "delete",
+        "params": [
+            "core_sys_conf_settings",
+            "conf_key='blog_exturl_newwindow'"
+        ]
+    }
+}

applications/blog/setup/upg_23002/queries.php

@@ -1,7 +0,0 @@
-<?php
-
-// Add indexs on blog_views
-$SQL[] = "ALTER TABLE blog_views ADD INDEX ( blog_id );";
-
-// Remove unused settings
-$SQL[] = "DELETE FROM core_sys_conf_settings WHERE conf_key='blog_exturl_newwindow';";

applications/blog/setup/upg_24000/queries.json

@@ -0,0 +1,137 @@
+{
+    "1": {
+        "method": "dropColumn",
+        "params": [
+            "blog_comments",
+            "comment_queued"
+        ]
+    },
+    "2": {
+        "method": "changeColumn",
+        "params": [
+            "blog_comments",
+            "ip_address",
+            {
+                "name": "ip_address",
+                "type": "varchar",
+                "length": 46,
+                "default": null,
+                "allow_null": true
+            }
+        ]
+    },
+    "3": {
+        "method": "changeColumn",
+        "params": [
+            "blog_trackback",
+            "ip_address",
+            {
+                "name": "ip_address",
+                "type": "varchar",
+                "length": 46,
+                "default": null,
+                "allow_null": true
+            }
+        ]
+    },
+    "4": {
+        "method": "changeColumn",
+        "params": [
+            "blog_trackback_spamlogs",
+            "ip_address",
+            {
+                "name": "ip_address",
+                "type": "varchar",
+                "length": 46,
+                "default": null,
+                "allow_null": true
+            }
+        ]
+    },
+    "5": {
+        "method": "changeColumn",
+        "params": [
+            "blog_voters",
+            "ip_address",
+            {
+                "name": "ip_address",
+                "type": "varchar",
+                "length": 46,
+                "default": null,
+                "allow_null": true
+            }
+        ]
+    },
+    "6": {
+        "method": "changeColumn",
+        "params": [
+            "blog_akismet_logs",
+            "log_date",
+            {
+                "name": "log_date",
+                "type": "int",
+                "length": 10,
+                "default": 0,
+                "allow_null": false
+            }
+        ]
+    },
+    "7": {
+        "method": "dropColumn",
+        "params": [
+            "blog_comments",
+            [
+                "comment_use_sig",
+                "comment_use_emo",
+                "comment_html_state",
+                "comment_append_edit",
+                "comment_edit_name"
+            ]
+        ]
+    },
+    "8": {
+        "method": "dropIndex",
+        "params": [
+            "blog_comments",
+            "comment_entry_id"
+        ]
+    },
+    "9": {
+        "method": "addIndex",
+        "params": [
+            "blog_comments",
+            {
+                "type": "key",
+                "name": "entry_id",
+                "columns": [
+                    "entry_id",
+                    "comment_approved"
+                ]
+            }
+        ]
+    },
+    "10": {
+        "method": "changeIndex",
+        "params": [
+            "blog_entries",
+            "entry_status",
+            {
+                "type": "key",
+                "name": "entry_status",
+                "columns": [
+                    "entry_status",
+                    "entry_last_update"
+                ]
+            }
+        ]
+    },
+    "11": {
+        "method": "update",
+        "params": [
+            "blog_blogs",
+            {
+                "blog_skin_id": 0
+            }
+        ]
+    }
+}

applications/blog/setup/upg_24000/queries.php

@@ -1,28 +0,0 @@
-<?php
-
-/* Get DB functions/prefix */
-$PRE = \IPS\Db::i()->prefix;
-$DB  = \IPS\Db::i();
-
-// Remove unused column - sometimes we don't have it thought...
-if ( $DB->checkForColumn( 'blog_comments', 'comment_queued' ) )
-{
-	$SQL[] = "ALTER TABLE blog_comments DROP comment_queued;";
-}
-
-$SQL[] = "ALTER TABLE blog_comments CHANGE ip_address ip_address VARCHAR( 46 ) NULL DEFAULT NULL;";
-$SQL[] = "ALTER TABLE blog_trackback CHANGE ip_address ip_address VARCHAR( 46 ) NULL DEFAULT NULL;";
-$SQL[] = "ALTER TABLE blog_trackback_spamlogs CHANGE ip_address ip_address VARCHAR( 46 ) NULL DEFAULT NULL;";
-$SQL[] = "ALTER TABLE blog_voters CHANGE ip_address ip_address VARCHAR( 46 ) NOT NULL;";
-$SQL[] = "ALTER TABLE blog_akismet_logs CHANGE log_date log_date INT( 10 ) NOT NULL DEFAULT '0';";
-
-/* Drop unused fields */
-$SQL[] = "ALTER TABLE blog_comments DROP comment_use_sig, DROP comment_use_emo, DROP comment_html_state, DROP comment_append_edit, 
-	DROP comment_edit_name, DROP INDEX comment_entry_id, ADD INDEX ( entry_id, comment_approved );";
-
-/* Mess up indexes */
-$SQL[] = "ALTER TABLE blog_entries DROP INDEX entry_status, ADD INDEX entry_status ( entry_status, entry_last_update );";
-
-
-/* Remove custom skin choice */
-$SQL[] = "UPDATE blog_blogs SET blog_skin_id=0;";

applications/blog/setup/upg_25000/queries.json

@@ -0,0 +1,61 @@
+{
+    "1": {
+        "method": "dropColumn",
+        "params": [
+            "blog_blogs",
+            "blog_header_id"
+        ]
+    },
+    "2": {
+        "method": "dropTable",
+        "params": [
+            "blog_headers"
+        ]
+    },
+    "3": {
+        "method": "delete",
+        "params": [
+            "core_sys_conf_settings",
+            "conf_key IN ('blog_enable_dheader','blog_cache_dheader','blog_headers')"
+        ]
+    },
+    "4": {
+        "method": "addColumn",
+        "params": [
+            "blog_entries",
+            {
+                "name": "entry_image",
+                "type": "varchar",
+                "length": 255,
+                "allow_null": false,
+                "default": ""
+            }
+        ]
+    },
+    "5": {
+        "method": "addColumn",
+        "params": [
+            "blog_entries",
+            {
+                "name": "entry_views",
+                "type": "int",
+                "length": 10,
+                "allow_null": false,
+                "default": 0
+            }
+        ]
+    },
+    "6": {
+        "method": "addColumn",
+        "params": [
+            "blog_views",
+            {
+                "name": "entry_id",
+                "type": "int",
+                "length": 10,
+                "allow_null": false,
+                "default": 0
+            }
+        ]
+    }
+}

applications/blog/setup/upg_25000/queries.php

@@ -1,10 +0,0 @@
-<?php
-
-$SQL[] = "ALTER TABLE blog_blogs DROP COLUMN blog_header_id;";
-$SQL[] = "DROP TABLE blog_headers;";
-
-$SQL[] = "DELETE FROM core_sys_conf_settings WHERE conf_key IN ('blog_enable_dheader','blog_cache_dheader','blog_headers');";
-
-$SQL[] = "ALTER TABLE blog_entries ADD COLUMN entry_image VARCHAR(255) NOT NULL DEFAULT '', ADD COLUMN entry_views INT(10) NOT NULL DEFAULT 0;";
-
-$SQL[] = "ALTER TABLE blog_views ADD COLUMN entry_id INT(10) NOT NULL DEFAULT 0;";

applications/blog/setup/upg_25004/queries.json

@@ -0,0 +1,9 @@
+{
+    "1": {
+        "method": "delete",
+        "params": [
+            "core_sys_conf_settings",
+            "conf_key='blog_masks'"
+        ]
+    }
+}

applications/blog/setup/upg_25004/queries.php

@@ -1,5 +0,0 @@
-<?php
-
-// Some installs may still have this old (hidden) settings group installed
-$SQL[] = "DELETE FROM core_sys_settings_titles WHERE conf_title_keyword='blog_masks';";
-

applications/blog/setup/upg_25004/upgrade.php

@@ -1,38 +0,0 @@
-<?php
-/**
- * @brief		4.0.0 Upgrade Code
- * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - SVN_YYYY Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Social Suite
- * @subpackage	Blog
- * @since		03 Mar 2014
- * @version		SVN_VERSION_NUMBER
- */
-
-namespace IPS\blog\setup\upg_25004;
-
-/* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
-{
-	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
-	exit;
-}
-
-/**
- * 4.0.0 Upgrade Code
- */
-class _Upgrade
-{
-	/**
-	 * Conversion from 3.0
-	 *
-	 * @return	array	If returns TRUE, upgrader will proceed to next step. If it returns any other value, it will set this as the value of the 'extra' GET parameter and rerun this step (useful for loops)
-	 */
-	public function step1()
-	{
-		\IPS\core\Setup\Upgrade::runLegacySql( 'blog', 25004 );
-		
-		return TRUE;
-	}
-}

applications/blog/setup/upg_25005/queries.json

@@ -0,0 +1,41 @@
+{
+    "1": {
+        "method": "update",
+        "params": [
+            "blog_entries",
+            {
+                "entry_short": ""
+            }
+        ]
+    },
+    "2": {
+        "method": "changeIndex",
+        "params": [
+            "blog_comments",
+            "comment_member_id",
+            {
+                "type": "key",
+                "name": "comment_member_id",
+                "columns": [
+                    "member_id",
+                    "comment_date"
+                ]
+            }
+        ]
+    },
+    "3": {
+        "method": "changeIndex",
+        "params": [
+            "blog_category_mapping",
+            "map_entry_id",
+            {
+                "type": "key",
+                "name": "map_blog_id",
+                "columns": [
+                    "map_blog_id",
+                    "map_entry_id"
+                ]
+            }
+        ]
+    }
+}

applications/blog/setup/upg_25005/queries.php

@@ -1,9 +0,0 @@
-<?php
-
-// Reset short entries (#35240)
-$SQL[] = "UPDATE blog_entries SET entry_short='';";
-
-
-# New indexes, to avoid filesorts & full table scans
-$SQL[] = "ALTER TABLE blog_comments DROP INDEX comment_member_id, ADD INDEX comment_member_id ( member_id, comment_date );";
-$SQL[] = "ALTER TABLE blog_category_mapping DROP INDEX map_entry_id, ADD INDEX map_blog_id ( map_blog_id, map_entry_id );";

applications/blog/setup/upg_25005/upgrade.php

@@ -1,38 +0,0 @@
-<?php
-/**
- * @brief		4.0.0 Upgrade Code
- * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - SVN_YYYY Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Social Suite
- * @subpackage	Blog
- * @since		03 Mar 2014
- * @version		SVN_VERSION_NUMBER
- */
-
-namespace IPS\blog\setup\upg_25005;
-
-/* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
-{
-	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
-	exit;
-}
-
-/**
- * 4.0.0 Upgrade Code
- */
-class _Upgrade
-{
-	/**
-	 * Conversion from 3.0
-	 *
-	 * @return	array	If returns TRUE, upgrader will proceed to next step. If it returns any other value, it will set this as the value of the 'extra' GET parameter and rerun this step (useful for loops)
-	 */
-	public function step1()
-	{
-		\IPS\core\Setup\Upgrade::runLegacySql( 'blog', 25005 );
-		
-		return TRUE;
-	}
-}

applications/blog/setup/upg_40000/upgrade.php

@@ -2,9 +2,9 @@
 /**
  * @brief		4.0.0 Upgrade Code
  * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - SVN_YYYY Invision Power Services, Inc.
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
  * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Social Suite
+ * @package		IPS Community Suite
  * @subpackage	Blog
  * @since		03 Mar 2014
  * @version		SVN_VERSION_NUMBER
@@ -129,8 +129,8 @@ class _Upgrade
 	 */
 	public function step2()
 	{
-		\IPS\Db::i()->insert( 'core_ratings', 
-			\IPS\Db::i()->select( "NULL, 'IPS\\blog\\Entry', entry_id, member_id, rating, ''", 'blog_ratings', NULL, NULL, NULL, array( 'entry_id', 'member_id' ) )
+		\IPS\Db::i()->replace( 'core_ratings', 
+			\IPS\Db::i()->select( "NULL, 'IPS\\blog\\Entry', entry_id, member_id, rating, ''", 'blog_ratings' )
 		);
 
 		return TRUE;

applications/blog/sources/Blog/Blog.php

@@ -2,9 +2,9 @@
 /**
  * @brief		Blog Node
  * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - SVN_YYYY Invision Power Services, Inc.
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
  * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Social Suite
+ * @package		IPS Community Suite
  * @subpackage	Blog
  * @since		3 Mar 2014
  * @version		SVN_VERSION_NUMBER
@@ -101,7 +101,20 @@ class _Blog extends \IPS\Node\Model implements \IPS\Node\Ratings, \IPS\Content\E
 	 * @brief	Cover Photo Storage Extension
 	 */
 	public static $coverPhotoStorageExtension = 'blog_Blogs';
-	
+
+	/**
+	 * Columns needed to query for search result / stream view
+	 *
+	 * @return	array
+	 */
+	public static function basicDataColumns()
+	{
+		$return = parent::basicDataColumns();
+		$return[] = 'blog_name';
+		$return[] = 'blog_member_id';
+		return $return;
+	}
+
 	/**
 	 * Get template for content tables
 	 *
@@ -134,7 +147,20 @@ class _Blog extends \IPS\Node\Model implements \IPS\Node\Ratings, \IPS\Content\E
 		
 		return FALSE;
 	}
-	
+
+	/**
+	 * Get title from index data
+	 *
+	 * @param	array		$indexData		Data from the search index
+	 * @param	array		$itemData		Basic data about the item. Only includes columns returned by item::basicDataColumns()
+	 * @param	array|NULL	$containerData	Basic data about the author. Only includes columns returned by container::basicDataColumns()
+	 * @return	\IPS\Http\Url
+	 */
+	public static function titleFromIndexData( $indexData, $itemData, $containerData )
+	{
+		return ( $containerData['blog_member_id'] ) ? $containerData['blog_name'] : parent::titleFromIndexData( $indexData, $itemData, $containerData );
+	}
+
 	/**
 	 * Check permissions
 	 *
@@ -145,18 +171,24 @@ class _Blog extends \IPS\Node\Model implements \IPS\Node\Ratings, \IPS\Content\E
 	 */
 	public function can( $permission, $member=NULL )
 	{		
+		/* Load member */
+		if ( $member === NULL )
+		{
+			$member = \IPS\Member::loggedIn();
+		}
+
 		if ( $this->social_group )
 		{
-			if ( !\IPS\Member::loggedIn()->member_id )
+			if ( !$member->member_id )
 			{
 				return FALSE;
 			}
 			
-			if ( \IPS\Member::loggedIn()->member_id !== $this->member_id )
+			if ( $member->member_id !== $this->member_id )
 			{
 				try
 				{
-					\IPS\Db::i()->select( '*', 'core_sys_social_group_members', array( 'group_id=? AND member_id=?', $this->social_group, \IPS\Member::loggedIn()->member_id ) )->first();
+					\IPS\Db::i()->select( '*', 'core_sys_social_group_members', array( 'group_id=? AND member_id=?', $this->social_group, $member->member_id ) )->first();
 				}
 				catch ( \UnderflowException $e )
 				{
@@ -167,11 +199,11 @@ class _Blog extends \IPS\Node\Model implements \IPS\Node\Ratings, \IPS\Content\E
 		
 		if ( $permission === 'add' )
 		{
-			if ( !\IPS\Member::loggedIn()->member_id )
+			if ( !$member->member_id )
 			{
 				return FALSE;
 			}
-			elseif ( \IPS\Member::loggedIn()->member_id === $this->member_id )
+			elseif ( $member->member_id === $this->member_id )
 			{
 				return TRUE;
 			}
@@ -179,7 +211,7 @@ class _Blog extends \IPS\Node\Model implements \IPS\Node\Ratings, \IPS\Content\E
 			{
 				if ( $this->groupblog_ids )
 				{
-					return \IPS\Member::loggedIn()->inGroup( explode( ',', $this->groupblog_ids ) );
+					return $member->inGroup( explode( ',', $this->groupblog_ids ) );
 				}
 				else
 				{
@@ -267,14 +299,30 @@ class _Blog extends \IPS\Node\Model implements \IPS\Node\Ratings, \IPS\Content\E
 	{
 		if( $public )
 		{
-			$form->add( new \IPS\Helpers\Form\Text( 'blog_name', $this->id ? $this->_title : NULL, TRUE ) );
-			$form->add( new \IPS\Helpers\Form\Editor( 'blog_desc', $this->id ? $this->description : NULL, FALSE, array( 'app' => 'blog', 'key' => 'Blogs', 'autoSaveKey' => ( $this->id ? "blogs-blog-{$this->id}" : "blogs-new-blog" ), 'attachIds' => $this->id ? array( $this->id, NULL, 'description' ) : NULL, 'minimize' => 'blog_desc_placeholder' ) ) );
+			$form->add( new \IPS\Helpers\Form\Text( 'blog_name', $this->id ? $this->_title : NULL, TRUE, array(), NULL, NULL, NULL, 'blog_name' ) );
+			$form->add( new \IPS\Helpers\Form\Editor( 'blog_desc', $this->id ? $this->description : NULL, FALSE, array( 'app' => 'blog', 'key' => 'Blogs', 'autoSaveKey' => ( $this->id ? "blogs-blog-{$this->id}" : "blogs-new-blog" ), 'attachIds' => $this->id ? array( $this->id, NULL, 'description' ) : NULL, 'minimize' => 'blog_desc_placeholder' ), NULL, NULL, NULL, 'blog_desc_wrap' ) );
 		}
 		else
 		{
 			$form->addHeader( 'blog_settings' );
-			$form->add( new \IPS\Helpers\Form\Translatable( 'blog_name', NULL, TRUE, array( 'app' => 'blog', 'key' => ( $this->id ? "blogs_blog_{$this->id}" : NULL ) ) ) );
-			$form->add( new \IPS\Helpers\Form\Translatable( 'blog_desc', NULL, FALSE, array( 'app' => 'blog', 'key' => ( $this->id ? "blogs_blog_{$this->id}_desc" : NULL ), 'editor' => array( 'app' => 'blog', 'key' => 'Blogs', 'autoSaveKey' => ( $this->id ? "blogs-blog-{$this->id}" : "blogs-new-blog" ), 'attachIds' => $this->id ? array( $this->id, NULL, 'description' ) : NULL, 'minimize' => 'blog_desc_placeholder' ) ) ) );
+
+			/* Owned blogs */
+			$form->add( new \IPS\Helpers\Form\Text( 'blog_name', $this->id ? $this->_title : NULL, FALSE, array(), function( $value ) {
+				if ( \IPS\Request::i()->blog_type === 'member' AND !$value )
+				{
+					throw new \InvalidArgumentException( 'form_required' );
+				}
+			}, NULL, NULL, 'blog_name' ) );
+			$form->add( new \IPS\Helpers\Form\Editor( 'blog_desc', $this->id ? $this->desc : NULL, FALSE, array( 'app' => 'blog', 'key' => 'Blogs', 'autoSaveKey' => ( $this->id ? "blogs-blog-{$this->id}m" : "blogs-new-blog" ), 'attachIds' => $this->id ? array( $this->id, NULL, 'description' ) : NULL, 'minimize' => 'blog_desc_placeholder' ), NULL, NULL, NULL, 'blog_desc_wrap' ) );
+
+			/* Group blogs - only one or the other will show at any given time */
+			$form->add( new \IPS\Helpers\Form\Translatable( 'blog_name_group', ( $this->id AND !$this->groupblog_ids ) ? $this->_title : NULL, FALSE, array( 'app' => 'blog', 'key' => ( $this->id ? "blogs_blog_{$this->id}" : NULL ) ), function( $value ) {
+				if ( \IPS\Request::i()->blog_type !== 'member' AND !$value )
+				{
+					throw new \InvalidArgumentException( 'form_required' );
+				}
+			}, NULL, NULL, 'blog_name_group' ) );
+			$form->add( new \IPS\Helpers\Form\Translatable( 'blog_desc_group', NULL, FALSE, array( 'app' => 'blog', 'key' => ( $this->id ? "blogs_blog_{$this->id}_desc" : NULL ), 'editor' => array( 'app' => 'blog', 'key' => 'Blogs', 'autoSaveKey' => ( $this->id ? "blogs-blog-{$this->id}-group" : "blogs-new-blog-group" ), 'attachIds' => $this->id ? array( $this->id, NULL, 'description' ) : NULL, 'minimize' => 'blog_desc_placeholder' ) ), NULL, NULL, NULL, 'blog_desc_group_wrap' ) );
 		
 			$groups = array();
 			foreach ( \IPS\Member\Group::groups() as $k => $v )
@@ -299,8 +347,8 @@ class _Blog extends \IPS\Node\Model implements \IPS\Node\Ratings, \IPS\Content\E
 							'group' 	=> 'blog_type_group'
 					),
 					'toggles'	=> array(
-							'member'	=> array( 'blog_member_id' ),
-							'group'		=> array( 'blog_groupblog_ids', 'blog_groupblog_name' )
+							'member'	=> array( 'blog_member_id', 'blog_name', 'blog_desc_wrap' ),
+							'group'		=> array( 'blog_groupblog_ids', 'blog_groupblog_name', 'blog_name_group', 'blog_desc_group_wrap' )
 					)
 			) ) );
 			
@@ -348,21 +396,25 @@ class _Blog extends \IPS\Node\Model implements \IPS\Node\Ratings, \IPS\Content\E
 	 */
 	public function formatFormValues( $values )
 	{
-		$this->member_id = 0;
 		if( isset( $values['blog_type'] ) and $values['blog_type'] == 'member' and isset( $values['blog_member_id'] ) and is_object( $values['blog_member_id'] ) )
 		{
 			$values['blog_member_id']->create_menu = NULL;
 			$values['blog_member_id']->save();
-			$values['blog_member_id'] = $values['blog_member_id']->member_id;
-			$this->member_id = $values['blog_member_id'];
+			$values['blog_member_id']		= $values['blog_member_id']->member_id;
+			$values['blog_groupblog_ids']	= '';
+			$this->member_id				= $values['blog_member_id'];
 		}
-		else if ( !isset( $values['blog_type'] ) )
+		else if ( !$this->id and !isset( $values['blog_type'] ) )
 		{
 			$values['blog_member_id'] = \IPS\Member::loggedIn()->member_id;
 			\IPS\Member::loggedIn()->create_menu = NULL;
 			\IPS\Member::loggedIn()->save();
 			$this->member_id = $values['blog_member_id'];
 		}
+		else if ( isset( $values['blog_type'] ) )
+		{
+			$this->member_id = 0;
+		}
 		
 		if( isset( $values['blog_type'] ) )
 		{
@@ -398,39 +450,129 @@ class _Blog extends \IPS\Node\Model implements \IPS\Node\Ratings, \IPS\Content\E
 		if ( !$this->id )
 		{
 			$this->save();
-			\IPS\File::claimAttachments( 'blogs-new-blog', $this->id, NULL, 'description', TRUE );
-		}
 
-		foreach ( array( 'blog_name' => "blogs_blog_{$this->id}", 'blog_desc' => "blogs_blog_{$this->id}_desc", 'blog_groupblog_name' => "blogs_groupblog_name_{$this->id}" ) as $fieldKey => $langKey )
-		{
-			if ( isset( $values[ $fieldKey ] ) )
+			if( $values['blog_member_id'] )
 			{
-				\IPS\Lang::saveCustom( 'blog', $langKey, $values[ $fieldKey ] );
-	
-				if ( $fieldKey === 'blog_name' )
-				{
-					$values['seo_name'] = \IPS\Http\Url::seoTitle( ( is_array( $values[ $fieldKey ] ) ) ? $values[ $fieldKey ][ \IPS\Lang::defaultLanguage() ] : $values[ $fieldKey ] );
-				}
-	
-				unset( $values[ $fieldKey ] );
+				\IPS\File::claimAttachments( 'blogs-new-blog', $this->id, NULL, 'description', TRUE );
+			}
+			else
+			{
+				\IPS\File::claimAttachments( 'blogs-new-blog-group', $this->id, NULL, 'description', TRUE );
 			}
 		}
 
-		if( isset( $values['blog_enable_rss'] ) )
+		/* If this is not a member blog we store the languages in the language system */
+		if( !$this->member_id )
+		{
+			foreach ( array( 'blog_name_group' => "blogs_blog_{$this->id}", 'blog_desc_group' => "blogs_blog_{$this->id}_desc", 'blog_groupblog_name' => "blogs_groupblog_name_{$this->id}" ) as $fieldKey => $langKey )
+			{
+				if ( isset( $values[ $fieldKey ] ) )
+				{
+					\IPS\Lang::saveCustom( 'blog', $langKey, $values[ $fieldKey ] );
+		
+					if ( $fieldKey === 'blog_name' )
+					{
+						$values['seo_name'] = \IPS\Http\Url\Friendly::seoTitle( ( is_array( $values[ $fieldKey ] ) ) ? $values[ $fieldKey ][ \IPS\Lang::defaultLanguage() ] : $values[ $fieldKey ] );
+					}
+		
+					unset( $values[ $fieldKey ] );
+				}
+			}
+
+			if( array_key_exists( 'blog_name', $values ) )
+			{
+				unset( $values['blog_name'] );
+			}
+
+			if( array_key_exists( 'blog_desc', $values ) )
+			{
+				unset( $values['blog_desc'] );
+			}
+		}
+		else
+		{
+			/* If we're changing the author of the blog update the feed */
+			if( isset( $values['blog_member_id'] ) )
+			{
+				try
+				{
+					$feed = \IPS\blog\Blog\Feed::constructFromData( \IPS\Db::i()->select( '*', 'blog_rss_import', array( 'rss_blog_id=?', $this->id ) )->first() );
+				}
+				catch ( \UnderflowException $e )
+				{
+					$feed = NULL;
+				}
+
+				if( $feed )
+				{
+					$feed->member = $values['blog_member_id'];
+					$feed->save();
+				}
+			}
+			
+			/* This is here in case an admin changes a group blog to a member blog */
+			\IPS\Lang::deleteCustom( 'blog', "blogs_blog_{$this->id}" );
+			\IPS\Lang::deleteCustom( 'blog', "blogs_blog_{$this->id}_desc" );
+			\IPS\Lang::deleteCustom( 'blog', "blogs_groupblog_name_{$this->id}" );
+
+			$values['seo_name'] = \IPS\Http\Url\Friendly::seoTitle( $values['blog_name'] );
+		}
+
+		if( array_key_exists( 'blog_name_group', $values ) )
+		{
+			unset( $values['blog_name_group'] );
+		}
+
+		if( array_key_exists( 'blog_desc_group', $values ) )
+		{
+			unset( $values['blog_desc_group'] );
+		}
+
+		if( array_key_exists( 'blog_groupblog_name', $values ) )
+		{
+			unset( $values['blog_groupblog_name'] );
+		}
+
+		if( array_key_exists( 'blog_enable_rss', $values ) )
 		{
 			$values['settings'] =  array( 'allowrss' => $values['blog_enable_rss'] );
 			unset( $values['blog_enable_rss'] );
 		}
 
 		/* Send to parent */
-		if( isset( $values['blog_member_id'] ) )
+		if( array_key_exists( 'blog_member_id', $values ) )
 		{
 			unset( $values['blog_member_id'] );
 		}
 
 		return $values;
 	}
-	
+
+	/**
+	 * [Node] Get the title to store in the log
+	 *
+	 * @return	string|null
+	 */
+	public function titleForLog()
+	{
+		if ( !$this->member_id )
+		{
+			try
+			{
+				return \IPS\Lang::load( \IPS\Lang::defaultLanguage() )->get( static::$titleLangPrefix . $this->_id );
+			}
+			catch( \UnderflowException $e )
+			{
+				/* If we're changing from a member blog to a group blog, the language string won't exist yet */
+				return $this->_title;
+			}
+		}
+		else
+		{
+			return $this->_title;
+		}
+	}
+
 	/**
 	 * @brief	Mass update search index after changes
 	 */
@@ -463,13 +605,20 @@ class _Blog extends \IPS\Node\Model implements \IPS\Node\Ratings, \IPS\Content\E
 	 */
 	public function get_seo_name()
 	{
-		if( !$this->_data['seo_name'] )
+		/* If we have the seo_name, just return it - don't query the language string */
+		if( $this->_data['seo_name'] )
 		{
-			$this->seo_name	= \IPS\Http\Url::seoTitle( \IPS\Lang::load( \IPS\Lang::defaultLanguage() )->get( 'blogs_blog_' . $this->id ) );
-			$this->save();
+			return $this->_data['seo_name'];
 		}
 
-		return $this->_data['seo_name'] ?: \IPS\Http\Url::seoTitle( \IPS\Lang::load( \IPS\Lang::defaultLanguage() )->get( 'blogs_blog_' . $this->id ) );
+		/* The seo_name isn't set, so let's fix that real quick and return it */
+		$title = $this->member_id ? $this->name : \IPS\Lang::load( \IPS\Lang::defaultLanguage() )->get( 'blogs_blog_' . $this->id );
+
+		$seoTitle = \IPS\Http\Url::seoTitle( $title );
+		$this->seo_name	= $seoTitle;
+		$this->save();
+
+		return $seoTitle;
 	}
 
 	/**
@@ -491,6 +640,29 @@ class _Blog extends \IPS\Node\Model implements \IPS\Node\Ratings, \IPS\Content\E
 	 * @brief	Cached latest entry
 	 */
 	protected $latestEntry = NULL;
+	
+	/**
+	 * Set last comment
+	 *
+	 * @param	\IPS\Content\Comment|NULL	$comment	The latest comment or NULL to work it out
+	 * @return	void
+	 * @note	Like Gallery, we actually want to set this to the last entry rather than comment. As such $comment is ignored.
+	 */
+	public function setLastComment( \IPS\Content\Comment $comment=NULL )
+	{
+		$lastUpdateColumn	= static::$databaseColumnMap['date'];
+		
+		if ( $latestEntry = $this->latestEntry() )
+		{
+			$this->$lastUpdateColumn = $latestEntry->date;
+		}
+		else
+		{
+			$this->$lastUpdateColumn = 0;
+		}
+		
+		$this->save();
+	}
 
 	/**
 	 * Get latest entry
@@ -527,22 +699,37 @@ class _Blog extends \IPS\Node\Model implements \IPS\Node\Ratings, \IPS\Content\E
 		
 		try 
 		{
+			/* Get member IDs and contributions count */
 			$select = \IPS\Db::i()->select(
-					"core_members.*, count( blog_entries.entry_id ) as contributions",
+					"entry_author_id, count( entry_id ) as contributions",
 					'blog_entries',
-					array( "entry_blog_id=?", $this->id ),
+					array( "entry_blog_id=? AND entry_author_id !=?", $this->id, 0 ),
 					"contributions DESC",
 					NULL,
-					array( 'member_id' )
-			)->join(
-					'core_members',
-					"blog_entries.entry_author_id=core_members.member_id"
-			);
-			
-			/* Get em! */
-			foreach( $select as $row )
+					array( 'entry_author_id' )
+			)->setKeyField( 'entry_author_id' )->setValueField( 'contributions' );
+
+			/* Get the member ids to load them in one query */
+			$memberIds	= array();
+			$members	= array();
+
+			foreach( $select as $member => $contributions )
 			{
-				$contributors[] = array ( 'member' => \IPS\Member::constructFromData( $row ), 'contributions' => $row['contributions'] );
+				$memberIds[] = $member;
+			}
+
+			if( count( $memberIds ) )
+			{
+				foreach( \IPS\Db::i()->select( '*', 'core_members', 'member_id IN(' . implode( ',', $memberIds ) . ')' ) as $member )
+				{
+					$members[ $member['member_id'] ] = \IPS\Member::constructFromData( $member );
+				}
+			}
+
+			/* Get em! */
+			foreach( $select as $member => $contributions )
+			{
+				$contributors[] = array( 'member' => $members[ $member ], 'contributions' => $contributions );
 			}
 		}
 		catch ( \UnderflowException $e ) {}
@@ -672,7 +859,34 @@ class _Blog extends \IPS\Node\Model implements \IPS\Node\Ratings, \IPS\Content\E
 	 */
 	protected function get__title()
 	{
-		return htmlspecialchars( \IPS\Member::loggedIn()->language()->get( static::$titleLangPrefix . $this->_id ), ENT_QUOTES | \IPS\HTMLENTITIES, 'UTF-8', FALSE );
+		return $this->member_id ? $this->name : \IPS\Member::loggedIn()->language()->addToStack( static::$titleLangPrefix . $this->_id );
+	}
+	
+	/**
+	 * Node titles can contain HTML. Apparently.
+	 *
+	 * @return string
+	 */
+	public function get__stripTagsTitle()
+	{
+		if ( $this->member_id )
+		{
+			return $this->name;
+		}
+		else
+		{
+			return \IPS\Member::loggedIn()->language()->addToStack( static::$titleLangPrefix . $this->_id, NULL, array( 'striptags' => true ) );
+		}
+	}
+
+	/**
+	 * Returns the title
+	 *
+	 * @return string
+	 */
+	protected function get_description()
+	{
+		return $this->member_id ? $this->desc : \IPS\Member::loggedIn()->language()->addToStack( static::$titleLangPrefix . $this->_id . static::$descriptionLangSuffix );
 	}
 
 	/**
@@ -721,7 +935,7 @@ class _Blog extends \IPS\Node\Model implements \IPS\Node\Ratings, \IPS\Content\E
 		}
 		catch ( \IPS\Http\Request\Exception $e )
 		{
-			\IPS\Log::i( LOG_ERR )->write( $e->getMessage() );
+			\IPS\Log::log( $e, 'pingomatic' );
 		}
 	}
 
@@ -742,19 +956,30 @@ class _Blog extends \IPS\Node\Model implements \IPS\Node\Ratings, \IPS\Content\E
 	 */
 	public function delete()
 	{
+		/* Delete RSS Imports */
 		\IPS\Db::i()->delete( 'blog_rss_import', array( "rss_blog_id=?", $this->_id ) );
-
+		
+		/* Delete Language Strings */
 		foreach ( array( 'blog_groupblog_name' => "blogs_groupblog_name_{$this->id}" ) as $fieldKey => $langKey )
 		{
 			\IPS\Lang::deleteCustom( 'blog', $langKey );
 		}
 		
+		/* Reset create menu */
 		$member = \IPS\Member::load( $this->member_id );
 		$member->create_menu = NULL;
 		$member->save();
-
+		
+		/* Unclaim Attachments */
 		\IPS\File::unclaimAttachments( 'blog_Blogs', $this->id );
-
+		
+		/* Delete Cover Photo -specifically call parent otherwise deleteOrMoveContent process cannot run within the AdminCP */
+		$photo = parent::coverPhoto();
+		$photo->delete();
+		
+		/* Delete Follows */
+		\IPS\Db::i()->delete( 'core_follow', array( "follow_app=? AND follow_area=? AND follow_rel_id=?", 'blog', 'blog', $this->_id ) );
+		
 		return parent::delete();
 	}
 	
@@ -782,31 +1007,69 @@ class _Blog extends \IPS\Node\Model implements \IPS\Node\Ratings, \IPS\Content\E
 	}
 
 	/**
-	 * Set last comment
+	 * [Node] Get content table meta description 
 	 *
-	 * @param	\IPS\Content\Comment	$comment	The latest comment or NULL to work it out
-	 * @return	void
+	 * @return	string
 	 */
-	public function setLastComment( \IPS\Content\Comment $comment=NULL )
+	public function metaDescription()
 	{
-		if ( $comment === NULL )
+		if( $this->member_id )
 		{
-			try
-			{
-				/* @note entry_hidden is flipped to map to "approved" */
-				$entry	= \IPS\blog\Entry::constructFromData( \IPS\Db::i()->select( '*', 'blog_entries', array( 'entry_blog_id=? AND entry_status=? AND entry_hidden=1 and entry_is_future_entry=0', $this->id, 'published' ), 'entry_date DESC', 1 )->first() );
-			}
-			catch ( \UnderflowException $e )
-			{
-				$this->last_edate		= 0;
-				return;
-			}
-		}
-		else
-		{
-			$entry = $comment->item();
+			return strip_tags( $this->desc );
 		}
 
-		$this->last_edate		= $entry->mapped('date');
+		return parent::metaDescription();
+	}
+	
+	/**
+	 * Get output for API
+	 *
+	 * @return	array
+	 * @apiresponse	int					id			ID number
+	 * @apiresponse	string				name		Name
+	 * @apiresponse	string				description	Description
+	 * @apiresponse	\IPS\Member			owner		If the blog is owned by a single member, the member
+	 * @apiresponse	[\IPS\Member\Group]	groups		If the blog is owned by groups, an array of the groups
+	 * @apiresponse	bool				pinned		If the blog is pinned
+	 * @apiresponse	int					entries		Number of entries
+	 * @apiresponse	int					comments	Number of comments
+	 * @apiresponse	string				url			URL
+	 */
+	public function apiOutput()
+	{
+		$groups = array();
+		if ( $this->groupblog_ids )
+		{
+			foreach ( array_filter( explode( ',', $this->groupblog_ids ) ) as $groupId )
+			{
+				try
+				{
+					$groups[] = \IPS\Member\Group::load( $groupId )->apiOutput();
+				}
+				catch ( \OutOfRangeException $e ) { }
+			}
+		}
+		
+		return array(
+			'id'			=> $this->id,
+			'name'			=> $this->_title,
+			'description'	=> $this->member_id ? $this->desc : \IPS\Member::loggedIn()->language()->addToStack("blogs_blog_{$this->id}_desc"),
+			'owner'			=> $this->member_id ? $this->owner()->apiOutput() : null,
+			'groups'		=> $groups,
+			'pinned'		=> (bool) $this->pinned,
+			'entries'		=> $this->count_entries,
+			'comments'		=> $this->count_comments,
+			'url'			=> (string) $this->url()
+		);
+	}
+	
+	/**
+	 * Permission Types
+	 *
+	 * @return	array
+	 */
+	public function permissionTypes()
+	{
+		return array( 'view' => 'view', 'add' => 'add' );
 	}
 }

applications/blog/sources/Blog/Feed.php

@@ -2,9 +2,9 @@
 /**
  * @brief		Blog RSS/Atom feed active record
  * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - SVN_YYYY Invision Power Services, Inc.
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
  * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Social Suite
+ * @package		IPS Community Suite
  * @subpackage	Blog
  * @since		02 Apr 2014
  * @version		SVN_VERSION_NUMBER
@@ -43,10 +43,16 @@ class _Feed extends \IPS\Patterns\ActiveRecord
 	 * Run
 	 *
 	 * @return	void
-	 * @throws	\UnexpectedValueException
+	 * @throws	\IPS\Http\Url\Exception|\RuntimeException
 	 */
 	public function run()
 	{
+		/* Skip this if the member is restricted from posting */
+		if( \IPS\Member::load( $this->member )->restrict_post or \IPS\Member::load( $this->member )->members_bitoptions['unacknowledged_warnings'] )
+		{
+			return;
+		}
+
 		$previouslyImportedGuids = iterator_to_array( \IPS\Db::i()->select( 'rss_imported_guid', 'blog_rss_imported', array( 'rss_imported_impid=?', $this->id ) ) );
 		
 		$request = \IPS\Http\Url::external( $this->url )->request();
@@ -60,18 +66,43 @@ class _Feed extends \IPS\Patterns\ActiveRecord
 		
 		$inserts=array();
 		$i = 0;
-		foreach ( $request->decodeXml()->articles( $this->id ) as $guid => $article )
+		$request = $request->decodeXml();
+
+		if( !( $request instanceof \IPS\Xml\RssOne ) AND !( $request instanceof \IPS\Xml\Rss ) AND !( $request instanceof \IPS\Xml\Atom ) )
+		{
+			throw new \RuntimeException( 'rss_import_invalid' );
+		}
+
+		foreach ( $request->articles( $this->id ) as $guid => $article )
 		{
 			if ( !in_array( $guid, $previouslyImportedGuids ) )
 			{
 				$entry = \IPS\blog\Entry::createItem( \IPS\Member::load( $this->member ), NULL, $article['date'], $container );
 				$entry->name = $article['title'];
-				$entry->content = \IPS\Text\Parser::parseStatic( $article['content'] );
+				$entry->content = \IPS\Text\Parser::parseStatic( $article['content'], TRUE );
 				
 				if ( $article['link'] )
 				{
+					$rel = array();
+
+					if( \IPS\Settings::i()->posts_add_nofollow )
+					{
+						$rel['nofollow'] = 'nofollow';
+					}
+
+					if( \IPS\Settings::i()->links_external )
+					{
+						$rel['external'] = 'external';
+					}
+
+					$linkRelPart = '';
+					if ( count ( $rel ) )
+					{
+						$linkRelPart = 'rel="' .  implode($rel, ' ') . '"';
+					}
+
 					$link = htmlspecialchars( $this->import_show_link, ENT_QUOTES | \IPS\HTMLENTITIES, 'UTF-8', FALSE );
-					$entry->content .= "<br><p><a href='{$article['link']}'>{$link}</a></p>";
+					$entry->content .= "<br><p><a href='{$article['link']}' {$linkRelPart}>{$link}</a></p>";
 				}
 				
 				$entry->status = 'published';

applications/blog/sources/Blog/ProfileTable.php

@@ -2,9 +2,9 @@
 /**
  * @brief		Blog Profile Table Helper
  * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - SVN_YYYY Invision Power Services, Inc.
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
  * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Social Suite
+ * @package		IPS Community Suite
  * @subpackage	Blog
  * @since		18 Mar 2014
  * @version		SVN_VERSION_NUMBER

applications/blog/sources/Blog/Table.php

@@ -2,9 +2,9 @@
 /**
  * @brief		Blog Table Helper
  * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - SVN_YYYY Invision Power Services, Inc.
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
  * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Social Suite
+ * @package		IPS Community Suite
  * @subpackage	Blog
  * @since		18 Mar 2014
  * @version		SVN_VERSION_NUMBER

applications/blog/sources/Entry/Comment.php

@@ -2,9 +2,9 @@
 /**
  * @brief		Blog Entry Comment Model
  * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - SVN_YYYY Invision Power Services, Inc.
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
  * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Social Suite
+ * @package		IPS Community Suite
  * @subpackage	Blog
  * @since		3 Mar 2013
  * @version		SVN_VERSION_NUMBER
@@ -92,7 +92,7 @@ class _Comment extends \IPS\Content\Comment implements \IPS\Content\EditHistory,
 	 * @param	string		$order				MySQL ORDER BY clause (NULL to order by date)
 	 * @param	int|array	$limit				Limit clause
 	 * @param	string		$permissionKey		A key which has a value in the permission map (either of the container or of this class) matching a column ID in core_permission_index
-	 * @param	bool|NULL	$includeHiddenItems	Include hidden files? Boolean or NULL to detect if currently logged member has permission
+	 * @param	mixed		$includeHiddenItems	Include hidden comments? NULL to detect if currently logged in member has permission, -1 to return public content only, TRUE to return unapproved content and FALSE to only return unapproved content the viewing member submitted
 	 * @param	int			$queryFlags			Select bitwise flags
 	 * @param	\IPS\Member	$member				The member (NULL to use currently logged in member)
 	 * @param	bool		$joinContainer		If true, will join container data (set to TRUE if your $where clause depends on this data)
@@ -100,7 +100,7 @@ class _Comment extends \IPS\Content\Comment implements \IPS\Content\EditHistory,
 	 * @param	bool		$joinReviews		If true, will join review data (set to TRUE if your $where clause depends on this data)
 	 * @return	\IPS\Patterns\ActiveRecordIterator|int
 	 */
-	public static function getItemsWithPermission( $where=array(), $order=NULL, $limit=10, $permissionKey='read', $includeHiddenItems=NULL, $queryFlags=0, \IPS\Member $member=NULL, $joinContainer=FALSE, $joinComments=FALSE, $joinReviews=FALSE, $countOnly=FALSE, $joins=NULL )
+	public static function getItemsWithPermission( $where=array(), $order=NULL, $limit=10, $permissionKey='read', $includeHiddenItems=\IPS\Content\Hideable::FILTER_AUTOMATIC, $queryFlags=0, \IPS\Member $member=NULL, $joinContainer=FALSE, $joinComments=FALSE, $joinReviews=FALSE, $countOnly=FALSE, $joins=NULL )
 	{
 		if ( in_array( $permissionKey, array( 'view', 'read' ) ) )
 		{

applications/blog/sources/Entry/Entry.php

@@ -2,9 +2,9 @@
 /**
  * @brief		Entry Model
  * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - SVN_YYYY Invision Power Services, Inc.
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
  * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Social Suite
+ * @package		IPS Community Suite
  * @subpackage	Blog
  * @since		3 Mar 2014
  * @version		SVN_VERSION_NUMBER
@@ -89,7 +89,8 @@ class _Entry extends \IPS\Content\Item implements
 		'cover_photo'			=> 'cover_photo',
 		'cover_photo_offset'	=> 'cover_offset',
 		'is_future_entry'		=> 'is_future_entry',
-        'future_date'           => 'publish_date'
+        'future_date'           => 'publish_date',
+		'status'				=> 'status',
 	);
 	
 	/**
@@ -151,7 +152,7 @@ class _Entry extends \IPS\Content\Item implements
 	public function set_name( $name )
 	{
 		$this->_data['name'] = $name;
-		$this->_data['name_seo'] = \IPS\Http\Url::seoTitle( $name );
+		$this->_data['name_seo'] = \IPS\Http\Url\Friendly::seoTitle( $name );
 	}
 
 	/**
@@ -163,11 +164,11 @@ class _Entry extends \IPS\Content\Item implements
 	{
 		if( !$this->_data['name_seo'] )
 		{
-			$this->name_seo	= \IPS\Http\Url::seoTitle( $this->name );
+			$this->name_seo	= \IPS\Http\Url\Friendly::seoTitle( $this->name );
 			$this->save();
 		}
 
-		return $this->_data['name_seo'] ?: \IPS\Http\Url::seoTitle( $this->name );
+		return $this->_data['name_seo'] ?: \IPS\Http\Url\Friendly::seoTitle( $this->name );
 	}
 
 	/**
@@ -248,6 +249,11 @@ class _Entry extends \IPS\Content\Item implements
 			/* This will throw an exception of the row does not exist */
 			try
 			{
+				if( !$member->member_id )
+				{
+					return FALSE;
+				}
+
 				$member	= \IPS\Db::i()->select( '*', 'core_sys_social_group_members', array( 'group_id=? AND member_id=?', $this->container()->social_group, $member->member_id ) )->first();
 			}
 			catch( \UnderflowException $e )
@@ -266,7 +272,7 @@ class _Entry extends \IPS\Content\Item implements
 	 * @param	string		$order				MySQL ORDER BY clause (NULL to order by date)
 	 * @param	int|array	$limit				Limit clause
 	 * @param	string|NULL	$permissionKey		A key which has a value in the permission map (either of the container or of this class) matching a column ID in core_permission_index or NULL to ignore permissions
-	 * @param	bool|NULL	$includeHiddenItems	Include hidden files? Boolean or NULL to detect if currently logged member has permission
+	 * @param	mixed		$includeHiddenItems	Include hidden items? NULL to detect if currently logged in member has permission, -1 to return public content only, TRUE to return unapproved content and FALSE to only return unapproved content the viewing member submitted
 	 * @param	int			$queryFlags			Select bitwise flags
 	 * @param	\IPS\Member	$member				The member (NULL to use currently logged in member)
 	 * @param	bool		$joinContainer		If true, will join container data (set to TRUE if your $where clause depends on this data)
@@ -278,9 +284,10 @@ class _Entry extends \IPS\Content\Item implements
 	 * @param	bool		$joinTags			If true, will join the tags table
 	 * @param	bool		$joinAuthor			If true, will join the members table for the author
 	 * @param	bool		$joinLastCommenter	If true, will join the members table for the last commenter
+	 * @param	bool		$showMovedLinks		If true, moved item links are included in the results
 	 * @return	\IPS\Patterns\ActiveRecordIterator|int
 	 */
-	public static function getItemsWithPermission( $where=array(), $order=NULL, $limit=10, $permissionKey='read', $includeHiddenItems=NULL, $queryFlags=0, \IPS\Member $member=NULL, $joinContainer=FALSE, $joinComments=FALSE, $joinReviews=FALSE, $countOnly=FALSE, $joins=NULL, $skipPermission=FALSE, $joinTags=TRUE, $joinAuthor=TRUE, $joinLastCommenter=TRUE )
+	public static function getItemsWithPermission( $where=array(), $order=NULL, $limit=10, $permissionKey='read', $includeHiddenItems=\IPS\Content\Hideable::FILTER_AUTOMATIC, $queryFlags=0, \IPS\Member $member=NULL, $joinContainer=FALSE, $joinComments=FALSE, $joinReviews=FALSE, $countOnly=FALSE, $joins=NULL, $skipPermission=FALSE, $joinTags=TRUE, $joinAuthor=TRUE, $joinLastCommenter=TRUE, $showMovedLinks=FALSE )
 	{
 		if ( in_array( $permissionKey, array( 'view', 'read' ) ) )
 		{
@@ -295,7 +302,7 @@ class _Entry extends \IPS\Content\Item implements
                 $where[] = array( "(" . \IPS\Content::socialGroupGetItemsWithPermissionWhere( 'blog_blogs.blog_social_group', $member ) . " OR blog_blogs.blog_social_group IS NULL )" );
             }
 		}
-		return parent::getItemsWithPermission( $where, $order, $limit, $permissionKey, $includeHiddenItems, $queryFlags, $member, $joinContainer, $joinComments, $joinReviews, $countOnly, $joins, $skipPermission, $joinTags, $joinAuthor, $joinLastCommenter );
+		return parent::getItemsWithPermission( $where, $order, $limit, $permissionKey, $includeHiddenItems, $queryFlags, $member, $joinContainer, $joinComments, $joinReviews, $countOnly, $joins, $skipPermission, $joinTags, $joinAuthor, $joinLastCommenter, $showMovedLinks );
 	}
 	
 	/**
@@ -330,7 +337,7 @@ class _Entry extends \IPS\Content\Item implements
 	public static function formElements( $item=NULL, \IPS\Node\Model $container=NULL )
 	{
 		$return = parent::formElements( $item, $container );
-		$return['entry'] = new \IPS\Helpers\Form\Editor( 'blog_entry_content', $item ? $item->content : NULL, TRUE, array( 'app' => 'blog', 'key' => 'Entries', 'autoSaveKey' => 'blog-entry-' . $container->id, 'attachIds' => ( $item === NULL ? NULL : array( $item->id ) ) ) );
+		$return['entry'] = new \IPS\Helpers\Form\Editor( 'blog_entry_content', $item ? $item->content : NULL, TRUE, array( 'app' => 'blog', 'key' => 'Entries', 'autoSaveKey' => ( $item === NULL ) ? 'blog-entry-' . $container->id : 'blog-edit-' . $item->id, 'attachIds' => ( $item === NULL ? NULL : array( $item->id ) ) ) );
 
 		/* Gallery album association */
 		if( \IPS\Application::appIsEnabled( 'gallery' ) )
@@ -483,31 +490,43 @@ class _Entry extends \IPS\Content\Item implements
 			$blog->save();
 		}
 	}
-	
+
 	/**
 	 * Syncing to run when publishing something previously pending publishing
 	 *
+	 * @param	\IPS\Member|NULL|FALSE	$member	The member doing the action (NULL for currently logged in member, FALSE for no member)
 	 * @return	void
 	 */
-	public function onPublish()
+	public function onPublish( $member )
 	{
 		$this->status = 'published';
 		$this->save();
 		
-		parent::onPublish();
+		parent::onPublish( $member );
+		
+		/* The blog system is slightly different from the \Content future entry stuff. Future entries are treated as drafts,
+			so do count towards entries but parent::onPublish will try and increment item count again after publish */
+		$this->container()->resetCommentCounts();
+		$this->container()->save();
 	}
 	
 	/**
 	 * Syncing to run when unpublishing an item (making it a future dated entry when it was already published)
 	 *
+	 * @param	\IPS\Member|NULL|FALSE	$member	The member doing the action (NULL for currently logged in member, FALSE for no member)
 	 * @return	void
 	 */
-	public function onUnpublish()
+	public function onUnpublish( $member )
 	{
 		$this->status = 'draft';
 		$this->save();
 		
-		parent::onUnpublish();
+		parent::onUnpublish( $member );
+		
+		/* The blog system is slightly different from the \Content future entry stuff. Future entries are treated as drafts,
+			so do count towards entries but parent::onUnpublish will try and decrement item count after unpublish */
+		$this->container()->resetCommentCounts();
+		$this->container()->save();
 	}
 	
 	/**
@@ -586,4 +605,63 @@ class _Entry extends \IPS\Content\Item implements
         
         return parent::searchIndexPermissions();
     }
+
+	/**
+	 * WHERE clause for getting items for sitemap (permissions are already accounted for)
+	 *
+	 * @return	array
+	 */
+	public static function sitemapWhere()
+	{
+		return array( array( 'blog_entries.entry_is_future_entry=0 AND blog_entries.entry_status!=?', 'draft' ) );
+	}
+    
+	/**
+	 * Get output for API
+	 *
+	 * @return	array
+	 * @apiresponse	int						id				ID number
+	 * @apiresponse	string					title			Title
+	 * @apiresponse	\IPS\blog\Blog			blog			Blog
+	 * @apiresponse	\IPS\Member				author			The member that created the entry
+	 * @apiresponse	bool					draft			If this entry is a draft
+	 * @apiresponse	datetime				date			Date
+	 * @apiresponse	string					entry			Entry content
+	 * @apiresponse	int						comments		Number of comments
+	 * @apiresponse	int						views			Number of posts
+	 * @apiresponse	string					prefix			The prefix tag, if there is one
+	 * @apiresponse	[string]				tags			The tags
+	 * @apiresponse	bool					locked			Entry is locked
+	 * @apiresponse	bool					hidden			Entry is hidden
+	 * @apiresponse	bool					future			Will be published at a future date?
+	 * @apiresponse	bool					pinned			Entry is pinned
+	 * @apiresponse	bool					featured		Entry is featured
+	 * @apiresponse	\IPS\Poll				poll			Poll data, if there is one
+	 * @apiresponse	string					url				URL
+	 * @apiresponse	float					rating			Average Rating
+	 */
+	public function apiOutput()
+	{
+		return array(
+			'id'			=> $this->id,
+			'title'			=> $this->name,
+			'blog'			=> $this->container()->apiOutput(),
+			'author'		=> $this->author()->apiOutput(),
+			'draft'			=> $this->status == 'draft',
+			'date'			=> \IPS\DateTime::ts( $this->date )->rfc3339(),
+			'entry'			=> $this->content(),
+			'comments'		=> $this->num_comments,
+			'views'			=> $this->views,
+			'prefix'		=> $this->prefix(),
+			'tags'			=> $this->tags(),
+			'locked'		=> (bool) $this->locked(),
+			'hidden'		=> (bool) $this->hidden(),
+			'future'		=> $this->isFutureDate(),
+			'pinned'		=> (bool) $this->mapped('pinned'),
+			'featured'		=> (bool) $this->mapped('featured'),
+			'poll'			=> $this->poll_state ? \IPS\Poll::load( $this->poll_state )->apiOutput() : null,
+			'url'			=> (string) $this->url(),
+			'rating'		=> $this->averageRating(),
+		);
+	}
 }

applications/blog/tasks/blogrssimport.php

@@ -2,10 +2,10 @@
 /**
  * @brief		blogrssimport Task
  * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - SVN_YYYY Invision Power Services, Inc.
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
  * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Social Suite
- * @subpackage	blog
+ * @package		IPS Community Suite
+ * @subpackage	Blog
  * @since		02 Apr 2014
  * @version		SVN_VERSION_NUMBER
  */
@@ -45,11 +45,18 @@ class _blogrssimport extends \IPS\Task
 		/* UnderflowException means there's no feed, so we can disable the task */
 		catch ( \UnderflowException $e )
 		{
-			\IPS\DB::i()->update( 'core_tasks', array( 'enabled' => 0 ), array( '`key`=?', 'blogrssimport' ) );
+			\IPS\Db::i()->update( 'core_tasks', array( 'enabled' => 0 ), array( '`key`=?', 'blogrssimport' ) );
 		}
 		/* Any other exception means an error which should be logged */
 		catch ( \Exception $e )
 		{
+			/* If there is an error, we need to log it but the error should not prevent other feeds from importing */
+			if ( isset( $feed ) AND ( $feed instanceof \IPS\blog\Blog\Feed ) )
+			{
+				$feed->last_import = time();
+				$feed->save();
+			}
+			
 			return $e->getMessage();
 		}
 	}

applications/blog/widgets/blogCommentFeed.php

@@ -2,10 +2,10 @@
 /**
  * @brief		blogCommentFeed Widget
  * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - SVN_YYYY Invision Power Services, Inc.
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
  * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Social Suite
- * @subpackage	blog
+ * @package		IPS Community Suite
+ * @subpackage	Blog
  * @since		13 Jul 2015
  * @version		SVN_VERSION_NUMBER
  */
@@ -43,6 +43,11 @@ class _blogCommentFeed extends \IPS\Content\WidgetComment
 	 * Class
 	 */
 	protected static $class = 'IPS\blog\Entry\Comment';
+
+	/**
+	 * @brief	Moderator permission to generate caches on [optional]
+	 */
+	protected $moderatorPermissions	= array( 'can_view_hidden_content', 'can_view_hidden_blog_entry_comment' );
 	
 	/**
 	 * Get where clause

applications/blog/widgets/blogStatistics.php

@@ -2,10 +2,10 @@
 /**
  * @brief		blogStatistics Widget
  * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - SVN_YYYY Invision Power Services, Inc.
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
  * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Social Suite
- * @subpackage	blog
+ * @package		IPS Community Suite
+ * @subpackage	Blog
  * @since		14 May 2014
  * @version		SVN_VERSION_NUMBER
  */

applications/blog/widgets/blogs.php

@@ -2,10 +2,10 @@
 /**
  * @brief		blogs Widget
  * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - SVN_YYYY Invision Power Services, Inc.
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
  * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Social Suite
- * @subpackage	blog
+ * @package		IPS Community Suite
+ * @subpackage	Blog
  * @since		13 Jul 2015
  * @version		SVN_VERSION_NUMBER
  */
@@ -39,6 +39,18 @@ class _blogs extends \IPS\Widget\PermissionCache
 	 */
 	public $plugin = '';
 	
+	/**
+	 * Initialize this widget
+	 *
+	 * @return	void
+	 */
+	public function init()
+	{
+		\IPS\Output::i()->cssFiles = array_merge( \IPS\Output::i()->cssFiles, \IPS\Theme::i()->css( 'blog.css', 'blog' ) );
+		
+		parent::init();
+	}
+	
 	/**
 	 * Specify widget configuration
 	 *
@@ -68,7 +80,7 @@ class _blogs extends \IPS\Widget\PermissionCache
 			}
 		}
 		catch( \OutOfRangeException $ex ) { }
-		$form->add( new \IPS\Helpers\Form\Member( 'widget_feed_author', $author, FALSE, array( 'multiple' => true ) ) );
+		$form->add( new \IPS\Helpers\Form\Member( 'widget_feed_author', $author, FALSE, array( 'multiple' => null ) ) );
 
 
 
@@ -92,10 +104,10 @@ class _blogs extends \IPS\Widget\PermissionCache
 		/* Number to show */
 		$form->add( new \IPS\Helpers\Form\Number( 'widget_feed_show', isset( $this->configuration['widget_feed_show'] ) ? $this->configuration['widget_feed_show'] : 5, TRUE ) );
 
-		$form->add( new \IPS\Helpers\Form\Select( 'widget_feed_sort_on', isset( $this->configuration['widget_feed_sort_on'] ) ? $this->configuration['widget_feed_sort_on'] : 'blog_edate', FALSE, array( 'options' => array(
-			'blog_edate'    => 'widget__blog_edate',
-			'blog_entries'  => 'widget__blog_count_entries',
-			'blog_comments' => 'widget__blog_count_comments'
+		$form->add( new \IPS\Helpers\Form\Select( 'widget_feed_sort_on', isset( $this->configuration['widget_feed_sort_on'] ) ? $this->configuration['widget_feed_sort_on'] : 'blog_last_edate', FALSE, array( 'options' => array(
+			'blog_last_edate'		=> 'widget__blog_edate',
+			'blog_count_entries'  	=> 'widget__blog_count_entries',
+			'blog_count_comments' 	=> 'widget__blog_count_comments'
 		) ) ), NULL, NULL, NULL, 'widget_feed_sort_on' );
 
 		$form->add( new \IPS\Helpers\Form\Select( 'widget_feed_sort_dir', isset( $this->configuration['widget_feed_sort_dir'] ) ? $this->configuration['widget_feed_sort_dir'] : 'desc', FALSE, array(
@@ -104,7 +116,29 @@ class _blogs extends \IPS\Widget\PermissionCache
 				'asc'    => 'ascending'
 			)
 		) ) );
+		return $form;
+	}
 
+	/**
+	 * Ran before saving widget configuration
+	 *
+	 * @param	array	$values	Values from form
+	 * @return	array
+	 */
+	public function preConfig( $values )
+	{
+		if ( is_array( $values['widget_feed_author'] ) )
+		{
+			$members = array();
+			foreach( $values['widget_feed_author'] as $member )
+			{
+				$members[] = $member->member_id;
+			}
+
+			$values['widget_feed_author'] = $members;
+		}
+
+		return $values;
 	}
 
 	/**
@@ -118,7 +152,7 @@ class _blogs extends \IPS\Widget\PermissionCache
 		$sortBy = ( isset( $this->configuration['widget_feed_sort_on'] ) and isset( $this->configuration['widget_feed_sort_dir'] ) ) ? ( $this->configuration['widget_feed_sort_on'] . ' ' . $this->configuration['widget_feed_sort_dir'] ) : NULL;
 		$limit  = isset( $this->configuration['widget_feed_show'] ) ? $this->configuration['widget_feed_show'] : 5;
 
-		if ( isset( $this->configuration['widget_feed_author'] ) and is_array( $this->configuration['widget_feed_author'] ) )
+		if ( isset( $this->configuration['widget_feed_author'] ) and is_array( $this->configuration['widget_feed_author'] ) and count( $this->configuration['widget_feed_author'] ) )
 		{
 			$where[] = array( \IPS\Db::i()->in( 'blog_member_id', $this->configuration['widget_feed_author'] ) );
 		}

applications/blog/widgets/entryFeed.php

@@ -2,10 +2,10 @@
 /**
  * @brief		Blog Entry Feed Widget
  * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - SVN_YYYY Invision Power Services, Inc.
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
  * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Social Suite
- * @subpackage	forums
+ * @package		IPS Community Suite
+ * @subpackage	Blog
  * @since		22 Jun 2015
  * @version		SVN_VERSION_NUMBER
  */

applications/blog/widgets/recentEntries.php

@@ -2,10 +2,10 @@
 /**
  * @brief		Recent Entries Widget
  * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - SVN_YYYY Invision Power Services, Inc.
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
  * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Social Suite
- * @subpackage	blog
+ * @package		IPS Community Suite
+ * @subpackage	Blog
  * @since		10 Mar 2014
  * @version		SVN_VERSION_NUMBER
  */
@@ -63,7 +63,7 @@ class _recentEntries extends \IPS\Widget\PermissionCache
 	 */
 	public function render()
 	{
-		$entries = \IPS\blog\Entry::getItemsWithPermission( array( array( 'entry_status!=?', 'draft' ) ), NULL, isset( $this->configuration['number_to_show'] ) ? $this->configuration['number_to_show'] : 5 );
+		$entries = \IPS\blog\Entry::getItemsWithPermission( array( array( 'entry_status!=?', 'draft' ) ), NULL, isset( $this->configuration['number_to_show'] ) ? $this->configuration['number_to_show'] : 5, 'read', \IPS\Content\Hideable::FILTER_PUBLIC_ONLY );
 		if ( count( $entries ) )
 		{
 			return $this->output( $entries );

applications/calendar/Application.php

@@ -3,7 +3,7 @@
  * @brief		Calendar Application Class
  * @author		<a href=''>Invision Power Services, Inc.</a>
  * @copyright	(c) 2013 Invision Power Services, Inc.
- * @package		IPS Social Suite
+ * @package		IPS Community Suite
  * @subpackage	Calendar
  * @since		18 Dec 2013
  * @version		
@@ -30,7 +30,7 @@ class _Application extends \IPS\Application
 			if( \IPS\Request::i()->member )
 			{
 				$member = \IPS\Member::load( \IPS\Request::i()->member );
-				if( \IPS\Request::i()->key != md5( ( $member->members_pass_hash ?: $member->email ) . $member->members_pass_salt ) )
+				if( !\IPS\Login::compareHashes( md5( ( $member->members_pass_hash ?: $member->email ) . $member->members_pass_salt ), (string) \IPS\Request::i()->key ) )
 				{
 					\IPS\Output::i()->error( 'node_error', '2L217/1', 404, '' );
 				}
@@ -77,11 +77,18 @@ class _Application extends \IPS\Application
 		/* Are we viewing a specific calendar only? */
 		if( \IPS\Request::i()->id )
 		{
-			$calendar = \IPS\calendar\Calendar::load( \IPS\Request::i()->id );
-
-			if ( !$calendar->can( 'view' ) )
+			try
 			{
-				throw new \OutOfRangeException;
+				$calendar = \IPS\calendar\Calendar::load( \IPS\Request::i()->id );
+
+				if ( !$calendar->can( 'view', $member ) )
+				{
+					throw new \OutOfRangeException;
+				}
+			}
+			catch( \OutOfRangeException $e )
+			{
+				\IPS\Output::i()->error( 'node_error', '2L217/3', 404, '' );
 			}
 		}
 
@@ -92,7 +99,7 @@ class _Application extends \IPS\Application
 			$where[] = array( 'event_calendar_id=?', $calendar->id );
 		}
 
-		foreach( \IPS\calendar\Event::getItemsWithPermission( $where, 'event_lastupdated DESC', 500, 'read', NULL, 0, $member ) as $event )
+		foreach( \IPS\calendar\Event::getItemsWithPermission( $where, 'event_lastupdated DESC', 500, 'read', \IPS\Content\Hideable::FILTER_AUTOMATIC, 0, $member ) as $event )
 		{
 			$feed->addEvent( $event );
 		}
@@ -136,7 +143,7 @@ class _Application extends \IPS\Application
 			$endDate = $_today->adjust( "+" . \IPS\Settings::i()->calendar_rss_feed_days . " days" );
 		}
 
-		foreach ( \IPS\calendar\Event::retrieveEvents( $_today, $endDate, NULL, NULL, FALSE ) as $event )
+		foreach ( \IPS\calendar\Event::retrieveEvents( $_today, $endDate, NULL, NULL, FALSE, $member ) as $event )
 		{
 			$document->addItem( $event->title, $event->url(), $event->content, $event->nextOccurrence( $_today, 'startDate' ), $event->id );
 		}
@@ -144,4 +151,37 @@ class _Application extends \IPS\Application
 		/* @note application/rss+xml is not a registered IANA mime-type so we need to stick with text/xml for RSS */
 		\IPS\Output::i()->sendOutput( $document->asXML(), 200, 'text/xml' );
 	}
+	
+	/**
+	 * Default front navigation
+	 *
+	 * @code
+	 	
+	 	// Each item...
+	 	array(
+			'key'		=> 'Example',		// The extension key
+			'app'		=> 'core',			// [Optional] The extension application. If ommitted, uses this application	
+			'config'	=> array(...),		// [Optional] The configuration for the menu item
+			'title'		=> 'SomeLangKey',	// [Optional] If provided, the value of this language key will be copied to menu_item_X
+			'children'	=> array(...),		// [Optional] Array of child menu items for this item. Each has the same format.
+		)
+	 	
+	 	return array(
+		 	'rootTabs' 		=> array(), // These go in the top row
+		 	'browseTabs'	=> array(),	// These go under the Browse tab on a new install or when restoring the default configuraiton; or in the top row if installing the app later (when the Browse tab may not exist)
+		 	'browseTabsEnd'	=> array(),	// These go under the Browse tab after all other items on a new install or when restoring the default configuraiton; or in the top row if installing the app later (when the Browse tab may not exist)
+		 	'activityTabs'	=> array(),	// These go under the Activity tab on a new install or when restoring the default configuraiton; or in the top row if installing the app later (when the Activity tab may not exist)
+		)
+	 * @endcode
+	 * @return array
+	 */
+	public function defaultFrontNavigation()
+	{
+		return array(
+			'rootTabs'		=> array(),
+			'browseTabs'	=> array( array( 'key' => 'Calendar' ) ),
+			'browseTabsEnd'	=> array(),
+			'activityTabs'	=> array()
+		);
+	}
 }

applications/calendar/api/comments.php

@@ -0,0 +1,181 @@
+<?php
+/**
+ * @brief		Calendar Events Comments API
+ * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
+ * @license		http://www.invisionpower.com/legal/standards/
+ * @package		IPS Community Suite
+ * @subpackage	Calendar
+ * @since		8 Dec 2015
+ * @version		SVN_VERSION_NUMBER
+ */
+
+namespace IPS\calendar\api;
+
+/* To prevent PHP errors (extending class does not exist) revealing path */
+if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+{
+	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
+	exit;
+}
+
+/**
+ * @brief	Calendar Events Comments API
+ */
+class _comments extends \IPS\Content\Api\CommentController
+{
+	/**
+	 * Class
+	 */
+	protected $class = 'IPS\calendar\Event\Comment';
+	
+	/**
+	 * GET /calendar/comments
+	 * Get list of comments
+	 *
+	 * @apiparam	string	calendars		Comma-delimited list of calendar IDs
+	 * @apiparam	string	authors			Comma-delimited list of member IDs - if provided, only topics started by those members are returned
+	 * @apiparam	int		locked			If 1, only comments from events which are locked are returned, if 0 only unlocked
+	 * @apiparam	int		hidden			If 1, only comments which are hidden are returned, if 0 only not hidden
+	 * @apiparam	int		featured		If 1, only comments from  events which are featured are returned, if 0 only not featured
+	 * @apiparam	string	sortBy			What to sort by. Can be 'date', 'title' or leave unspecified for ID
+	 * @apiparam	string	sortDir			Sort direction. Can be 'asc' or 'desc' - defaults to 'asc'
+	 * @apiparam	int		page			Page number
+	 * @return		\IPS\Api\PaginatedResponse<IPS\calendar\Event\Comment>
+	 */
+	public function GETindex()
+	{
+		return $this->_list( array(), 'calendars' );
+	}
+	
+	/**
+	 * GET /calendar/comments/{id}
+	 * View information about a specific comment
+	 *
+	 * @param		int		$id			ID Number
+	 * @throws		2L297/1	INVALID_ID	The comment ID does not exist
+	 * @return		\IPS\calendar\Event\Comment
+	 */
+	public function GETitem( $id )
+	{
+		try
+		{
+			return new \IPS\Api\Response( 200, \IPS\calendar\Event\Comment::load( $id )->apiOutput() );
+		}
+		catch ( \OutOfRangeException $e )
+		{
+			throw new \IPS\Api\Exception( 'INVALID_ID', '2L297/1', 404 );
+		}
+	}
+	
+	/**
+	 * POST /calendar/comments
+	 * Create a comment
+	 *
+	 * @reqapiparam	int			event				The ID number of the event the comment is for
+	 * @reqapiparam	int			author				The ID number of the member making the comment (0 for guest)
+	 * @apiparam	string		author_name			If author is 0, the guest name that should be used
+	 * @reqapiparam	string		content				The comment content as HTML (e.g. "<p>This is a comment.</p>")
+	 * @apiparam	datetime	date				The date/time that should be used for the comment date. If not provided, will use the current date/time
+	 * @apiparam	string		ip_address			The IP address that should be stored for the comment. If not provided, will use the IP address from the API request
+	 * @apiparam	int			hidden				0 = unhidden; 1 = hidden, pending moderator approval; -1 = hidden (as if hidden by a moderator)
+	 * @throws		2L297/3		INVALID_ID	The comment ID does not exist
+	 * @throws		1L297/4		NO_AUTHOR	The author ID does not exist
+	 * @throws		1L297/5		NO_CONTENT	No content was supplied
+	 * @return		\IPS\calendar\Event\Comment
+	 */
+	public function POSTindex()
+	{
+		/* Get topic */
+		try
+		{
+			$event = \IPS\calendar\Event::load( \IPS\Request::i()->event );
+		}
+		catch ( \OutOfRangeException $e )
+		{
+			throw new \IPS\Api\Exception( 'INVALID_ID', '2L297/3', 403 );
+		}
+		
+		/* Get author */
+		if ( \IPS\Request::i()->author )
+		{
+			$author = \IPS\Member::load( \IPS\Request::i()->author );
+			if ( !$author->member_id )
+			{
+				throw new \IPS\Api\Exception( 'NO_AUTHOR', '1L297/4', 404 );
+			}
+		}
+		else
+		{
+			$author = new \IPS\Member;
+			$author->name = \IPS\Request::i()->author_name;
+		}
+		
+		/* Check we have a post */
+		if ( !\IPS\Request::i()->content )
+		{
+			throw new \IPS\Api\Exception( 'NO_CONTENT', '1L297/5', 403 );
+		}
+		
+		/* Do it */
+		return $this->_create( $event, $author );
+	}
+	
+	/**
+	 * POST /calendar/comments/{id}
+	 * Edit a comment
+	 *
+	 * @param		int			$id				ID Number
+	 * @apiparam	int			author			The ID number of the member making the comment (0 for guest)
+	 * @apiparam	string		author_name		If author is 0, the guest name that should be used
+	 * @apiparam	string		content			The comment content as HTML (e.g. "<p>This is a comment.</p>")
+	 * @apiparam	int			hidden				1/0 indicating if the topic should be hidden
+	 * @throws		2L297/6		INVALID_ID			The comment ID does not exist
+	 * @throws		1L297/7		NO_AUTHOR			The author ID does not exist
+	 * @return		\IPS\calendar\Event\Comment
+	 */
+	public function POSTitem( $id )
+	{
+		try
+		{
+			/* Load */
+			$comment = \IPS\calendar\Event\Comment::load( $id );
+						
+			/* Do it */
+			try
+			{
+				return $this->_edit( $comment );
+			}
+			catch ( \InvalidArgumentException $e )
+			{
+				throw new \IPS\Api\Exception( 'NO_AUTHOR', '1L297/7', 400 );
+			}
+		}
+		catch ( \OutOfRangeException $e )
+		{
+			throw new \IPS\Api\Exception( 'INVALID_ID', '2L297/6', 404 );
+		}
+	}
+		
+	/**
+	 * DELETE /calendar/comments/{id}
+	 * Deletes a comment
+	 *
+	 * @param		int			$id			ID Number
+	 * @throws		2L297/2		INVALID_ID	The comment ID does not exist
+	 * @return		void
+	 */
+	public function DELETEitem( $id )
+	{
+		try
+		{			
+			\IPS\calendar\Event\Comment::load( $id )->delete();
+			
+			return new \IPS\Api\Response( 200, NULL );
+		}
+		catch ( \OutOfRangeException $e )
+		{
+			throw new \IPS\Api\Exception( 'INVALID_ID', '2L297/2', 404 );
+		}
+	}
+}

applications/calendar/api/events.php

@@ -0,0 +1,503 @@
+<?php
+/**
+ * @brief		Calendar Events API
+ * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
+ * @license		http://www.invisionpower.com/legal/standards/
+ * @package		IPS Community Suite
+ * @subpackage	Calendar
+ * @since		8 Dec 2015
+ * @version		SVN_VERSION_NUMBER
+ */
+
+namespace IPS\calendar\api;
+
+/* To prevent PHP errors (extending class does not exist) revealing path */
+if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+{
+	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
+	exit;
+}
+
+/**
+ * @brief	Calendar Events API
+ */
+class _events extends \IPS\Content\Api\ItemController
+{
+	/**
+	 * Class
+	 */
+	protected $class = 'IPS\calendar\Event';
+	
+	/**
+	 * GET /calendar/events
+	 * Get list of events
+	 *
+	 * @apiparam	string	calendars		Comma-delimited list of calendar IDs
+	 * @apiparam	string	authors			Comma-delimited list of member IDs - if provided, only events started by those members are returned
+	 * @apiparam	int		locked			If 1, only events which are locked are returned, if 0 only unlocked
+	 * @apiparam	int		hidden			If 1, only events which are hidden are returned, if 0 only not hidden
+	 * @apiparam	int		featured		If 1, only events which are featured are returned, if 0 only not featured
+	 * @apiparam	string	sortBy			What to sort by. Can be 'date' for creation date, 'title' or leave unspecified for ID
+	 * @apiparam	string	sortDir			Sort direction. Can be 'asc' or 'desc' - defaults to 'asc'
+	 * @apiparam	int		page			Page number
+	 * @return		\IPS\Api\PaginatedResponse<IPS\calendar\Event>
+	 */
+	public function GETindex()
+	{
+		/* Where clause */
+		$where = array();
+				
+		/* Return */
+		return $this->_list( $where, 'calendars' );
+	}
+	
+	/**
+	 * GET /calendar/events/{id}
+	 * View information about a specific event
+	 *
+	 * @param		int		$id			ID Number
+	 * @throws		1F294/1	INVALID_ID	The event ID does not exist
+	 * @return		\IPS\calendar\Event
+	 */
+	public function GETitem( $id )
+	{
+		try
+		{
+			return $this->_view( $id );
+		}
+		catch ( \OutOfRangeException $e )
+		{
+			throw new \IPS\Api\Exception( 'INVALID_ID', '2L296/1', 404 );
+		}
+	}
+	
+	/**
+	 * POST /calendar/events
+	 * Create an event
+	 *
+	 * @reqapiparam	int					calendar		The ID number of the calendar the event should be created in
+	 * @reqapiparam	int					author			The ID number of the member creating the event (0 for guest)
+	 * @reqapiparam	string				title			The event title
+	 * @reqapiparam	string				description		The description as HTML (e.g. "<p>This is an event.</p>")
+	 * @reqapiparam	datetime			start			The event start date/time
+	 * @apiparam	datetime			end				The event end date/time
+	 * @apiparam	string				recurrence		If this event recurs, the ICS recurrence definition
+	 * @apiparam	bool				rsvp			If this event accepts RSVPs
+	 * @apiparam	int					rsvpLimit		The number of RSVPs the event is limited to
+	 * @apiparam	\IPS\GeoLocation	location		The location where the event is taking place
+	 * @apiparam	string				prefix			Prefix tag
+	 * @apiparam	string				tags			Comma-separated list of tags (do not include prefix)
+	 * @apiparam	datetime			date			The date/time that should be used for the event/post post date. If not provided, will use the current date/time
+	 * @apiparam	string				ip_address		The IP address that should be stored for the event/post. If not provided, will use the IP address from the API request
+	 * @apiparam	int					locked			1/0 indicating if the event should be locked
+	 * @apiparam	int					hidden			0 = unhidden; 1 = hidden, pending moderator approval; -1 = hidden (as if hidden by a moderator)
+	 * @apiparam	int					featured		1/0 indicating if the event should be featured
+	 * @throws		1L296/6				NO_CALENDAR		The calendar ID does not exist
+	 * @throws		1L296/7				NO_AUTHOR		The author ID does not exist
+	 * @throws		1L296/8				NO_TITLE		No title was supplied
+	 * @throws		1L296/9				NO_DESC			No description was supplied
+	 * @throws		1L296/A				INVALID_START	The start date is invalid
+	 * @throws		1L296/B				INVALID_END		The end date is invalid
+	 * @return		\IPS\calendar\Event
+	 */
+	public function POSTindex()
+	{
+		/* Get calendar */
+		try
+		{
+			$calendar = \IPS\calendar\Calendar::load( \IPS\Request::i()->calendar );
+		}
+		catch ( \OutOfRangeException $e )
+		{
+			throw new \IPS\Api\Exception( 'NO_CALENDAR', '1L296/6', 400 );
+		}
+		
+		/* Get author */
+		if ( \IPS\Request::i()->author )
+		{
+			$author = \IPS\Member::load( \IPS\Request::i()->author );
+			if ( !$author->member_id )
+			{
+				throw new \IPS\Api\Exception( 'NO_AUTHOR', '1L296/7', 400 );
+			}
+		}
+		else
+		{
+			$author = new \IPS\Member;
+		}
+		
+		/* Check we have a title and a description */
+		if ( !\IPS\Request::i()->title )
+		{
+			throw new \IPS\Api\Exception( 'NO_TITLE', '1L296/8', 400 );
+		}
+		if ( !\IPS\Request::i()->description )
+		{
+			throw new \IPS\Api\Exception( 'NO_DESC', '1L296/9', 400 );
+		}
+		
+		/* Validate dates */
+		try
+		{
+			new \IPS\DateTime( \IPS\Request::i()->start );
+		}
+		catch ( \Exception $e )
+		{
+			throw new \IPS\Api\Exception( 'INVALID_START', '1L296/A', 400 );
+		}
+		if ( isset( \IPS\Request::i()->end ) )
+		{
+			try
+			{
+				new \IPS\DateTime( \IPS\Request::i()->end );
+			}
+			catch ( \Exception $e )
+			{
+				throw new \IPS\Api\Exception( 'INVALID_END', '1L296/B', 400 );
+			}
+		}
+		
+		/* Do it */
+		return new \IPS\Api\Response( 201, $this->_create( $calendar, $author )->apiOutput() );
+	}
+	
+	/**
+	 * POST /calendar/events/{id}
+	 * Edit an event
+	 *
+	 * @reqapiparam	int					calendar		The ID number of the calendar the event should be created in
+	 * @reqapiparam	int					author			The ID number of the member creating the event (0 for guest)
+	 * @reqapiparam	string				title			The event title
+	 * @reqapiparam	string				description		The description as HTML (e.g. "<p>This is an event.</p>")
+	 * @reqapiparam	datetime			start			The event start date/time
+	 * @apiparam	datetime			end				The event end date/time
+	 * @apiparam	string				recurrence		If this event recurs, the ICS recurrence definition
+	 * @apiparam	bool				rsvp			If this event accepts RSVPs
+	 * @apiparam	int					rsvpLimit		The number of RSVPs the event is limited to
+	 * @apiparam	\IPS\GeoLocation	location		The location where the event is taking place
+	 * @apiparam	string				prefix			Prefix tag
+	 * @apiparam	string				tags			Comma-separated list of tags (do not include prefix)
+	 * @apiparam	datetime			date			The date/time that should be used for the event/post post date. If not provided, will use the current date/time
+	 * @apiparam	string				ip_address		The IP address that should be stored for the event/post. If not provided, will use the IP address from the API request
+	 * @apiparam	int					locked			1/0 indicating if the event should be locked
+	 * @apiparam	int					hidden			0 = unhidden; 1 = hidden, pending moderator approval; -1 = hidden (as if hidden by a moderator)
+	 * @apiparam	int					featured		1/0 indicating if the event should be featured
+	 * @throws		1L296/I				INVALID_ID		The event ID is invalid
+	 * @throws		1L296/D				NO_CALENDAR		The calendar ID does not exist
+	 * @throws		1L296/E				NO_AUTHOR		The author ID does not exist
+	 * @throws		1L296/G				INVALID_START	The start date is invalid
+	 * @throws		1L296/H				INVALID_END		The end date is invalid
+	 * @return		\IPS\calendar\Event
+	 */
+	public function POSTitem( $id )
+	{
+		try
+		{
+			$event = \IPS\calendar\Event::load( $id );
+			
+			/* New calendar */
+			if ( isset( \IPS\Request::i()->calendar ) and \IPS\Request::i()->calendar != $event->forum_id )
+			{
+				try
+				{
+					$newCalendar = \IPS\calendar\Calendar::load( \IPS\Request::i()->calendar );
+					$event->move( $newCalendar );
+				}
+				catch ( \OutOfRangeException $e )
+				{
+					throw new \IPS\Api\Exception( 'NO_CALENDAR', '1L296/D', 400 );
+				}
+			}
+			
+			/* New author */
+			if ( isset( \IPS\Request::i()->author ) )
+			{				
+				try
+				{
+					$member = \IPS\Member::load( \IPS\Request::i()->author );
+					if ( !$member->member_id )
+					{
+						throw new \OutOfRangeException;
+					}
+					
+					$event->changeAuthor( $member );
+				}
+				catch ( \OutOfRangeException $e )
+				{
+					throw new \IPS\Api\Exception( 'NO_AUTHOR', '1L296/E', 400 );
+				}
+			}
+			
+			/* Validate dates */
+			if ( isset( \IPS\Request::i()->start ) )
+			{
+				try
+				{
+					new \IPS\DateTime( \IPS\Request::i()->start );
+				}
+				catch ( \Exception $e )
+				{
+					throw new \IPS\Api\Exception( 'INVALID_START', '1L296/G', 400 );
+				}
+			}
+			if ( isset( \IPS\Request::i()->end ) )
+			{
+				try
+				{
+					new \IPS\DateTime( \IPS\Request::i()->end );
+				}
+				catch ( \Exception $e )
+				{
+					throw new \IPS\Api\Exception( 'INVALID_END', '1L296/H', 400 );
+				}
+			}
+			
+			/* Everything else */
+			$this->_createOrUpdate( $event );
+			
+			/* Save and return */
+			$event->save();
+			return new \IPS\Api\Response( 200, $event->apiOutput() );
+		}
+		catch ( \OutOfRangeException $e )
+		{
+			throw new \IPS\Api\Exception( 'INVALID_ID', '1L296/D', 404 );
+		}
+	}
+	
+	/**
+	 * GET /calendar/events/{id}/comments
+	 * Get comments on an event
+	 *
+	 * @param		int		$id			ID Number
+	 * @apiparam	int		hidden		If 1, only comments which are hidden are returned, if 0 only not hidden
+	 * @apiparam	string	sortDir		Sort direction. Can be 'asc' or 'desc' - defaults to 'asc'
+	 * @apiparam	int		page		Page number
+	 * @throws		2L296/2	INVALID_ID	The event ID does not exist
+	 * @return		\IPS\Api\PaginatedResponse<IPS\calendar\Event\Comment>
+	 */
+	public function GETitem_comments( $id )
+	{
+		try
+		{
+			return $this->_comments( $id, 'IPS\calendar\Event\Comment' );
+		}
+		catch ( \OutOfRangeException $e )
+		{
+			throw new \IPS\Api\Exception( 'INVALID_ID', '2L296/2', 404 );
+		}
+	}
+	
+	/**
+	 * GET /calendar/events/{id}/reviews
+	 * Get reviews on an event
+	 *
+	 * @param		int		$id			ID Number
+	 * @apiparam	int		hidden		If 1, only comments which are hidden are returned, if 0 only not hidden
+	 * @apiparam	string	sortDir		Sort direction. Can be 'asc' or 'desc' - defaults to 'asc'
+	 * @apiparam	int		page		Page number
+	 * @throws		2L296/3	INVALID_ID	The event ID does not exist
+	 * @return		\IPS\Api\PaginatedResponse<IPS\calendar\Event\Review>
+	 */
+	public function GETitem_reviews( $id )
+	{
+		try
+		{
+			return $this->_comments( $id, 'IPS\calendar\Event\Review' );
+		}
+		catch ( \OutOfRangeException $e )
+		{
+			throw new \IPS\Api\Exception( 'INVALID_ID', '2L296/3', 404 );
+		}
+	}
+	
+	/**
+	 * GET /calendar/events/{id}/rsvps
+	 * Get RSVPs on an event
+	 *
+	 * @param		int				$id				ID Number
+	 * @throws		2L296/3			INVALID_ID		The event ID does not exist
+	 * @return		array
+	 * @apiresponse	[\IPS\Member]	attending		Members that have confirmed they are attending the event
+	 * @apiresponse	[\IPS\Member]	notAttending	Members that have confirmed they are not attending the event
+	 * @apiresponse	[\IPS\Member]	maybeAttending	Members that have said they may attend the event
+	 */
+	public function GETitem_rsvps( $id )
+	{
+		try
+		{
+			$event = \IPS\calendar\Event::load( $id );
+			$attendees = $event->attendees();
+			return new \IPS\Api\Response( 200, array(
+				'attending'			=> array_values( array_map( function( $member ) {
+					return $member->apiOutput();
+				}, $attendees[1] ) ),
+				'notAttending'		=> array_values( array_map( function( $member ) {
+					return $member->apiOutput();
+				}, $attendees[0] ) ),
+				'maybeAttending'	=> array_values( array_map( function( $member ) {
+					return $member->apiOutput();
+				}, $attendees[2] ) ),
+			) );
+		}
+		catch ( \OutOfRangeException $e )
+		{
+			throw new \IPS\Api\Exception( 'INVALID_ID', '2L296/4', 404 );
+		}
+	}
+	
+	/**
+	 * PUT /calendar/events/{id}/rsvps/{member_id}
+	 * RSVP a member to an event
+	 *
+	 * @reqapiparam	int				response		0 = Not attending; 1 = attending; 2 = maybe attending
+	 * @param		int				$id				Event ID NUmber
+	 * @param		int				$memberId		Member ID NUmber
+	 * @throws		2L296/J			INVALID_ID		The event ID does not exist
+	 * @return		void
+	 */
+	public function PUTitem_rsvps( $id, $memberId )
+	{
+		if ( !isset( \IPS\Request::i()->response ) or !in_array( (int) \IPS\Request::i()->response, range( 0, 2 ) ) )
+		{
+			throw new \IPS\Api\Exception( 'INVALID_RESPONSE', '1L296/L', 400 );
+		}
+		
+		try
+		{
+			$event = \IPS\calendar\Event::load( $id );
+			
+			try
+			{
+				$member = \IPS\Member::load( $memberId );
+				if ( !$member->member_id )
+				{
+					throw new \OutOfRangeException;
+				}
+			}
+			catch ( \OutOfRangeException $e )
+			{
+				throw new \IPS\Api\Exception( 'INVALID_MEMBER', '2L296/K', 404 );
+			}
+			
+			\IPS\Db::i()->delete( 'calendar_event_rsvp', array( 'rsvp_event_id=? AND rsvp_member_id=?', $event->id, $member->member_id ) );
+			
+			\IPS\Db::i()->insert( 'calendar_event_rsvp', array(
+				'rsvp_event_id'		=> $event->id,
+				'rsvp_member_id'	=> $member->member_id,
+				'rsvp_date'			=> time(),
+				'rsvp_response'		=> (int) \IPS\Request::i()->response
+			) );
+			
+			return new \IPS\Api\Response( 200, NULL );
+		}
+		catch ( \OutOfRangeException $e )
+		{
+			throw new \IPS\Api\Exception( 'INVALID_EVENT', '2L296/J', 404 );
+		}
+	}
+	
+	/**
+	 * DELETE /calendar/events/{id}/rsvps/{member_id}
+	 * Remove a member from RSVP list
+	 *
+	 * @param		int		$id				Event ID NUmber
+	 * @param		int		$memberId		Member ID NUmber
+	 * @return		void
+	 */
+	public function DELETEitem_rsvps( $id, $memberId )
+	{
+		\IPS\Db::i()->delete( 'calendar_event_rsvp', array( 'rsvp_event_id=? AND rsvp_member_id=?', intval( $id ), intval( $memberId ) ) );
+		return new \IPS\Api\Response( 200, NULL );
+	}
+	
+	/**
+	 * Create or update event
+	 *
+	 * @param	\IPS\Content\Item	$item	The item
+	 * @return	\IPS\Content\Item
+	 */
+	protected function _createOrUpdate( \IPS\Content\Item $item )
+	{
+		/* Start/End date */
+		$startDate = new \IPS\DateTime( \IPS\Request::i()->start );
+		$item->start_date = $startDate->format( 'Y-m-d H:i' );
+		$item->end_date = NULL;
+		if ( isset( \IPS\Request::i()->end ) )
+		{
+			$endDate = new \IPS\DateTime( \IPS\Request::i()->end );
+			$item->end_date = $endDate->format( 'Y-m-d H:i' );
+		}
+		else
+		{
+			$item->all_day = 1;
+		}
+		
+		/* Recurrence */
+		if ( isset( \IPS\Request::i()->recurrence ) )
+		{
+			$item->recurring = \IPS\Request::i()->recurrence;
+		}
+		
+		/* Description */
+		$item->content = \IPS\Request::i()->description;
+		
+		/* RSVP */
+		if ( isset( \IPS\Request::i()->rsvp ) )
+		{
+			$item->rsvp = intval( \IPS\Request::i()->rsvp );
+			if ( $item->rsvp and isset( \IPS\Request::i()->rsvpLimit ) and \IPS\Request::i()->rsvpLimit )
+			{
+				$item->rsvp_limit = \IPS\Request::i()->rsvpLimit;
+			}
+			else
+			{
+				$item->rsvp_limit = -1;
+			}
+		}
+		
+		/* Location */
+		if ( isset( \IPS\Request::i()->location ) )
+		{
+			if ( \IPS\Request::i()->location )
+			{
+				$location = \IPS\GeoLocation::buildFromJson( json_encode( \IPS\Request::i()->location ) );
+				if ( !$location->lat or !$location->long )
+				{
+					try
+					{
+						$location->getLatLong();
+					}
+					catch ( \Exception $e ) {}
+				}
+				$item->location = json_encode( $location );
+			}
+		}
+		
+		/* Pass up */
+		return parent::_createOrUpdate( $item );
+	}
+		
+	/**
+	 * DELETE /calendar/events/{id}
+	 * Delete a event
+	 *
+	 * @param		int		$id			ID Number
+	 * @throws		2L296/5	INVALID_ID	The event ID does not exist
+	 * @return		void
+	 */
+	public function DELETEitem( $id )
+	{
+		try
+		{
+			\IPS\calendar\Event::load( $id )->delete();
+			
+			return new \IPS\Api\Response( 200, NULL );
+		}
+		catch ( \OutOfRangeException $e )
+		{
+			throw new \IPS\Api\Exception( 'INVALID_ID', '2L296/5', 404 );
+		}
+	}
+}

applications/calendar/api/reviews.php

@@ -0,0 +1,196 @@
+<?php
+/**
+ * @brief		Calendar Events Reviews API
+ * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
+ * @license		http://www.invisionpower.com/legal/standards/
+ * @package		IPS Community Suite
+ * @subpackage	Calendar
+ * @since		8 Dec 2015
+ * @version		SVN_VERSION_NUMBER
+ */
+
+namespace IPS\calendar\api;
+
+/* To prevent PHP errors (extending class does not exist) revealing path */
+if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+{
+	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
+	exit;
+}
+
+/**
+ * @brief	Calendar Events Reviews API
+ */
+class _reviews extends \IPS\Content\Api\CommentController
+{
+	/**
+	 * Class
+	 */
+	protected $class = 'IPS\calendar\Event\Review';
+	
+	/**
+	 * GET /calendar/reviews
+	 * Get list of reviews
+	 *
+	 * @apiparam	string	calendars		Comma-delimited list of calendar IDs
+	 * @apiparam	string	authors			Comma-delimited list of member IDs - if provided, only topics started by those members are returned
+	 * @apiparam	int		locked			If 1, only reviews from events which are locked are returned, if 0 only unlocked
+	 * @apiparam	int		hidden			If 1, only reviews which are hidden are returned, if 0 only not hidden
+	 * @apiparam	int		featured		If 1, only reviews from  events which are featured are returned, if 0 only not featured
+	 * @apiparam	string	sortBy			What to sort by. Can be 'date', 'title' or leave unspecified for ID
+	 * @apiparam	string	sortDir			Sort direction. Can be 'asc' or 'desc' - defaults to 'asc'
+	 * @apiparam	int		page			Page number
+	 * @return		\IPS\Api\PaginatedResponse<IPS\calendar\Event\Review>
+	 */
+	public function GETindex()
+	{
+		return $this->_list( array(), 'calendars' );
+	}
+	
+	/**
+	 * GET /calendar/reviews/{id}
+	 * View information about a specific review
+	 *
+	 * @param		int		$id			ID Number
+	 * @throws		2L298/1	INVALID_ID	The review ID does not exist
+	 * @return		\IPS\calendar\Event\Review
+	 */
+	public function GETitem( $id )
+	{
+		try
+		{
+			return new \IPS\Api\Response( 200, \IPS\calendar\Event\Review::load( $id )->apiOutput() );
+		}
+		catch ( \OutOfRangeException $e )
+		{
+			throw new \IPS\Api\Exception( 'INVALID_ID', '2L298/1', 404 );
+		}
+	}
+	
+	/**
+	 * POST /calendar/reviews
+	 * Create a review
+	 *
+	 * @reqapiparam	int			event				The ID number of the event the review is for
+	 * @reqapiparam	int			author				The ID number of the member making the review (0 for guest)
+	 * @apiparam	string		author_name			If author is 0, the guest name that should be used
+	 * @reqapiparam	string		content				The review content as HTML (e.g. "<p>This is a review.</p>")
+	 * @apiparam	datetime	date				The date/time that should be used for the review date. If not provided, will use the current date/time
+	 * @apiparam	string		ip_address			The IP address that should be stored for the review. If not provided, will use the IP address from the API request
+	 * @apiparam	int			hidden				0 = unhidden; 1 = hidden, pending moderator approval; -1 = hidden (as if hidden by a moderator)
+	 * @reqapiparam	int			rating				Star rating
+	 * @throws		2L298/2		INVALID_ID	The forum ID does not exist
+	 * @throws		1L298/3		NO_AUTHOR	The author ID does not exist
+	 * @throws		1L298/4		NO_CONTENT	No content was supplied
+	 * @throws		1L298/8		INVALID_RATING	The rating is not a valid number up to the maximum rating
+	 * @return		\IPS\calendar\Event\Review
+	 */
+	public function POSTindex()
+	{
+		/* Get topic */
+		try
+		{
+			$event = \IPS\calendar\Event::load( \IPS\Request::i()->event );
+		}
+		catch ( \OutOfRangeException $e )
+		{
+			throw new \IPS\Api\Exception( 'INVALID_ID', '2L298/2', 403 );
+		}
+		
+		/* Get author */
+		if ( \IPS\Request::i()->author )
+		{
+			$author = \IPS\Member::load( \IPS\Request::i()->author );
+			if ( !$author->member_id )
+			{
+				throw new \IPS\Api\Exception( 'NO_AUTHOR', '1L298/3', 404 );
+			}
+		}
+		else
+		{
+			$author = new \IPS\Member;
+			$author->name = \IPS\Request::i()->author_name;
+		}
+		
+		/* Check we have a post */
+		if ( !\IPS\Request::i()->content )
+		{
+			throw new \IPS\Api\Exception( 'NO_CONTENT', '1L298/4', 403 );
+		}
+		
+		/* Check we have a rating */
+		if ( !\IPS\Request::i()->rating or !in_array( (int) \IPS\Request::i()->rating, range( 1, \IPS\Settings::i()->reviews_rating_out_of ) ) )
+		{
+			throw new \IPS\Api\Exception( 'INVALID_RATING', '1L298/8', 403 );
+		}
+		
+		/* Do it */
+		return $this->_create( $event, $author );
+	}
+	
+	/**
+	 * POST /calendar/reviews/{id}
+	 * Edit a review
+	 *
+	 * @param		int			$id				ID Number
+	 * @apiparam	int			author			The ID number of the member making the review (0 for guest)
+	 * @apiparam	string		author_name		If author is 0, the guest name that should be used
+	 * @apiparam	string		content			The review content as HTML (e.g. "<p>This is a review.</p>")
+	 * @apiparam	int			hidden			1/0 indicating if the topic should be hidden
+	 * @apiparam	int			rating			Star rating
+	 * @throws		2L298/5		INVALID_ID		The review ID does not exist
+	 * @throws		1L298/6		NO_AUTHOR		The author ID does not exist
+	 * @throws		1L298/9		INVALID_RATING	The rating is not a valid number up to the maximum rating
+	 * @return		\IPS\calendar\Event\Review
+	 */
+	public function POSTitem( $id )
+	{
+		try
+		{
+			/* Load */
+			$comment = \IPS\calendar\Event\Review::load( $id );
+			
+			/* Check */
+			if ( isset( \IPS\Request::i()->rating ) and !in_array( (int) \IPS\Request::i()->rating, range( 1, \IPS\Settings::i()->reviews_rating_out_of ) ) )
+			{
+				throw new \IPS\Api\Exception( 'INVALID_RATING', '1L298/9', 403 );
+			}						
+			/* Do it */
+			try
+			{
+				return $this->_edit( $comment );
+			}
+			catch ( \InvalidArgumentException $e )
+			{
+				throw new \IPS\Api\Exception( 'NO_AUTHOR', '1L298/6', 400 );
+			}
+		}
+		catch ( \OutOfRangeException $e )
+		{
+			throw new \IPS\Api\Exception( 'INVALID_ID', '2L298/5', 404 );
+		}
+	}
+		
+	/**
+	 * DELETE /calendar/reviews/{id}
+	 * Deletes a review
+	 *
+	 * @param		int			$id			ID Number
+	 * @throws		2L298/7		INVALID_ID	The review ID does not exist
+	 * @return		void
+	 */
+	public function DELETEitem( $id )
+	{
+		try
+		{			
+			\IPS\calendar\Event\Review::load( $id )->delete();
+			
+			return new \IPS\Api\Response( 200, NULL );
+		}
+		catch ( \OutOfRangeException $e )
+		{
+			throw new \IPS\Api\Exception( 'INVALID_ID', '2L298/7', 404 );
+		}
+	}
+}

applications/calendar/data/acpsearch.json

@@ -1 +1,288 @@
-{"app=calendar&module=calendars&controller=calendars":{"lang_key":"menu__calendar_calendars_calendars","restriction":"calendars_manage","keywords":["calendars"]},"app=calendar&module=calendars&controller=settings&searchResult=form_calendar_default_view":{"lang_key":"calendar_default_view","restriction":"settings_manage","keywords":["calendar layout"]},"app=calendar&module=calendars&controller=settings&searchResult=form_calendar_date_format":{"lang_key":"calendar_date_format","restriction":"settings_manage","keywords":["calendar date format"]},"app=calendar&module=calendars&controller=settings&searchResult=form_show_bday_calendar":{"lang_key":"show_bday_calendar","restriction":"settings_manage","keywords":["birthdays"]},"app=calendar&module=calendars&controller=settings&searchResult=form_ipb_calendar_mon":{"lang_key":"ipb_calendar_mon","restriction":"settings_manage","keywords":["monday","sunday","calendar start"]},"app=calendar&module=calendars&controller=settings&searchResult=form_calendar_rss_feed":{"lang_key":"calendar_rss_feed","restriction":"settings_manage","keywords":["calendar rss","events rss"]},"app=calendar&module=calendars&controller=ical":{"lang_key":"menu__calendar_calendars_ical","restriction":"calendar_feeds_manage","keywords":["iCal","calendar export","iCalendar","feeds"]}}
+{
+    "app=calendar&module=calendars&controller=calendars": {
+        "lang_key": "menu__calendar_calendars_calendars",
+        "restriction": "calendars_manage",
+        "keywords": [
+            "calendars",
+			"календарь"
+        ]
+    },
+    "app=calendar&module=calendars&controller=calendars&do=form": {
+        "lang_key": "menu__calendar_calendars_calendars",
+        "restriction": "calendars_manage",
+        "keywords": [
+            "edit calendar",
+			"изменить календарь"
+        ]
+    },
+    "app=calendar&module=calendars&controller=calendars&do=permissions": {
+        "lang_key": "menu__calendar_calendars_calendars",
+        "restriction": "calendars_manage",
+        "keywords": [
+            "calendar permissions",
+			"доступы календаря",
+			"разрешения календаря"
+        ]
+    },
+    "app=calendar&module=calendars&controller=calendars&searchResult=cal_comment_moderate": {
+        "lang_key": "cal_comment_moderate",
+        "restriction": "calendars_manage",
+        "keywords": [
+            "approved",
+            "comments must be approved",
+            "require approval",
+			"одобрено",
+			"требует одобрения",
+			"комментарии должны быть одобрены"
+        ]
+    },
+    "app=calendar&module=calendars&controller=calendars&searchResult=form_1_cal_allow_comments": {
+        "lang_key": "cal_allow_comments",
+        "restriction": "calendars_manage",
+        "keywords": [
+            "allow comments",
+            "comments",
+			"разрешить комментарии",
+			"комментарии"
+        ]
+    },
+    "app=calendar&module=calendars&controller=calendars&searchResult=form_1_cal_allow_reviews": {
+        "lang_key": "cal_allow_reviews",
+        "restriction": "calendars_manage",
+        "keywords": [
+            "allow reviews",
+            "reviews",
+			"отзывы",
+			"разрешить отзывы"
+        ]
+    },
+    "app=calendar&module=calendars&controller=calendars&searchResult=form_1_cal_color": {
+        "lang_key": "cal_color",
+        "restriction": "calendars_manage",
+        "keywords": [
+            "calendar color",
+			"цвет календаря",
+			"цвет"
+        ]
+    },
+    "app=calendar&module=calendars&controller=calendars&searchResult=form_1_cal_moderate": {
+        "lang_key": "cal_moderate",
+        "restriction": "calendars_manage",
+        "keywords": [
+            "approve",
+            "approve event",
+            "event",
+			"одобрить",
+			"событие",
+			"одобрить событие"
+        ]
+    },
+    "app=calendar&module=calendars&controller=calendars&searchResult=form_1_cal_title": {
+        "lang_key": "cal_title",
+        "restriction": "calendars_manage",
+        "keywords": [
+            "calendar name",
+            "calendar title",
+			"название календаря",
+			"заголовок календаря"
+        ]
+    },
+    "app=calendar&module=calendars&controller=calendars&searchResult=form_new_cal_allow_comments": {
+        "lang_key": "cal_allow_comments",
+        "restriction": "calendars_manage",
+        "keywords": [
+            "allow comments",
+			"разрешить комментарии"
+        ]
+    },
+    "app=calendar&module=calendars&controller=calendars&searchResult=form_new_cal_allow_reviews": {
+        "lang_key": "cal_allow_reviews",
+        "restriction": "calendars_manage",
+        "keywords": [
+            "allow reviews",
+            "reviews",
+			"отзывы",
+			"разрешить отзывы"
+        ]
+    },
+    "app=calendar&module=calendars&controller=calendars&searchResult=form_new_cal_color": {
+        "lang_key": "cal_color",
+        "restriction": "calendars_manage",
+        "keywords": [
+            "calendar color",
+			"цвет календаря"
+        ]
+    },
+    "app=calendar&module=calendars&controller=calendars&searchResult=form_new_cal_moderate": {
+        "lang_key": "cal_moderate",
+        "restriction": "calendars_manage",
+        "keywords": [
+            "approve event",
+            "event approve",
+            "events",
+			"события",
+			"одобрить событие"
+        ]
+    },
+    "app=calendar&module=calendars&controller=calendars&searchResult=form_new_cal_title": {
+        "lang_key": "cal_title",
+        "restriction": "calendars_manage",
+        "keywords": [
+            "calendar title",
+			"название календаря",
+			"имя календаря"
+        ]
+    },
+    "app=calendar&module=calendars&controller=ical": {
+        "lang_key": "menu__calendar_calendars_ical",
+        "restriction": "calendar_feeds_manage",
+        "keywords": [
+            "calendar export",
+            "feeds",
+            "iCal",
+            "iCalendar",
+			"экспорт календаря",
+			"ленты"
+        ]
+    },
+    "app=calendar&module=calendars&controller=ical&do=add&searchResult=form_feed_allow_rsvp": {
+        "lang_key": "feed_allow_rsvp",
+        "restriction": "calendar_feeds_manage",
+        "keywords": [
+            "enable rsvp",
+            "rsvp",
+			"просьба ответить",
+			"запрос ответа"
+        ]
+    },
+    "app=calendar&module=calendars&controller=ical&do=add&searchResult=form_feed_calendar_id": {
+        "lang_key": "feed_calendar_id",
+        "restriction": "calendar_feeds_manage",
+        "keywords": [
+            "calendar",
+			"календарь"
+        ]
+    },
+    "app=calendar&module=calendars&controller=ical&do=add&searchResult=form_feed_member_id": {
+        "lang_key": "feed_member_id",
+        "restriction": "calendar_feeds_manage",
+        "keywords": [
+            "member",
+			"пользователь"
+        ]
+    },
+    "app=calendar&module=calendars&controller=ical&do=add&searchResult=form_feed_title": {
+        "lang_key": "feed_title",
+        "restriction": "calendar_feeds_manage",
+        "keywords": [
+            "add icalendar",
+            "feed title",
+            "iCalendar feed",
+			"название ленты"
+        ]
+    },
+    "app=calendar&module=calendars&controller=ical&do=add&searchResult=form_feed_url": {
+        "lang_key": "feed_url",
+        "restriction": "calendar_feeds_manage",
+        "keywords": [
+            "feed url",
+            "icalendar url",
+			"адрес ленты"
+        ]
+    },
+    "app=calendar&module=calendars&controller=ical&do=upload&searchResult=form_feed_calendar_id": {
+        "lang_key": "feed_calendar_id",
+        "restriction": "calendar_feeds_manage",
+        "keywords": [
+            "calendar",
+			"календарь"
+        ]
+    },
+    "app=calendar&module=calendars&controller=ical&do=upload&searchResult=form_feed_file": {
+        "lang_key": "feed_file",
+        "restriction": "calendar_feeds_manage",
+        "keywords": [
+            "iCalendar file"
+        ]
+    },
+    "app=calendar&module=calendars&controller=ical&do=upload&searchResult=form_feed_member_id": {
+        "lang_key": "feed_member_id",
+        "restriction": "calendar_feeds_manage",
+        "keywords": [
+            "member",
+			"пользователь"
+        ]
+    },
+    "app=calendar&module=calendars&controller=settings": {
+        "lang_key": "menu__calendar_calendars_settings",
+        "restriction": "settings_manage",
+        "keywords": [
+            "calendar settings",
+			"настройки календаря"
+        ]
+    },
+    "app=calendar&module=calendars&controller=settings&searchResult=calendar_rss_feed_days": {
+        "lang_key": "calendar_rss_feed_days",
+        "restriction": "settings_manage",
+        "keywords": [
+            "days",
+            "feed days",
+            "forthcoming days",
+            "number of days",
+            "RSS Feed",
+			"rss лента",
+			"дней",
+			"количество дней"
+        ]
+    },
+    "app=calendar&module=calendars&controller=settings&searchResult=form_calendar_date_format": {
+        "lang_key": "calendar_date_format",
+        "restriction": "settings_manage",
+        "keywords": [
+            "calendar date format",
+			"формат даты",
+			"дата календаря",
+			"дата в календаре"
+        ]
+    },
+    "app=calendar&module=calendars&controller=settings&searchResult=form_calendar_default_view": {
+        "lang_key": "calendar_default_view",
+        "restriction": "settings_manage",
+        "keywords": [
+            "calendar layout",
+			"макет календаря",
+			"дизайн календаря"
+        ]
+    },
+    "app=calendar&module=calendars&controller=settings&searchResult=form_calendar_rss_feed": {
+        "lang_key": "calendar_rss_feed",
+        "restriction": "settings_manage",
+        "keywords": [
+            "calendar rss",
+            "events rss",
+			"rss событий",
+			"rss календаря"
+        ]
+    },
+    "app=calendar&module=calendars&controller=settings&searchResult=form_ipb_calendar_mon": {
+        "lang_key": "ipb_calendar_mon",
+        "restriction": "settings_manage",
+        "keywords": [
+            "calendar start",
+            "monday",
+            "sunday",
+			"начало недели",
+			"понедельник",
+			"воскресенье"
+        ]
+    },
+    "app=calendar&module=calendars&controller=settings&searchResult=form_show_bday_calendar": {
+        "lang_key": "show_bday_calendar",
+        "restriction": "settings_manage",
+        "keywords": [
+            "birthdays",
+			"день рождения",
+			"дни рождения"
+        ]
+    }
+}

applications/calendar/data/emails.xml

@@ -1,5 +1,56 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<emails><template><template_app>calendar</template_app><template_name>digests__item</template_name><template_content_html><![CDATA[<tr style='border-bottom: 1px solid #eeeeee'>
+<emails><template><template_app>calendar</template_app><template_name>notification_new_content</template_name><template_content_html><![CDATA[
+{{if $content->author()->member_id}}
+	{$email->language->addToStack("email_new_calevent", FALSE, array( 'sprintf' => array( $content->author()->url(), $content->author()->name, $content->indefiniteArticle( $email->language ), $content->url(), $content->mapped('title'), $content->fixedDateTimeDescription( $email->language ) ) ) )}
+{{else}}
+	{$email->language->addToStack("email_new_calevent_guest", FALSE, array( 'sprintf' => array( $content->author()->name, $content->indefiniteArticle( $email->language ), $content->url(), $content->mapped('title'), $content->fixedDateTimeDescription( $email->language ) ) ) )}
+{{endif}}
+
+<br />
+<br />
+
+<table width='100%' cellpadding='0' cellspacing='0' border='0'>
+	<tr>
+		<td dir='{dir}' width='40' valign='top' class='hidePhone' style='width: 0; max-height: 0; overflow: hidden; float: left;'>
+			<img src='{$content->author()->get_photo( true, true )}' width='40' height='40' style='border: 1px solid #777777; vertical-align: middle;'>
+		</td>
+		<td dir='{dir}' width='30' valign='top' class='hidePhone' style='width: 0; max-height: 0; overflow: hidden; float: left;'>
+			<br />
+			<span style='display: block; width: 0px; height: 0px; border-width: 15px; border-color: transparent #f9f9f9 transparent transparent; border-style: solid'></span>
+		</td>
+		<td dir='{dir}' valign='top' style='background: #f9f9f9;'>
+			<table width='100%' cellpadding='10' cellspacing='0' border='0'>
+				<tr>
+					<td dir='{dir}'>
+						<table width='100%' cellpadding='5' cellspacing='0' border='0'>
+							<tr>
+								<td dir='{dir}' style="font-family: 'Helvetica Neue', helvetica, sans-serif; line-height: 1.5; font-size: 14px; color: #8d8d8d">
+									{$email->language->addToStack("email_posted_in", FALSE, array( 'sprintf' => array( $content->container()->_title ) ) )}
+								</td>
+							</tr>
+							<tr>
+								<td dir='{dir}' style="font-family: 'Helvetica Neue', helvetica, sans-serif; line-height: 1.5; font-size: 14px;">
+									{$email->parseTextForEmail( $content->content(), $email->language )|raw}
+								</td>
+							</tr>
+							<tr>
+								<td dir='{dir}'>
+									<a href='{$content->url()}' style="color: #ffffff; font-family: 'Helvetica Neue', helvetica, sans-serif; text-decoration: none; font-size: 14px; background: {setting="email_color"}; line-height: 32px; padding: 0 10px; display: inline-block; border-radius: 3px;">{$email->language->addToStack("go_to_this_x", FALSE, array( 'sprintf' => array( mb_strtolower( $email->language->addToStack( $content::$title, FALSE ) ) ) ) )}</a>
+								</td>
+							</tr>
+						</table>
+					</td>
+				</tr>
+			</table>
+		</td>
+	</tr>
+</table>
+<br /><br />
+<em style='color: #8c8c8c'>&mdash; {setting="board_name"}</em>]]></template_content_html><template_data>$content, $email</template_data><template_content_plaintext><![CDATA[{$email->language->addToStack("email_new_calevent_plain", FALSE, array( 'sprintf' => array( $content->author()->name, $content->indefiniteArticle( $email->language ), $content->mapped( 'title' ), $content->fixedDateTimeDescription( $email->language ) ) ) )}
+
+{$email->language->addToStack("go_to_this_x", FALSE, array( 'sprintf' => array( mb_strtolower( $email->language->addToStack( $content::$title, FALSE ) ) ) ) )}: {$content->url()}
+
+-- {setting="board_name"}]]></template_content_plaintext></template><template><template_app>calendar</template_app><template_name>digests__item</template_name><template_content_html><![CDATA[<tr style='border-bottom: 1px solid #eeeeee'>
 	<td dir='{dir}' width='120' valign='top' align='center'>
 		<table width='120' cellpadding='10' cellspacing='0' border='0' bgcolor='#fafafa'>
 			<tr>
@@ -39,7 +90,7 @@
 		</p>
 
 		<div style='font-family: "Helvetica Neue", helvetica, sans-serif; line-height: 22px; margin-top: 5px; margin-bottom: 5px'>
-			{$email->parseTextForEmail( $event->content() )|raw}
+			{$email->parseTextForEmail( $event->content(), $email->language )|raw}
 		</div>
 
 		{{if $event->rsvp}}
@@ -49,11 +100,11 @@
 				{{if count( $attendees[1] )}}
 					{{foreach $attendees[1] as $idx => $attendee}}
 						{{if $idx < 10}}
-							<img src="{$attendee->photo}" width="32" height="32" style="border: 1px solid #000; vertical-align: middle;"> 
+							<img src="{$attendee->get_photo( true, true )}" width="32" height="32" style="border: 1px solid #000; vertical-align: middle;"> 
 						{{endif}}
 					{{endforeach}}
 					{{if count( $attendees[1] ) > 10}}
-						&nbsp;&nbsp;&nbsp;<span style="font-size: 13px; font-family: 'Helvetica Neue', helvetica, sans-serif; color: #8c8c8c">{$email->language->addToStack("and_x_more", FALSE, array( 'sprintf' => array( count( $attendees[1] ) - 10 ) ) )}</span>
+						&nbsp;&nbsp;&nbsp;<span style="font-size: 13px; font-family: 'Helvetica Neue', helvetica, sans-serif; color: #8c8c8c">{$email->language->addToStack("and_x_more", FALSE, array( 'pluralize' => array( count( $attendees[1] ) - 10 ) ) )}</span>
 					{{endif}}
 				{{endif}}
 			</div>
@@ -63,7 +114,7 @@
 		{{if $event->container()->allow_reviews or $event->container()->allow_comments}}
 			<p style='font-family: "Helvetica Neue", helvetica, sans-serif; margin: 0; font-size: 13px; margin-bottom: 15px'>
 				{{if $event->container()->allow_reviews}}
-					{{foreach range( 1, 5 ) as $i}}{{if $i <= $event->averageReviewRating()}}<img src='{resource="email/rating_on.png" location="interface" app="core"}' width='14' height='13' style='vertical-align: middle; margin-right: 2px'>{{else}}<img src='{resource="email/rating_off.png" location="interface" app="core"}' width='14' height='13' style='vertical-align: middle; margin-right: 2px'>{{endif}}{{endforeach}}
+					{{foreach range( 1, 5 ) as $i}}{{if $i <= $event->averageReviewRating()}}<img src='{resource="email/rating_on.png" location="interface" app="core"}' width='14' height='13' style='vertical-align: middle; margin-right: 2px'>{{elseif ( $i - 0.5 ) <= $event->averageReviewRating()}}<img src='{resource="email/rating_half.png" location="interface" app="core"}' width='14' height='13' style='vertical-align: middle; margin-right: 2px'>{{else}}<img src='{resource="email/rating_off.png" location="interface" app="core"}' width='14' height='13' style='vertical-align: middle; margin-right: 2px'>{{endif}}{{endforeach}}
 				{{endif}}
 				{{if $event->container()->allow_comments}}
 					&nbsp;&nbsp;
@@ -81,12 +132,12 @@
 					<table width='100' cellpadding='0' cellspacing='0' border='0' bgcolor='#ffffff' style='border: 1px solid #cccccc;'>
 						<tr>
 							<td dir='{dir}' align='center' style="color: #a93848; font-size: 18px; line-height: 30px; text-transform: uppercase; font-family: 'Helvetica Neue', helvetica, sans-serif; font-weight: bold; padding-top: 5px;">
-								{$comment->item()->nextOccurrence( $today, 'startDate' )->monthNameShort}
+								{$comment->item()->nextOccurrence( \IPS\calendar\Date::getDate(), 'startDate' )->monthNameShort}
 							</td>
 						</tr>
 						<tr>
 							<td dir='{dir}' align='center' style="color: #333333; line-height: 40px; font-size: 44px; font-family: 'Helvetica Neue', helvetica, sans-serif; font-weight: 300; padding-bottom: 10px">
-								{$comment->item()->nextOccurrence( $today, 'startDate' )->mday}
+								{$comment->item()->nextOccurrence( \IPS\calendar\Date::getDate(), 'startDate' )->mday}
 							</td>
 						</tr>
 					</table>
@@ -109,7 +160,7 @@
 			{{endif}}
 		</p>
 		<div style='font-family: "Helvetica Neue", helvetica, sans-serif; line-height: 22px; margin-top: 10px; margin-bottom: 10px; border-left: 3px solid #8c8c8c; padding-left: 15px; font-size: 14px; margin-left: 15px'>
-			{$email->parseTextForEmail( $comment->content() )|raw}
+			{$email->parseTextForEmail( $comment->content(), $email->language )|raw}
 		</div>
 		
 	</td>

applications/calendar/data/installLang.json

@@ -1,3 +1,3 @@
 {
-	"calendar_calendar_1": "Community Calendar"
+	"calendar_calendar_1": "Календарь сообщества"
 }

applications/calendar/data/javascript.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <javascript app="calendar">
- <file javascript_app="calendar" javascript_location="front" javascript_path="controllers/browse" javascript_name="ips.browse.main.js" javascript_type="controller" javascript_version="101012" javascript_position="1000050"><![CDATA[/**
- * IPS Social Suite 4
+ <file javascript_app="calendar" javascript_location="front" javascript_path="controllers/browse" javascript_name="ips.browse.main.js" javascript_type="controller" javascript_version="101093" javascript_position="1000050"><![CDATA[/**
+ * IPS Community Suite 4
  * (c) 2013 Invision Power Services - http://www.invisionpower.com
  *
  * ips.browse.main.js - Calendar main browsing controller
@@ -60,6 +60,9 @@
 				return;
 			}
 
+			// Track page view
+			ips.utils.analytics.trackPageView( state.url );
+
 			this._updateView( state.url, state.title )
 		},
 
@@ -109,8 +112,8 @@
 		}
 	});
 }(jQuery, _));]]></file>
- <file javascript_app="calendar" javascript_location="front" javascript_path="controllers/browse" javascript_name="ips.browse.monthView.js" javascript_type="controller" javascript_version="101012" javascript_position="1000050"><![CDATA[/**
- * IPS Social Suite 4
+ <file javascript_app="calendar" javascript_location="front" javascript_path="controllers/browse" javascript_name="ips.browse.monthView.js" javascript_type="controller" javascript_version="101093" javascript_position="1000050"><![CDATA[/**
+ * IPS Community Suite 4
  * (c) 2013 Invision Power Services - http://www.invisionpower.com
  *
  * ips.browse.monthView.js - Month view controller
@@ -251,8 +254,8 @@
 		}
 	});
 }(jQuery, _));]]></file>
- <file javascript_app="calendar" javascript_location="front" javascript_path="controllers/submit" javascript_name="ips.submit.dates.js" javascript_type="controller" javascript_version="101012" javascript_position="1000100"><![CDATA[/**
- * IPS Social Suite 4
+ <file javascript_app="calendar" javascript_location="front" javascript_path="controllers/submit" javascript_name="ips.submit.dates.js" javascript_type="controller" javascript_version="101093" javascript_position="1000100"><![CDATA[/**
+ * IPS Community Suite 4
  * (c) 2013 Invision Power Services - http://www.invisionpower.com
  *
  * ips.submit.dates.js - Helper for date selection enhancements
@@ -442,37 +445,6 @@
 			// Update the dates
 			this.scope.find('[data-role="dateSummary"]').html( this._dateSummary() );
 		},
-		
-		/**
-		 * Get date object from input
-		 *
-		 * @param 		{object} 	input 	Input element
-		 * @returns 	{object}	Date object
-		 */
-		_getDate: function(input) {
-			/* jQuery UI Polyfill needs to be changed into the correct format */
-			if( !ips.utils.time.supportsHTMLDate() ) {
-				/* If it has been initiated, we can use the getDate method */
-				try {
-					var thisDate = input.datepicker( "getDate" );
-
-					if( _.isNull( thisDate ) )
-					{
-						thisDate = new Date( input.attr('value') );
-					}
-
-					return thisDate;
-				}
-				/* If it hasn't we can pull the 'value' attribute which can't have been changed yet. Not .val() as that will be in the wrong format */
-				catch(err) {
-					return new Date( input.attr('value') );
-				}
-			}
-			/* Actual HTML5 input always returns .val() in the correct YYYY-MM-DD format */
-			else {
-				return new Date( input.val() );
-			}
-		},
 
 		/**
 		 * Builds a summary of the selected dates/times
@@ -481,32 +453,26 @@
 		 */
 		_dateSummary: function () {
 			// Build start date
-			var startDate = this._getDate( this.scope.find('input[name="event_dates[start_date]"]') );
+			var startDate = ips.utils.time.getDateFromInput( this.scope.find('input[name="event_dates[start_date]"]') );
 			var singleDay = this.scope.find('#check_single_day');
 			var allDay = this.scope.find('#check_all_day');
 
 			// If there's no start time, then abandon showing any summary for now
 			if( !ips.utils.time.isValidDateObj( startDate ) || startDate.getFullYear() < 1900 ) {
 				return '';
-			}
+			}		
 
-			// We need to add the offset to ensure the day stays correct
-			if( !ips.utils.time.supportsHTMLDate() ){
-				startDate.setTime( startDate.getTime() - new Date().getTimezoneOffset()*60000 );
-			}
+			ips.utils.time.removeTimezone( startDate );
 
 			var startDateString = ips.utils.time.localeDateString( startDate, { weekday: 'short', month: 'short', day: 'numeric', year: 'numeric', timeZone: 'UTC' } );
-
 			var startTime = this._getTime( this.scope.find('input[name="event_dates[start_time]"]').val() );
 			var endTime = this._getTime( this.scope.find('input[name="event_dates[end_time]"]').val() );
-			var endDate = this._getDate( this.scope.find('input[name="event_dates[end_date]"]') );
+			var endDate = ips.utils.time.getDateFromInput( this.scope.find('input[name="event_dates[end_date]"]') );
 			var endDateString = '';
 
 			// If we have a valid end date...
 			if( !singleDay.is(':checked') && ips.utils.time.isValidDateObj( endDate ) ){
-				if( !ips.utils.time.supportsHTMLDate() ){
-					endDate.setTime( endDate.getTime() - new Date().getTimezoneOffset()*60000 );
-				}
+				ips.utils.time.removeTimezone( endDate );
 				endDateString = ips.utils.time.localeDateString( endDate, { weekday: 'short', month: 'short', day: 'numeric', year: 'numeric', timeZone: 'UTC' } );
 			}
 
@@ -570,7 +536,7 @@
 					endString = ips.pluralize( ips.getString( 'x_times' ), occurrences );				
 				}
 			} else if( this.scope.find('#event_repeat_end_ondate').is(':checked') ){
-				var dateObj = this._getDate( this.scope.find('input[name="event_dates[repeat_end_date]"]') );
+				var dateObj = ips.utils.time.getDateFromInput( this.scope.find('input[name="event_dates[repeat_end_date]"]') );
 
 				if( ips.utils.time.isValidDateObj( dateObj ) && dateObj.getFullYear() > 1900 ){ // > 1900 just so it doesn't start updating on year 19 etc.
 					endString = ips.getString('until', { date: ips.utils.time.localeDateString( dateObj, { weekday: 'short', month: 'short', day: 'numeric', year: 'numeric' } ) } );
@@ -649,6 +615,7 @@
 	});
 }(jQuery, _));]]></file>
  <order app="global" path="/dev/js//framework/">templates
+common/ips.loader.js
 common/ui
 common/utils
 common
@@ -662,6 +629,4 @@ app.js</order>
  <order app="global" path="/dev/js//library//jquery">jquery.js
 jquery.history.js
 jquery.transform.js</order>
- <order app="global" path="/dev/js//library//xregexp">xregexp-all.js
-xregexp-lookbehind.js</order>
 </javascript>

applications/calendar/data/lang.xml

@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <language>
- <app key="calendar" version="101012">
+ <app key="calendar" version="101093">
   <word key="__app_calendar" js="0">Calendar</word>
   <word key="frontnavigation_calendar" js="0">Calendar</word>
   <word key="__indefart_calendar_event_comment" js="0">a comment on a calendar event</word>
   <word key="__indefart_calendar_event" js="0">a calendar event</word>
   <word key="__indefart_calendar_event_review" js="0">a review on a calendar event</word>
+  <word key="__defart_calendar_event_comment" js="0">comment on a calendar event</word>
+  <word key="__defart_calendar_event" js="0">calendar event</word>
+  <word key="__defart_calendar_event_review" js="0">review on a calendar event</word>
   <word key="calendar_event_container" js="0">calendar</word>
   <word key="menu__calendar_calendars" js="0">Calendar</word>
   <word key="menu__calendar_calendars_calendars" js="0">Calendars</word>
@@ -16,7 +19,11 @@
   <word key="module__calendar_events" js="0">Events</word>
   <word key="event" js="0">Event</word>
   <word key="editor__calendar_Events" js="0">Calendar Events</word>
+  <word key="editor__calendar_Calendar" js="0">Calendars</word>
   <word key="acp_search_title_calendar_Calendars" js="0">Calendars</word>
+  <word key="calendar_event_pl_lc" js="0">calendar events</word>
+  <word key="search_contextual_item_calendars" js="0">This Calendar</word>
+  <word key="search_contextual_item_calendar_event" js="0">This Event</word>
   <word key="r__calendars" js="0">Calendars</word>
   <word key="r__calendars_manage" js="0">Can manage calendars?</word>
   <word key="r__calendars_add" js="0">Can add calendars?</word>
@@ -36,6 +43,7 @@
   <word key="ipb_calendar_mon" js="0">Start calendar on Monday</word>
   <word key="ipb_calendar_mon_desc" js="0">By default, the calendar will use Sunday as the start day for each week. You can use this setting to start the calendar on Monday instead.</word>
   <word key="calendar_rss_feed" js="0">Enable upcoming events RSS feed</word>
+  <word key="calendar_rss_feed_desc" js="0"><![CDATA[Only content that is available to guests will be shown. For more options, create a <a href='{internal.app=core&module=discovery&controller=rss}'>Custom RSS Feed</a>]]></word>
   <word key="calendar_rss_feed_days" js="0">Number of forthcoming days to include in the feed</word>
   <word key="acplogs__calendar_settings" js="0">Updated calendar settings</word>
   <word key="calendar_default_view" js="0">Default layout</word>
@@ -44,7 +52,7 @@
   <word key="cal_df_week" js="0">Current week</word>
   <word key="cal_df_day" js="0">Current day</word>
   <word key="cal_df_stream" js="0">Stream of upcoming events</word>
-  <word key="filestorage__calendar_Events" js="0">IP.Calendar Event Cover Photos</word>
+  <word key="filestorage__calendar_Events" js="0">Calendar Event Cover Photos</word>
   <word key="calendar_df_locale" js="0">Use default date formatting</word>
   <word key="calendar_df_d_sm_y" js="0">DD MMM YYYY (Example: 01 Jan 2000)</word>
   <word key="calendar_df_d_lm_y" js="0">DD Month YYYY (Example: 01 January 2000)</word>
@@ -139,13 +147,14 @@
   <word key="cal_week_title" js="0">%s %s %s - %s %s %s</word>
   <word key="cal_week_title_wb" js="0">w/b %s %s %s</word>
   <word key="cal_month_day" js="0">%s %s, %s</word>
+  <word key="cal_month_day_noyear" js="0">%s %s</word>
   <word key="all_calendars" js="0">All Calendars</word>
   <word key="create_event" js="0">Create Event</word>
+  <word key="select_calendar" js="0">Select Calendar</word>
   <word key="add_event" js="0">Add event</word>
   <word key="previous_month" js="0">Prev Month</word>
   <word key="next_month" js="0">Next Month</word>
   <word key="day" js="0">Day</word>
-  <word key="yesterday" js="0">Yesterday</word>
   <word key="tomorrow" js="0">Tomorrow</word>
   <word key="prev_day" js="0">Prev Day</word>
   <word key="next_day" js="0">Next Day</word>
@@ -158,12 +167,15 @@
   <word key="error_bad_date" js="0">The date you requested appears to be invalid</word>
   <word key="birthdays_today" js="0">{# [1:birthday][?:birthdays]} today</word>
   <word key="birthdays_count" js="0">{# [1:birthday][?:birthdays]}</word>
+  <word key="birthdays_view_all" js="0">View all</word>
   <word key="calendar_event" js="0">Event</word>
   <word key="calendar_event_comment" js="0">Event Comment</word>
   <word key="calendar_event_review" js="0">Event Review</word>
   <word key="calendar_event_pl" js="0">Events</word>
   <word key="calendar_event_comment_pl" js="0">Event Comments</word>
+  <word key="calendar_event_comment_pl_lc" js="0">event comments</word>
   <word key="calendar_event_review_pl" js="0">Event Reviews</word>
+  <word key="calendar_event_review_pl_lc" js="0">event reviews</word>
   <word key="event_review_count" js="0"><![CDATA[<span id='reviewCount'>{#}</span> {!# [1:Review][?:Reviews]}]]></word>
   <word key="event_comment_count" js="0"><![CDATA[<span id='commentCount'>{#}</span> {!# [1:Comment][?:Comments]}]]></word>
   <word key="event_rsvp_attendees_list" js="0">{# [1:user has][?:users have]} RSVPed{!#[0: ][?:, including]}</word>
@@ -174,12 +186,13 @@
   <word key="event_calendar_id" js="0">Calendar</word>
   <word key="event_container" js="0">Calendar</word>
   <word key="event_title" js="0">Title</word>
+  <word key="event_ip_address" js="0">IP Address</word>
   <word key="event_tags" js="0">Tags</word>
   <word key="event_content" js="0">Description</word>
   <word key="event_dates" js="0">Date</word>
   <word key="rsvp" js="0">RSVP</word>
   <word key="event_rsvp" js="0">Request RSVP</word>
-  <word key="event_rsvp_desc" js="0">Members who are allowed to RSVP for events will be asked to do so and will be able to see the list of members who have RSVP'd for this event</word>
+  <word key="event_rsvp_desc" js="0">Members who are allowed to RSVP for events will be asked to do so and will be able to see the list of members who have RSVP'd for this event. For recurring events, responses apply to all occurrences.</word>
   <word key="event_to" js="0">to</word>
   <word key="event_all_day" js="0">This is an all day event</word>
   <word key="event_repeat" js="0">Repeat</word>
@@ -205,11 +218,11 @@
   <word key="event_auto_follow" js="0"></word>
   <word key="event_auto_follow_suffix" js="0">Notify me when other comments are posted</word>
   <word key="event_rsvp_limit" js="0">RSVP Limit</word>
-  <word key="event_rsvp_limit_desc" js="0">Once the limit is reached, no further attendees will be allowed to RSVP for this event</word>
+  <word key="event_rsvp_limit_desc" js="0">Once the limit is reached, no further attendees will be allowed to RSVP for this event.</word>
   <word key="event_cover_photo" js="0">Cover Photo</word>
   <word key="event_location" js="0">Location</word>
   <word key="event_album" js="0">Album</word>
-  <word key="event_album_desc" js="0">You can link an album from the Gallery to this event which will show the images on the event page and cause information about the event to be displayed on the album page</word>
+  <word key="event_album_desc" js="0">You can link an album from the Gallery to this event which will show the images on the event page and cause information about the event to be displayed on the album page.</word>
   <word key="submit_event_start" js="0">Event Start</word>
   <word key="submit_event_end" js="0">Event End</word>
   <word key="submit_event_summary" js="0">Summary</word>
@@ -258,6 +271,7 @@
   <word key="rsvp_attendees" js="0">Going</word>
   <word key="rsvp_maybe_attendees" js="0">Maybe</word>
   <word key="rsvp_notgoing_attendees" js="0">Declined</word>
+  <word key="event_address" js="0">Event Address</word>
   <word key="no_rsvps_yet" js="0">No one is attending yet.</word>
   <word key="no_decline_rsvps_yet" js="0">No one has declined yet.</word>
   <word key="no_maybe_rsvps_yet" js="0">No one has said they might go yet.</word>
@@ -270,22 +284,22 @@
   <word key="rsvp_download" js="0">Download guest list</word>
   <word key="event_rsvp_attendees_other" js="0">Other Responses</word>
   <word key="recur_human_yearly" js="0">This event repeats every year %s</word>
-  <word key="recur_human_yearly_multi" js="0">This event repeats every %s years %s</word>
+  <word key="recur_human_yearly_multi" js="0">This event repeats every {# [?:years]} %s</word>
   <word key="recur_human_monthly" js="0">This event repeats every month %s</word>
-  <word key="recur_human_monthly_multi" js="0">This event repeats every %s months %s</word>
+  <word key="recur_human_monthly_multi" js="0">This event repeats every {# [?:months]} %s</word>
   <word key="recur_human_weekly" js="0">This event repeats every week %s</word>
-  <word key="recur_human_weekly_multi" js="0">This event repeats every %s weeks %s</word>
+  <word key="recur_human_weekly_multi" js="0">This event repeats every {# [?:weeks]} %s</word>
   <word key="recur_human_weekly_days" js="0">This event repeats every week on %s %s</word>
-  <word key="recur_human_weekly_multi_days" js="0">This event repeats every %s weeks on %s %s</word>
+  <word key="recur_human_weekly_multi_days" js="0">This event repeats every {# [?:weeks]} on %s %s</word>
   <word key="recur_human_daily" js="0">This event repeats every day %s</word>
-  <word key="recur_human_daily_multi" js="0">This event repeats every %s days %s</word>
+  <word key="recur_human_daily_multi" js="0">This event repeats every {# [?:days]} %s</word>
   <word key="recur_human__forever" js="0">forever</word>
   <word key="recur_human__occurrences" js="0">for {# [1:occurrence][?:occurrences]}</word>
   <word key="recur_human__until" js="0">until %s</word>
   <word key="event_rss_feed_off" js="0">This RSS feed is currently unavailable</word>
   <word key="event_rss_feed_off_admin" js="0">The calendar RSS feed is currently disabled in the admin control panel</word>
   <word key="event_attendees" js="0">Attendees for %s</word>
-  <word key="rsvp_limit_info" js="0">{# [1:user][?:users]} out of a total limit of %s have RSVPed for this event</word>
+  <word key="rsvp_limit_info" js="0">{# [1:user has][?:users have]} RSVPed for this event. A total of %s can RSVP.</word>
   <word key="rsvp_limit_nomaybe" js="0">You may only indicate you are going or not going when an event has a limit specified</word>
   <word key="no_event_review" js="0">You do not have permission to review events</word>
   <word key="task_BAD_CONTENT" js="0">The iCalendar feed %s is not correctly formatted in a recognized iCalendar format</word>
@@ -312,12 +326,12 @@
   <word key="auto_hide_desc" js="0">Hide this block when there are no results to display</word>
   <word key="days_ahead" js="0">Number of days to show</word>
   <word key="maximum_count" js="0">Number of events</word>
-  <word key="view_this_event" js="0">View %s</word>
+  <word key="view_this_event" js="0">View the event %s</word>
   <word key="block_todaysBirthdays" js="0">Today's Birthdays</word>
   <word key="block_todaysBirthdays_desc" js="0">Shows birthdays from today</word>
   <word key="no_members_birthday_today" js="0">No users celebrating today</word>
   <word key="no_upcoming_events" js="0">No upcoming events found</word>
-  <word key="member_age" js="0">(%s years old)</word>
+  <word key="member_age" js="0">({# [1:year][?:years]} old)</word>
   <word key="block_recentReviews" js="0">Recent Event Reviews</word>
   <word key="block_recentReviews_desc" js="0">Display the most recent reviews</word>
   <word key="no_recent_reviews" js="0">No recent reviews found</word>
@@ -366,13 +380,20 @@
   <word key="timezone_offset_12.75" js="0">[GMT + 12:45] Chatham Islands Time</word>
   <word key="timezone_offset_13" js="0">[GMT + 13] Phoenix Islands Time</word>
   <word key="timezone_offset_14" js="0">[GMT + 14] Line Island Time</word>
-  <word key="task__icalendar" js="0">Checks iCalendar feeds for new events and imports into IP.Calendar.</word>
-  <word key="digest_area_calendar" js="0">Events</word>
-  <word key="digest_area_event" js="0">Event</word>
+  <word key="task__icalendar" js="0">Checks iCalendar feeds for new events and imports into Calendar.</word>
+  <word key="digest_area_calendar_calendar" js="0">Events</word>
+  <word key="digest_area_calendar_event" js="0">Event</word>
   <word key="x_created_event_in" js="0">%s posted an event in %s</word>
   <word key="x_commented_event" js="0">%s commented on an event</word>
   <word key="digest_event_on" js="0">Event on</word>
   <word key="digest_users_going" js="0">{# [1:user][?:users]} going</word>
+  <word key="mailsub__calendar_notification_new_content" js="0"><![CDATA[{$content->mapped("title")|raw}]]></word>
+  <word key="email_new_calevent_plain" js="0">%s has posted %s, %s, for %s</word>
+  <word key="email_new_calevent" js="0"><![CDATA[<a href='%s'>%s</a> has posted %s, <a href='%s'>%s</a>, for %s]]></word>
+  <word key="email_new_calevent_guest" js="0"><![CDATA[%s (Guest) has posted %s, <a href='%s'>%s</a>, for %s]]></word>
+  <word key="__api_calendar_events" js="0">Events</word>
+  <word key="__api_calendar_comments" js="0">Comments</word>
+  <word key="__api_calendar_reviews" js="0">Reviews</word>
   <word key="x_daily" js="1">{# [1:day][?:days]}</word>
   <word key="x_weekly" js="1">{# [1:week][?:weeks]}</word>
   <word key="x_monthly" js="1">{# [1:month][?:months]}</word>

applications/calendar/data/lang_rus.xml

@@ -0,0 +1,422 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<language>
+ <app key="calendar" version="101093">
+  <word key_rus="Календарь" key="__app_calendar" js="0">Calendar</word>
+  <word key_rus="Календарь" key="frontnavigation_calendar" js="0">Calendar</word>
+  <word key_rus="комментарий события" key="__indefart_calendar_event_comment" js="0">a comment on a calendar event</word>
+  <word key_rus="событие календаря" key="__indefart_calendar_event" js="0">a calendar event</word>
+  <word key_rus="отзыв на событие" key="__indefart_calendar_event_review" js="0">a review on a calendar event</word>
+  <word key_rus="комментарий к событию календаря" key="__defart_calendar_event_comment" js="0">comment on a calendar event</word>
+  <word key_rus="событие календаря" key="__defart_calendar_event" js="0">calendar event</word>
+  <word key_rus="отзыв к событию календаря" key="__defart_calendar_event_review" js="0">review on a calendar event</word>
+  <word key_rus="календарь" key="calendar_event_container" js="0">calendar</word>
+  <word key_rus="Календарь" key="menu__calendar_calendars" js="0">Calendar</word>
+  <word key_rus="Календари" key="menu__calendar_calendars_calendars" js="0">Calendars</word>
+  <word key_rus="Ленты iCalendar" key="menu__calendar_calendars_ical" js="0">iCalendar Feeds</word>
+  <word key_rus="Настройки" key="menu__calendar_calendars_settings" js="0">Settings</word>
+  <word key_rus="Календарь" key="module__calendar_calendar" js="0">Calendar</word>
+  <word key_rus="Календари" key="module__calendar_calendars" js="0">Calendars</word>
+  <word key_rus="События" key="module__calendar_events" js="0">Events</word>
+  <word key_rus="Событие" key="event" js="0">Event</word>
+  <word key_rus="События календаря" key="editor__calendar_Events" js="0">Calendar Events</word>
+  <word key_rus="Календари" key="editor__calendar_Calendar" js="0">Calendars</word>
+  <word key_rus="Календари" key="acp_search_title_calendar_Calendars" js="0">Calendars</word>
+  <word key_rus="событие календаря" key="calendar_event_pl_lc" js="0">calendar events</word>
+  <word key_rus="Этот календарь" key="search_contextual_item_calendars" js="0">This Calendar</word>
+  <word key_rus="Это событие" key="search_contextual_item_calendar_event" js="0">This Event</word>
+  <word key_rus="Календари" key="r__calendars" js="0">Calendars</word>
+  <word key_rus="Можно управлять календарями?" key="r__calendars_manage" js="0">Can manage calendars?</word>
+  <word key_rus="Можно добавлять календари?" key="r__calendars_add" js="0">Can add calendars?</word>
+  <word key_rus="Можно редактировать календари?" key="r__calendars_edit" js="0">Can edit calendars?</word>
+  <word key_rus="Можно упарвлять разрешениями календаря?" key="r__calendars_permissions" js="0">Can manage calendar permissions?</word>
+  <word key_rus="Можно удалять календари?" key="r__calendars_delete" js="0">Can delete calendars?</word>
+  <word key_rus="Ленты iCalendar" key="r__ical" js="0">iCalendar Feeds</word>
+  <word key_rus="Можно управлять импортом лент iCalendar?" key="r__calendar_feeds_manage" js="0">Can manage iCalendar feed imports?</word>
+  <word key_rus="Можно добавлять импорт лент iCalendar?" key="r__calendar_feeds_add" js="0">Can add iCalendar feed imports?</word>
+  <word key_rus="Можно редактировать импорт лент iCalendar?" key="r__calendar_feeds_edit" js="0">Can edit iCalendar feed imports?</word>
+  <word key_rus="Можно удалять импорт лент iCalendar?" key="r__calendar_feeds_delete" js="0">Can delete iCalendar feed imports?</word>
+  <word key_rus="Просмотр календаря: %s" key="loc_calendar_viewing_calendar" js="0">Viewing Calendar: %s</word>
+  <word key_rus="Просмотр календаря" key="loc_calendar_viewing_calendar_all" js="0">Viewing Calendar</word>
+  <word key_rus="Просмотр события: %s" key="loc_calendar_viewing_event" js="0">Viewing Event: %s</word>
+  <word key_rus="Показать дни рождения в календаре" key="show_bday_calendar" js="0">Show birthdays on calendar</word>
+  <word key_rus="Если включено, календарь будет показывать количество дней рождения пользователей за каждый день и отобразит список празднующих пользователей при просмотре даты." key="show_bday_calendar_desc" js="0">When enabled, the calendar will show the number of member birthdays for each day and will list member birthdays when viewing a date.</word>
+  <word key_rus="Начать календарь с понедельника" key="ipb_calendar_mon" js="0">Start calendar on Monday</word>
+  <word key_rus="По умолчанию, календарь будет использовать воскресенье в качестве дня начала недели. Вы можете использовать этот параметр для начала календаря с понедельника." key="ipb_calendar_mon_desc" js="0">By default, the calendar will use Sunday as the start day for each week. You can use this setting to start the calendar on Monday instead.</word>
+  <word key_rus="Включить RSS-ленту предстоящих событий" key="calendar_rss_feed" js="0">Enable upcoming events RSS feed</word>
+  <word key_rus="Будет отображён контент, доступный для гостей. Для получения дополнительных возможностей, создайте &lt;a href='{internal.app=core&amp;module=discovery&amp;controller=rss}'&gt;Пользовательскую RSS ленту&lt;/a&gt;" key="calendar_rss_feed_desc" js="0"><![CDATA[Only content that is available to guests will be shown. For more options, create a <a href='{internal.app=core&module=discovery&controller=rss}'>Custom RSS Feed</a>]]></word>
+  <word key_rus="Количество предстоящих дней событий для включения в ленту" key="calendar_rss_feed_days" js="0">Number of forthcoming days to include in the feed</word>
+  <word key_rus="Настройки календаря обновлены" key="acplogs__calendar_settings" js="0">Updated calendar settings</word>
+  <word key_rus="Стандартный шаблон" key="calendar_default_view" js="0">Default layout</word>
+  <word key_rus="Эта настройка позволяет вам настраивать стандартный шаблон главной страницы календаря. Пользователи могут переопределить стандартный вид, если захотят." key="calendar_default_view_desc" js="0">This setting allows you to control the default layout of the calendar homepage. Users can override the default view if they wish.</word>
+  <word key_rus="Текущий месяц" key="cal_df_month" js="0">Current month</word>
+  <word key_rus="Текущая неделя" key="cal_df_week" js="0">Current week</word>
+  <word key_rus="Текущий день" key="cal_df_day" js="0">Current day</word>
+  <word key_rus="Лента предстоящих событий" key="cal_df_stream" js="0">Stream of upcoming events</word>
+  <word key_rus="Обложки событий календаря" key="filestorage__calendar_Events" js="0">Calendar Event Cover Photos</word>
+  <word key_rus="Использовать стандартное форматирование даты" key="calendar_df_locale" js="0">Use default date formatting</word>
+  <word key_rus="ДД МММ ГГГГ (Пример: 01 Янв 2015)" key="calendar_df_d_sm_y" js="0">DD MMM YYYY (Example: 01 Jan 2000)</word>
+  <word key_rus="ДД Месяц ГГГГ (Пример: 01 Январь 2015)" key="calendar_df_d_lm_y" js="0">DD Month YYYY (Example: 01 January 2000)</word>
+  <word key_rus="МММ ДД, ГГГГ (Пример: Янв 01, 2015)" key="calendar_df_sm_d_y" js="0">MMM DD, YYYY (Example: Jan 01, 2000)</word>
+  <word key_rus="Месяц ДД, ГГГГ (Пример: Январь 01, 2015)" key="calendar_df_lm_d_y" js="0">Month DD, YYYY (Example: January 01, 2000)</word>
+  <word key_rus="Или укажите другой формат" key="calendar_custom_df" js="0">Or specify a custom date format</word>
+  <word key_rus="Формат даты для мероприятий" key="calendar_date_format" js="0">Date format for events</word>
+  <word key_rus="Пользовательский формат даты" key="calendar_date_format_custom" js="0">Custom date format</word>
+  <word key_rus="Вы можете использовать любой &lt;a href='http://php.net/strftime' target='_blank'&gt;PHP формат&lt;/a&gt; для отображения дат в календаре" key="calendar_date_format_custom_desc" js="0"><![CDATA[You can use any <a href='http://php.net/strftime' target='_blank'>PHP strftime</a> options to specify a custom format for dates in calendar]]></word>
+  <word key_rus="Вы должны выбрать предопределенный формат даты или указать пользовательский" key="calendar_no_date_format" js="0">You must either choose a predefined date format or specify a custom date format</word>
+  <word key_rus="Календари" key="calendars" js="0">Calendars</word>
+  <word key_rus="Календарь" key="calendars_sg" js="0">Calendar</word>
+  <word key_rus="Настройки" key="calendar_settings" js="0">Settings</word>
+  <word key_rus="Разрешения" key="calendar_permissions" js="0">Permissions</word>
+  <word key_rus="Модерация" key="calendar_moderation" js="0">Moderation</word>
+  <word key_rus="Название" key="cal_title" js="0">Name</word>
+  <word key_rus="События должны быть одобрены?" key="cal_moderate" js="0">Events must be approved?</word>
+  <word key_rus="Комментарии должны быть одобрены?" key="cal_comment_moderate" js="0">Comments must be approved?</word>
+  <word key_rus="Разрешить комментарии?" key="cal_allow_comments" js="0">Allow comments?</word>
+  <word key_rus="Разрешить отзывы?" key="cal_allow_reviews" js="0">Allow reviews?</word>
+  <word key_rus="Отзывы должны быть одобрены?" key="cal_review_moderate" js="0">Reviews must be approved?</word>
+  <word key_rus="" key="calperm_perm__label" js="0"></word>
+  <word key_rus="Просмотр календаря" key="calperm_perm__view" js="0">See Calendar</word>
+  <word key_rus="Просмотр событий" key="calperm_perm__read" js="0">View Events</word>
+  <word key_rus="Добавление событий" key="calperm_perm__add" js="0">Add Events</word>
+  <word key_rus="Комментирование" key="calperm_perm__reply" js="0">Comment</word>
+  <word key_rus="Запрашивать RSVP" key="calperm_perm__askrsvp" js="0">Request RSVP</word>
+  <word key_rus="RSVP" key="calperm_perm__rsvp" js="0">RSVP</word>
+  <word key_rus="Отзыв" key="calperm_perm__review" js="0">Review</word>
+  <word key_rus="Цвет" key="cal_color" js="0">Color</word>
+  <word key_rus="Добавить календарь" key="add_calendar" js="0">Add Calendar</word>
+  <word key_rus="Изменить календарь" key="edit_calendar" js="0">Edit Calendar</word>
+  <word key_rus="Календарь" key="modperms__core_Content_calendar_Event" js="0">Calendar</word>
+  <word key_rus="Календари" key="calendar_calendars" js="0">Calendars</word>
+  <word key_rus="Можно закреплять события?" key="can_pin_calendar_event" js="0">Can pin events?</word>
+  <word key_rus="Можно откреплять события?" key="can_unpin_calendar_event" js="0">Can unpin events?</word>
+  <word key_rus="Можно устанавливать события популярными?" key="can_feature_calendar_event" js="0">Can feature events?</word>
+  <word key_rus="Можно устанавливать события непопулярными?" key="can_unfeature_calendar_event" js="0">Can unfeature events?</word>
+  <word key_rus="Можно перемещать события?" key="can_move_calendar_event" js="0">Can move events?</word>
+  <word key_rus="Можно блокировать события?" key="can_lock_calendar_event" js="0">Can lock events?</word>
+  <word key_rus="Можно разблокировать события?" key="can_unlock_calendar_event" js="0">Can unlock events?</word>
+  <word key_rus="Можно комментировать закрытые события?" key="can_reply_to_locked_calendar_event" js="0">Can comment on locked events?</word>
+  <word key_rus="Можно редактировать события?" key="can_edit_calendar_event" js="0">Can edit events?</word>
+  <word key_rus="Можно скрывать события?" key="can_hide_calendar_event" js="0">Can hide events?</word>
+  <word key_rus="Можно показывать события?" key="can_unhide_calendar_event" js="0">Can unhide events?</word>
+  <word key_rus="Можно просматривать скрытые события?" key="can_view_hidden_calendar_event" js="0">Can view hidden events?</word>
+  <word key_rus="Можно удалять события?" key="can_delete_calendar_event" js="0">Can delete events?</word>
+  <word key_rus="Можно редактировать комментарии?" key="can_edit_calendar_event_comment" js="0">Can edit comments?</word>
+  <word key_rus="Можно скрывать комментарии?" key="can_hide_calendar_event_comment" js="0">Can hide comments?</word>
+  <word key_rus="Можно показывать комментарии?" key="can_unhide_calendar_event_comment" js="0">Can unhide comments?</word>
+  <word key_rus="Можно просматривать скрытые комментарии?" key="can_view_hidden_calendar_event_comment" js="0">Can view hidden comments?</word>
+  <word key_rus="Можно удалять комментарии?" key="can_delete_calendar_event_comment" js="0">Can delete comments?</word>
+  <word key_rus="Можно редактировать отзывы?" key="can_edit_calendar_event_review" js="0">Can edit reviews?</word>
+  <word key_rus="Можно скрывать отзывы?" key="can_hide_calendar_event_review" js="0">Can hide reviews?</word>
+  <word key_rus="Можно показывать отзывы?" key="can_unhide_calendar_event_review" js="0">Can unhide reviews?</word>
+  <word key_rus="Можно просматривать скрытые отзывы?" key="can_view_hidden_calendar_event_review" js="0">Can view hidden reviews?</word>
+  <word key_rus="Можно удалять отзывы?" key="can_delete_calendar_event_review" js="0">Can delete reviews?</word>
+  <word key_rus="Импорт ленты iCalendar" key="ical_title" js="0">iCalendar Feed Imports</word>
+  <word key_rus="Заголовок" key="ical_feed_title" js="0">Title</word>
+  <word key_rus="Добавлено" key="ical_feed_added" js="0">Added</word>
+  <word key_rus="Последнее обновление" key="ical_feed_lastupdated" js="0">Last Updated</word>
+  <word key_rus="Календарь" key="ical_feed_calendar_id" js="0">Calendar</word>
+  <word key_rus="URL" key="ical_feed_url" js="0">URL</word>
+  <word key_rus="Добавить ленту iCalendar" key="calendar_feeds_add" js="0">Add iCalendar Feed</word>
+  <word key_rus="Загрузить файл iCalendar" key="calendar_feeds_upload" js="0">Upload iCalendar File</word>
+  <word key_rus="Импорт новых событий" key="update_ical" js="0">Import new events</word>
+  <word key_rus="Название" key="feed_title" js="0">Name</word>
+  <word key_rus="URL" key="feed_url" js="0">URL</word>
+  <word key_rus="URL должен начинаться с http://, https:// или webcal://" key="feed_url_desc" js="0">The URL should start with http://, https:// or webcal://</word>
+  <word key_rus="Пользователь" key="feed_member_id" js="0">Member</word>
+  <word key_rus="События, импортированные этой лентой, будут созданы под именем этого пользователя" key="feed_member_id_desc" js="0">Events from this feed will be created by this member</word>
+  <word key_rus="Календарь" key="feed_calendar_id" js="0">Calendar</word>
+  <word key_rus="Выберите календарь, в который будут сохранены события, импортированные этой лентой" key="feed_calendar_id_desc" js="0">Select the calendar that events from this feed will be saved to</word>
+  <word key_rus="Включить RSVP" key="feed_allow_rsvp" js="0">Enable RSVP</word>
+  <word key_rus="Если включено, RSVP будет активирован для всех событий, импортированных этой лентой" key="feed_allow_rsvp_desc" js="0">If enabled, RSVP will be enabled for all events imported from this feed</word>
+  <word key_rus="Загружен файл iCalendar (%s событий импортировано и %s пропущено)" key="acplog__ical_uploaded" js="0">Uploaded an iCalendar file (%s events imported and %s events skipped)</word>
+  <word key_rus="Добавлена %s лента iCalendar" key="acplog__icalfeed_created" js="0">Added %s iCalendar feed</word>
+  <word key_rus="Изменена %s лента iCalendar" key="acplog__icalfeed_updated" js="0">Edited %s iCalendar feed</word>
+  <word key_rus="События iCalendar импортированы" key="feed_uploaded" js="0">iCalendar Events Imported</word>
+  <word key_rus="Обновлена лента iCalendar (%s событий импортировано и %s пропущено)" key="acplog__icalfeed_refreshed" js="0">Refreshed iCalendar feed (%s events imported and %s events skipped)</word>
+  <word key_rus="Обновлена лента iCalendar" key="feed_refreshed" js="0">iCalendar Feed Refreshed</word>
+  <word key_rus="Файл iCalendar" key="feed_file" js="0">iCalendar File</word>
+  <word key_rus="Файлы iCalendar обычно имеют расширение .ics" key="feed_file_desc" js="0">iCalendar files usually have a .ics extension</word>
+  <word key_rus="Мы не смогли найти эту ленту iCalendar" key="feed_not_found" js="0">We could not find that iCalendar feed</word>
+  <word key_rus="Лента iCalendar %s удалена" key="acplog__icalfeed_deleted" js="0">%s iCalendar feed deleted</word>
+  <word key_rus="Хранение событий" key="keep_events" js="0">Keep Events</word>
+  <word key_rus="Вы можете выбрать события для удаления, которые были импортированы этой лентой" key="keep_events_desc" js="0">You can choose to remove events that were imported from this feed</word>
+  <word key_rus="Лента является недопустимой, т.к. отсутствует контент для импорта" key="ical_error_NO_CONTENT" js="0">The feed appears to be invalid because no content was returned</word>
+  <word key_rus="Лента является недопустимой, т.к. контент не соответствует ожидаемому формату" key="ical_error_BAD_CONTENT" js="0">The feed appears to be invalid because content not matching the expected format was returned</word>
+  <word key_rus="%s %s" key="cal_month_title" js="0">%s %s</word>
+  <word key_rus="Лента событий для %s %s" key="cal_month_stream_title" js="0">Event stream for %s %s</word>
+  <word key_rus="%s %s %s - %s %s %s" key="cal_week_title" js="0">%s %s %s - %s %s %s</word>
+  <word key_rus="w/b %s %s %s" key="cal_week_title_wb" js="0">w/b %s %s %s</word>
+  <word key_rus="%s %s, %s" key="cal_month_day" js="0">%s %s, %s</word>
+  <word key_rus="%s %s" key="cal_month_day_noyear" js="0">%s %s</word>
+  <word key_rus="Все календари" key="all_calendars" js="0">All Calendars</word>
+  <word key_rus="Создать событие" key="create_event" js="0">Create Event</word>
+  <word key_rus="Выбрать календарь" key="select_calendar" js="0">Select Calendar</word>
+  <word key_rus="Добавить событие" key="add_event" js="0">Add event</word>
+  <word key_rus="Предыдущий месяц" key="previous_month" js="0">Prev Month</word>
+  <word key_rus="Следующий месяц" key="next_month" js="0">Next Month</word>
+  <word key_rus="День" key="day" js="0">Day</word>
+  <word key_rus="Завтра" key="tomorrow" js="0">Tomorrow</word>
+  <word key_rus="Предыдущий день" key="prev_day" js="0">Prev Day</word>
+  <word key_rus="Следующий день" key="next_day" js="0">Next Day</word>
+  <word key_rus="Лента событий" key="event_stream" js="0">Event Stream</word>
+  <word key_rus="Лента" key="event_stream_short" js="0">Stream</word>
+  <word key_rus="Предыдущая неделя" key="previous_week" js="0">Prev Week</word>
+  <word key_rus="Следующая неделя" key="next_week" js="0">Next Week</word>
+  <word key_rus="Событий, запланированных на этот день, нет" key="no_events_today" js="0">No events scheduled today</word>
+  <word key_rus="Событий, запланированных на этот месяц, нет" key="no_events_month" js="0">No events scheduled this month</word>
+  <word key_rus="Дата недействительна" key="error_bad_date" js="0">The date you requested appears to be invalid</word>
+  <word key_rus="Сегодня {# [*1:день рождения][*2:дня рождения][*3:дня рождения][*4:дня рождения][11:дней рождений][12:дней рождений][13:дней рождений][14:дней рождений][?:дней рождений]}" key="birthdays_today" js="0">{# [1:birthday][?:birthdays]} today</word>
+  <word key_rus="{# [*1:день рождения][*2:дня рождения][*3:дня рождения][*4:дня рождения][11:дней рождений][12:дней рождений][13:дней рождений][14:дней рождений][?:дней рождений]}" key="birthdays_count" js="0">{# [1:birthday][?:birthdays]}</word>
+  <word key_rus="Посмотреть все" key="birthdays_view_all" js="0">View all</word>
+  <word key_rus="Событие" key="calendar_event" js="0">Event</word>
+  <word key_rus="Комментарий события" key="calendar_event_comment" js="0">Event Comment</word>
+  <word key_rus="Отзыв о событии" key="calendar_event_review" js="0">Event Review</word>
+  <word key_rus="События" key="calendar_event_pl" js="0">Events</word>
+  <word key_rus="Комментарии события" key="calendar_event_comment_pl" js="0">Event Comments</word>
+  <word key_rus="комментарии события" key="calendar_event_comment_pl_lc" js="0">event comments</word>
+  <word key_rus="Отзывы о событии" key="calendar_event_review_pl" js="0">Event Reviews</word>
+  <word key_rus="отзывы календаря" key="calendar_event_review_pl_lc" js="0">event reviews</word>
+  <word key_rus="&lt;span id='reviewCount'&gt;{#}&lt;/span&gt; {!# [*1:Отзыв][*2:Отзыва][*3:Отзыва][*4:Отзыва][11:Отзывов][12:Отзывов][13:Отзывов][14:Отзывов][?:Отзывов]}" key="event_review_count" js="0"><![CDATA[<span id='reviewCount'>{#}</span> {!# [1:Review][?:Reviews]}]]></word>
+  <word key_rus="&lt;span id='commentCount'&gt;{#}&lt;/span&gt; {!# [*1:Комментарий][*2:Комментария][*3:Комментария][*4:Комментария][11:Комментариев][12:Комментариев][13:Комментариев][14:Комментариев][?:Комментариев]}" key="event_comment_count" js="0"><![CDATA[<span id='commentCount'>{#}</span> {!# [1:Comment][?:Comments]}]]></word>
+  <word key_rus="{# [*1:пользователь имеет][*2:пользователя имеют][*3:пользователя имеют][*4:пользователя имеют][11:пользователей имеют][12:пользователей имеют][13:пользователей имеют][14:пользователей имеют][?:пользователей имеют]} приглашения (RSVP){!#[0: ][?:, в том числе]}" key="event_rsvp_attendees_list" js="0">{# [1:user has][?:users have]} RSVPed{!#[0: ][?:, including]}</word>
+  <word key_rus="Предстоящие события" key="calendar_rss_title" js="0">Upcoming Events</word>
+  <word key_rus="Добавить событие" key="submit_event" js="0">Submit an event</word>
+  <word key_rus="С '%s'" key="with_calendar" js="0">With '%s'</word>
+  <word key_rus="Со всеми Календарями" key="with_all_calendars" js="0">With All Calendars</word>
+  <word key_rus="Календарь" key="event_calendar_id" js="0">Calendar</word>
+  <word key_rus="Календарь" key="event_container" js="0">Calendar</word>
+  <word key_rus="Заголовок" key="event_title" js="0">Title</word>
+  <word key_rus="IP-адрес" key="event_ip_address" js="0">IP Address</word>
+  <word key_rus="Теги" key="event_tags" js="0">Tags</word>
+  <word key_rus="Описание" key="event_content" js="0">Description</word>
+  <word key_rus="Дата" key="event_dates" js="0">Date</word>
+  <word key_rus="RSVP" key="rsvp" js="0">RSVP</word>
+  <word key_rus="Требовать RSVP" key="event_rsvp" js="0">Request RSVP</word>
+  <word key_rus="Пользователи, которым разрешено отвечать на приглашения (RSVP) на события, будет предложено сделать это и смогут увидеть список пользователей, кто уже ответил на приглашение на это событие. Для повторяющихся событий, ответы применяются ко всем вхождениям." key="event_rsvp_desc" js="0">Members who are allowed to RSVP for events will be asked to do so and will be able to see the list of members who have RSVP'd for this event. For recurring events, responses apply to all occurrences.</word>
+  <word key_rus="до" key="event_to" js="0">to</word>
+  <word key_rus="Это событие продлится весь день" key="event_all_day" js="0">This is an all day event</word>
+  <word key_rus="Повтор" key="event_repeat" js="0">Repeat</word>
+  <word key_rus="Изменить часовой пояс" key="change_timezone" js="0">Change the time zone</word>
+  <word key_rus="Часовой пояс события" key="event_timezone" js="0">Event Time Zone</word>
+  <word key_rus="Повторы:" key="event_rpm_repeats" js="0">Repeats:</word>
+  <word key_rus="Ежедневно" key="event_rpm_repeats_daily" js="0">Daily</word>
+  <word key_rus="Еженедельно" key="event_rpm_repeats_weekly" js="0">Weekly</word>
+  <word key_rus="Ежемесячно" key="event_rpm_repeats_monthly" js="0">Monthly</word>
+  <word key_rus="Ежегодно" key="event_rpm_repeats_yearly" js="0">Yearly</word>
+  <word key_rus="Повторять каждые:" key="event_rpm_repeatevery" js="0">Repeat every:</word>
+  <word key_rus="дней" key="event_rpm_repeatevery_day" js="0">days</word>
+  <word key_rus="недели" key="event_rpm_repeatevery_week" js="0">weeks</word>
+  <word key_rus="месяцев" key="event_rpm_repeatevery_month" js="0">months</word>
+  <word key_rus="лет" key="event_rpm_repeatevery_year" js="0">years</word>
+  <word key_rus="Повтор на:" key="event_rpm_repeaton" js="0">Repeat on:</word>
+  <word key_rus="Событие на один день" key="event_single_day" js="0">Single day event</word>
+  <word key_rus="Окончание:" key="event_rpm_ends" js="0">Ends:</word>
+  <word key_rus="Никогда" key="event_rpm_ends_never" js="0">Never</word>
+  <word key_rus="После" key="event_rpm_ends_afterx" js="0">After</word>
+  <word key_rus="прошедших событий" key="event_rpm_ends_occurrencesx" js="0">occurrences</word>
+  <word key_rus="В" key="event_rpm_ends_date" js="0">On</word>
+  <word key_rus="" key="event_auto_follow" js="0"></word>
+  <word key_rus="Сообщать мне при публикации комментариев" key="event_auto_follow_suffix" js="0">Notify me when other comments are posted</word>
+  <word key_rus="Лимит RSVP" key="event_rsvp_limit" js="0">RSVP Limit</word>
+  <word key_rus="Как только лимит достигнут, дальнейшие участники не будут допущены к RSVP этого события." key="event_rsvp_limit_desc" js="0">Once the limit is reached, no further attendees will be allowed to RSVP for this event.</word>
+  <word key_rus="Обложка" key="event_cover_photo" js="0">Cover Photo</word>
+  <word key_rus="Местонахождение" key="event_location" js="0">Location</word>
+  <word key_rus="Альбом" key="event_album" js="0">Album</word>
+  <word key_rus="Вы можете связать альбом из Галереи с этим событием, который отобразит изображения на странице события и вызовет информацию об этом событии на странице альбома." key="event_album_desc" js="0">You can link an album from the Gallery to this event which will show the images on the event page and cause information about the event to be displayed on the album page.</word>
+  <word key_rus="Событие начинается" key="submit_event_start" js="0">Event Start</word>
+  <word key_rus="Событие заканчивается" key="submit_event_end" js="0">Event End</word>
+  <word key_rus="Суммируем" key="submit_event_summary" js="0">Summary</word>
+  <word key_rus="Это событие повторяется" key="submit_event_repeats_check" js="0">This event repeats</word>
+  <word key_rus="Повторы" key="submit_event_repeats" js="0">Repeats</word>
+  <word key_rus="удалить" key="submit_event_remove_repeat" js="0">remove</word>
+  <word key_rus="Добавить событие" key="add_cal_event_header" js="0">Add Calendar Event</word>
+  <word key_rus="Перейти" key="calendar_jump" js="0">Go</word>
+  <word key_rus="Сегодня" key="calendar_jump_today" js="0">Go to today</word>
+  <word key_rus="Перейти к..." key="jump_to_placeholder" js="0">Jump to...</word>
+  <word key_rus="Перейти к" key="jump_to" js="0">Jump to</word>
+  <word key_rus="Сегодняшние события" key="events_happening_today" js="0">Events happening today</word>
+  <word key_rus="ВЕСЬ&lt;br&gt;ДЕНЬ" key="day_view_all_day" js="0"><![CDATA[ALL<br>DAY]]></word>
+  <word key_rus="Вы пойдёте" key="you_are_going" js="0">You are going</word>
+  <word key_rus="Вы посетите это событие" key="you_are_going_to_this" js="0">You are going to this event</word>
+  <word key_rus="Вы не собираетесь посещать это событие" key="you_are_not_going_to_this" js="0">You are not going to this event</word>
+  <word key_rus="Подтвердить участие" key="confirm_attendance" js="0">Confirm attendance</word>
+  <word key_rus="Популярные события" key="featured_events" js="0">Featured Events</word>
+  <word key_rus="Пожалуйста, выберите дату завершения после даты начала события" key="end_date_before_start" js="0">Please select an end date after the event start date</word>
+  <word key_rus="Указанная дата начала неверна" key="invalid_start_date" js="0">The provided start date is not valid</word>
+  <word key_rus="Указанная дата завершения события неверна" key="invalid_end_date" js="0">The provided end date is not valid</word>
+  <word key_rus="Сохранить" key="event__save" js="0">Save</word>
+  <word key_rus="Удалить событие" key="calendar_delete_title" js="0">Delete this event</word>
+  <word key_rus="%s %s" key="blurb_date_with_time" js="0">%s %s</word>
+  <word key_rus="%s - %s в %s" key="blurb_start_and_end" js="0">%s - %s in %s</word>
+  <word key_rus="%s в %s" key="blurb_start_only" js="0">%s in %s</word>
+  <word key_rus="Скачать событие" key="download_ical" js="0">Download Event</word>
+  <word key_rus="Скачать это событие в качестве файла iCal" key="download_ical_title" js="0">Download this event as an iCal file</word>
+  <word key_rus="О событии" key="event_details" js="0">Event details</word>
+  <word key_rus="Событие создал %s" key="event_created_by" js="0">Event created by %s</word>
+  <word key_rus="Ваш рейтинг" key="event_rating_value" js="0">Your Rating</word>
+  <word key_rus="Ваш отзыв" key="event_review_text" js="0">Your Review</word>
+  <word key_rus="Добавить отзыв..." key="event__review_placeholder" js="0">Add a review...</word>
+  <word key_rus="Добавить комментарий..." key="event__comment_placeholder" js="0">Add a comment...</word>
+  <word key_rus="Добавить комментарий" key="event_submit_comment" js="0">Submit Comment</word>
+  <word key_rus="Участники" key="event_rsvp_attendees" js="0">Attendees</word>
+  <word key_rus="Пожаловаться" key="report_event" js="0">Report Event</word>
+  <word key_rus="Изменить" key="calendar_edit_details" js="0">Edit Details</word>
+  <word key_rus="Изменить детали этого события" key="calendar_edit_details_title" js="0">Edit this event's details</word>
+  <word key_rus="Управление" key="manage_event" js="0">Manage Event</word>
+  <word key_rus="Это событие ещё не одобрено и видно только для модераторов." key="event_pending_approval" js="0">This event is not yet approved and is only visible to staff.</word>
+  <word key_rus="Покинуть событие" key="rsvp_leave_event" js="0">Leave event</word>
+  <word key_rus="Пойду" key="rsvp_attend_event" js="0">Going</word>
+  <word key_rus="Может быть" key="rsvp_maybe_event" js="0">Maybe</word>
+  <word key_rus="Не пойду" key="rsvp_notgoing_event" js="0">Not going</word>
+  <word key_rus="Пойду" key="rsvp_attendees" js="0">Going</word>
+  <word key_rus="Может быть" key="rsvp_maybe_attendees" js="0">Maybe</word>
+  <word key_rus="Отказаться" key="rsvp_notgoing_attendees" js="0">Declined</word>
+  <word key_rus="Адрес события" key="event_address" js="0">Event Address</word>
+  <word key_rus="Никто пока ещё не собирается." key="no_rsvps_yet" js="0">No one is attending yet.</word>
+  <word key_rus="Никто еще не отказался." key="no_decline_rsvps_yet" js="0">No one has declined yet.</word>
+  <word key_rus="Пока ещё никто не сообщил, что может пойти" key="no_maybe_rsvps_yet" js="0">No one has said they might go yet.</word>
+  <word key_rus="Лимит RSVP достигнут" key="rsvp_limit_reached" js="0">RSVP limit reached</word>
+  <word key_rus="Вы не можете отправлять приглашения (RSVP) на это событие" key="rsvp_error" js="0">You do not have permission to RSVP for this event</word>
+  <word key_rus="Ваше имя было удалено из списка приглашенных на это событие" key="rsvp_not_going" js="0">Your name has been removed from the guest list for this event</word>
+  <word key_rus="Ваше имя было добавлено в список приглашённых гостей" key="rsvp_selection_yes" js="0">Your name has been added to the guest list</word>
+  <word key_rus="Жаль, что Вы не сможете сделать это" key="rsvp_selection_no" js="0">It's too bad you won't be able to make it to the event!</word>
+  <word key_rus="Ваше имя было добавлено в" key="rsvp_selection_maybe" js="0">Your name has been added to the maybe list</word>
+  <word key_rus="Скачать список гостей" key="rsvp_download" js="0">Download guest list</word>
+  <word key_rus="Другие ответы" key="event_rsvp_attendees_other" js="0">Other Responses</word>
+  <word key_rus="Это событие повторяется каждый год %s" key="recur_human_yearly" js="0">This event repeats every year %s</word>
+  <word key_rus="Это событие повторяется {!# [*1:каждый # год][*2:каждые # года][*3:каждые # года][*4:каждые # года][11:каждые # лет][12:каждые # лет][13:каждые # лет][14:каждые # лет][?:# лет]} %s" key="recur_human_yearly_multi" js="0">This event repeats every {# [?:years]} %s</word>
+  <word key_rus="Это событие повторяется каждый месяц %s" key="recur_human_monthly" js="0">This event repeats every month %s</word>
+  <word key_rus="Это событие повторяется {!# [*1:каждый # месяц][*2:каждые # месяца][*3:каждые # месяца][*4:каждые # месяца][11:каждые # месяцев][12:каждые # месяцев][13:каждые # месяцев][14:каждые # месяцев][?:# месяцев]} %s" key="recur_human_monthly_multi" js="0">This event repeats every {# [?:months]} %s</word>
+  <word key_rus="Это событие повторяется каждую неделю %s" key="recur_human_weekly" js="0">This event repeats every week %s</word>
+  <word key_rus="Это событие повторяется {!# [*1:каждую # неделю][*2:каждые # недели][*3:каждые # недели][*4:каждые # недели][11:каждые # недель][12:каждые # недель][13:каждые # недель][14:каждые # недель][?:# недель]} %s" key="recur_human_weekly_multi" js="0">This event repeats every {# [?:weeks]} %s</word>
+  <word key_rus="Это событие повторяется каждую неделю в %s %s" key="recur_human_weekly_days" js="0">This event repeats every week on %s %s</word>
+  <word key_rus="Это событие повторяется {!# [*1:каждую # неделю][*2:каждые # недели][*3:каждые # недели][*4:каждые # недели][11:каждые # недель][12:каждые # недель][13:каждые # недель][14:каждые # недель][?:# недель]} в %s %s" key="recur_human_weekly_multi_days" js="0">This event repeats every {# [?:weeks]} on %s %s</word>
+  <word key_rus="Это событие повторяется каждый день %s" key="recur_human_daily" js="0">This event repeats every day %s</word>
+  <word key_rus="Это событие повторяется {!# [*1:каждый # день][*2:каждые # дня][*3:каждые # дня][*4:каждые # дня][11:каждые # дней][12:каждые # дней][13:каждые # дней][14:каждые # дней][?:# дней]} %s" key="recur_human_daily_multi" js="0">This event repeats every {# [?:days]} %s</word>
+  <word key_rus="навсегда" key="recur_human__forever" js="0">forever</word>
+  <word key_rus="на {# [*1:случай][*2:случая][*3:случая][*4:случая][11:случаев][12:случаев][13:случаев][14:случаев][?:случаев]}" key="recur_human__occurrences" js="0">for {# [1:occurrence][?:occurrences]}</word>
+  <word key_rus="до %s" key="recur_human__until" js="0">until %s</word>
+  <word key_rus="Эта RSS лента сейчас недоступна" key="event_rss_feed_off" js="0">This RSS feed is currently unavailable</word>
+  <word key_rus="RSS лента календаря отключена в админцентре" key="event_rss_feed_off_admin" js="0">The calendar RSS feed is currently disabled in the admin control panel</word>
+  <word key_rus="Участники на %s" key="event_attendees" js="0">Attendees for %s</word>
+  <word key_rus="{# [*1:пользователь приглашен][*2:пользователя приглашены][*3:пользователя приглашены][*4:пользователя приглашены][11:пользователей приглашены][12:пользователей приглашены][13:пользователей приглашены][14:пользователей приглашены][?:пользователей приглашены]} на это мероприятие. Общее количество %s." key="rsvp_limit_info" js="0">{# [1:user has][?:users have]} RSVPed for this event. A total of %s can RSVP.</word>
+  <word key_rus="Когда на событие закончился лимит гостей, вы можете только указать, пойдёте или нет" key="rsvp_limit_nomaybe" js="0">You may only indicate you are going or not going when an event has a limit specified</word>
+  <word key_rus="У вас нет прав на написание отзыва событию" key="no_event_review" js="0">You do not have permission to review events</word>
+  <word key_rus="Лента iCalendar %s неправильно отформатирована в распознаваемый формат" key="task_BAD_CONTENT" js="0">The iCalendar feed %s is not correctly formatted in a recognized iCalendar format</word>
+  <word key_rus="Лента iCalendar %s не предоставила ни одного события для продолжения" key="task_NO_CONTENT" js="0">The iCalendar feed %s did not return any events to process</word>
+  <word key_rus="Подписаться на ленту iCalendar" key="subscribe_webcal" js="0">Subscribe to iCalendar feed</word>
+  <word key_rus="Скачать экспорт iCalendar" key="download_webcal" js="0">Download iCalendar export</word>
+  <word key_rus="Календарь" key="calendar_id" js="0">Calendar</word>
+  <word key_rus="Это событие закрыто, но вам разрешено добавлять новые комментарии." key="event_locked_can_comment" js="0">This event is locked, but your permissions allow you to add new comments.</word>
+  <word key_rus="Это событие закрыто для комментариев." key="event_locked_cannot_comment" js="0">This event is now closed to further comments.</word>
+  <word key_rus="Изображения с этого события" key="event_images" js="0">Images from this event</word>
+  <word key_rus="Переместить событие" key="event_move_title" js="0">Move this event</word>
+  <word key_rus="Популярное событие" key="feature_title_event" js="0">Feature this event</word>
+  <word key_rus="Непопулярное событие" key="unfeature_title_event" js="0">Unfeature this event</word>
+  <word key_rus="Закрепить событие" key="pin_title_event" js="0">Pin this event</word>
+  <word key_rus="Открепить событие" key="unpin_title_event" js="0">Unpin this event</word>
+  <word key_rus="Скрыть событие" key="hide_title_event" js="0">Hide this event</word>
+  <word key_rus="Показать событие" key="unhide_title_event" js="0">Unhide this event</word>
+  <word key_rus="Заблокировать событие" key="lock_title_event" js="0">Lock this event</word>
+  <word key_rus="Разблокировать событие" key="unlock_title_event" js="0">Unlock this event</word>
+  <word key_rus="Одобрить событие" key="approve_title_event" js="0">Approve this event</word>
+  <word key_rus="Предстоящие события" key="block_upcomingEvents" js="0">Upcoming Events</word>
+  <word key_rus="Показывает предстоящие события" key="block_upcomingEvents_desc" js="0">Shows upcoming calendar events</word>
+  <word key_rus="Автоматически скрывать блок" key="auto_hide" js="0">Automatically hide block</word>
+  <word key_rus="Скрыть этот блок, когда нет результатов для отображения" key="auto_hide_desc" js="0">Hide this block when there are no results to display</word>
+  <word key_rus="Количество дней для отображения" key="days_ahead" js="0">Number of days to show</word>
+  <word key_rus="Количество событий" key="maximum_count" js="0">Number of events</word>
+  <word key_rus="Просмотр события %s" key="view_this_event" js="0">View the event %s</word>
+  <word key_rus="Сегодняшние дни рождения" key="block_todaysBirthdays" js="0">Today's Birthdays</word>
+  <word key_rus="Отображает сегодняшние дни рождения" key="block_todaysBirthdays_desc" js="0">Shows birthdays from today</word>
+  <word key_rus="Празднующих сегодня пользователей нет" key="no_members_birthday_today" js="0">No users celebrating today</word>
+  <word key_rus="Предстоящих событий не найдено" key="no_upcoming_events" js="0">No upcoming events found</word>
+  <word key_rus="({# [*1:год][*2:года][*3:года][*4:года][11:лет][12:лет][13:лет][14:лет][?:лет]})" key="member_age" js="0">({# [1:year][?:years]} old)</word>
+  <word key_rus="Последние отзывы" key="block_recentReviews" js="0">Recent Event Reviews</word>
+  <word key_rus="Отображает последние отзывы" key="block_recentReviews_desc" js="0">Display the most recent reviews</word>
+  <word key_rus="Отзывов не найдено" key="no_recent_reviews" js="0">No recent reviews found</word>
+  <word key_rus="Календари" key="announce_calendars" js="0">Calendars</word>
+  <word key_rus="Количество отзывов для отображения" key="review_count" js="0">Number of reviews to show</word>
+  <word key_rus="Календарь" key="widget_calendar" js="0">Calendar</word>
+  <word key_rus="Событие календаря" key="embed_calendar_event" js="0">Calendar Event</word>
+  <word key_rus="{# [*1:пользователь][*2:пользователя][*3:пользователя][*4:пользователя][11:пользователей][12:пользователей][13:пользователей][14:пользователей][?:пользователей]} собирается" key="x_users_going" js="0">{# [1:user][?:users]} going</word>
+  <word key_rus="GMT %s" key="timezone_offset_short" js="0">GMT %s</word>
+  <word key_rus="[GMT - 12] Остров Бейкер, Аляска, США" key="timezone_offset_-12" js="0">[GMT - 12] Baker Island Time</word>
+  <word key_rus="[GMT - 11] Часовой пояс САМОА (SST)" key="timezone_offset_-11" js="0">[GMT - 11] Samoa Standard Time</word>
+  <word key_rus="[GMT - 10] Поясное время Гавай (HAST)" key="timezone_offset_-10" js="0">[GMT - 10] Hawaii Standard Time</word>
+  <word key_rus="[GMT - 9:30] Папеэте, Французская Полинезия" key="timezone_offset_-9.5" js="0">[GMT - 9:30] Marquesas Islands Time</word>
+  <word key_rus="[GMT - 9] Поясное время Аляски (AKST)" key="timezone_offset_-9" js="0">[GMT - 9] Alaska Standard Time</word>
+  <word key_rus="[GMT - 8] Тихоокеанское поясное время (PST)" key="timezone_offset_-8" js="0">[GMT - 8] Pacific Standard Time</word>
+  <word key_rus="[GMT - 7] Часовой пояс западной части США (MST)" key="timezone_offset_-7" js="0">[GMT - 7] Mountain Standard Time</word>
+  <word key_rus="[GMT - 6] Центральное поясное время (CST)" key="timezone_offset_-6" js="0">[GMT - 6] Central Standard Time</word>
+  <word key_rus="[GMT - 5] Североамериканское восточное время (EST)" key="timezone_offset_-5" js="0">[GMT - 5] Eastern Standard Time</word>
+  <word key_rus="[GMT - 4:30] Поясное время Венесуэлы (VST)" key="timezone_offset_-4.5" js="0">[GMT - 4:30] Venezuelan Standard Time</word>
+  <word key_rus="[GMT - 4] Атлантическое поясное время (AST)" key="timezone_offset_-4" js="0">[GMT - 4] Atlantic Standard Time</word>
+  <word key_rus="[GMT - 3:30] Поясное время Ньюфаундленд(NST)" key="timezone_offset_-3.5" js="0">[GMT - 3:30] Newfoundland Standard Time</word>
+  <word key_rus="[GMT - 3] время Бразилиа (BRT)" key="timezone_offset_-3" js="0">[GMT - 3] Brasília time</word>
+  <word key_rus="[GMT - 2] время Fernando de Noronha - Пернамбуку, Бразилия (BRT)" key="timezone_offset_-2" js="0">[GMT - 2] Fernando de Noronha Time</word>
+  <word key_rus="[GMT - 1] Стандартное время восточной Гренландии (EGT)" key="timezone_offset_-1" js="0">[GMT - 1] Eastern Greenland Time</word>
+  <word key_rus="[GMT] Среднее время по Гринвичу (GMT)" key="timezone_offset_0" js="0">[GMT] Greenwich Mean Time</word>
+  <word key_rus="[GMT + 1] Центральноевропейское время (CET)" key="timezone_offset_1" js="0">[GMT + 1] Central European Time</word>
+  <word key_rus="[GMT + 2] Восточноевропейское время (EET)" key="timezone_offset_2" js="0">[GMT + 2] Eastern European Time</word>
+  <word key_rus="[GMT + 3] Время восточной Африки (EAT)" key="timezone_offset_3" js="0">[GMT + 3] Eastern African Time</word>
+  <word key_rus="[GMT + 3:30] Поясное время Ирана (IRST)" key="timezone_offset_3.5" js="0">[GMT + 3:30] Iran Standard Time</word>
+  <word key_rus="[GMT + 4] Стандартное время Персидского залива (GST)" key="timezone_offset_4" js="0">[GMT + 4] Gulf Standard Time</word>
+  <word key_rus="[GMT + 4:30] Время Афганистана (AFT)" key="timezone_offset_4.5" js="0">[GMT + 4:30] Afghanistan Time</word>
+  <word key_rus="[GMT + 5] Поясное время Пакистана (PST)" key="timezone_offset_5" js="0">[GMT + 5] Pakistan Standard Time</word>
+  <word key_rus="[GMT + 5:30] Индийское поясное время (IST)" key="timezone_offset_5.5" js="0">[GMT + 5:30] Indian Standard Time</word>
+  <word key_rus="[GMT + 5:45] Поясное время Непала (NPT)" key="timezone_offset_5.75" js="0">[GMT + 5:45] Nepal Time</word>
+  <word key_rus="[GMT + 6] Время Бангладеш ((BDT))" key="timezone_offset_6" js="0">[GMT + 6] Bangladesh Time</word>
+  <word key_rus="[GMT + 6:30] Время Мьянма (MMT)" key="timezone_offset_6.5" js="0">[GMT + 6:30] Myanmar Time</word>
+  <word key_rus="[GMT + 7] Время Индокитая (ICT)" key="timezone_offset_7" js="0">[GMT + 7] Indochina Time</word>
+  <word key_rus="[GMT + 8] Поясное время Китая (CST)" key="timezone_offset_8" js="0">[GMT + 8] Chinese Standard Time</word>
+  <word key_rus="[GMT + 9] Часовой пояс Японии (JST)" key="timezone_offset_9" js="0">[GMT + 9] Japan Standard Time</word>
+  <word key_rus="[GMT + 9:30] Стандартное время центральной Австралии (ACST)" key="timezone_offset_9.5" js="0">[GMT + 9:30] Australian Central Standard Time</word>
+  <word key_rus="[GMT + 10] Стандартное время восточной Австралии (AEST)" key="timezone_offset_10" js="0">[GMT + 10] Australian Eastern Standard Time</word>
+  <word key_rus="[GMT + 10:30] Стандартное время Лорд-Хау (LHST)" key="timezone_offset_10.5" js="0">[GMT + 10:30] Lord Howe Standard Time</word>
+  <word key_rus="[GMT + 11] Часовой пояс в Соломоновы о-ва (SIT)" key="timezone_offset_11" js="0">[GMT + 11] Solomon Island Time</word>
+  <word key_rus="[GMT + 11:30] время Остров Норфолк (NFT)" key="timezone_offset_11.5" js="0">[GMT + 11:30] Norfolk Island Time</word>
+  <word key_rus="[GMT + 12] время Новой Зеландии (NZST)" key="timezone_offset_12" js="0">[GMT + 12] New Zealand Time</word>
+  <word key_rus="[GMT + 12:45] Время Чатем Айлендс, Новая Зеландия (CHAST)" key="timezone_offset_12.75" js="0">[GMT + 12:45] Chatham Islands Time</word>
+  <word key_rus="[GMT + 13] Время островов Феникс (PIT)" key="timezone_offset_13" js="0">[GMT + 13] Phoenix Islands Time</word>
+  <word key_rus="[GMT + 14] Время острово Лайн (LIT)" key="timezone_offset_14" js="0">[GMT + 14] Line Island Time</word>
+  <word key_rus="Проверка лент iCalendar на новые события и импорты в Календарь." key="task__icalendar" js="0">Checks iCalendar feeds for new events and imports into Calendar.</word>
+  <word key_rus="События" key="digest_area_calendar_calendar" js="0">Events</word>
+  <word key_rus="Событие" key="digest_area_calendar_event" js="0">Event</word>
+  <word key_rus="%s опубликовал событие в %s" key="x_created_event_in" js="0">%s posted an event in %s</word>
+  <word key_rus="%s прокомментировал событие" key="x_commented_event" js="0">%s commented on an event</word>
+  <word key_rus="Событие на" key="digest_event_on" js="0">Event on</word>
+  <word key_rus="{# [*1:пользователь][*2:пользователя][*3:пользователя][*4:пользователя][11:пользователей][12:пользователей][13:пользователей][14:пользователей][?:пользователей]} собираются посетить" key="digest_users_going" js="0">{# [1:user][?:users]} going</word>
+  <word key_rus="{$content-&gt;mapped('title')|raw}" key="mailsub__calendar_notification_new_content" js="0"><![CDATA[{$content->mapped("title")|raw}]]></word>
+  <word key_rus="%s отправил %s, %s, для %s" key="email_new_calevent_plain" js="0">%s has posted %s, %s, for %s</word>
+  <word key_rus="&lt;a href='%s'&gt;%s&lt;/a&gt; отправил %s, &lt;a href='%s'&gt;%s&lt;/a&gt;, для %s" key="email_new_calevent" js="0"><![CDATA[<a href='%s'>%s</a> has posted %s, <a href='%s'>%s</a>, for %s]]></word>
+  <word key_rus="%s (Гость) отправил %s, &lt;a href='%s'&gt;%s&lt;/a&gt;, для %s" key="email_new_calevent_guest" js="0"><![CDATA[%s (Guest) has posted %s, <a href='%s'>%s</a>, for %s]]></word>
+  <word key_rus="События" key="__api_calendar_events" js="0">Events</word>
+  <word key_rus="Комментарии" key="__api_calendar_comments" js="0">Comments</word>
+  <word key_rus="Отзывы" key="__api_calendar_reviews" js="0">Reviews</word>
+  <word key_rus="{# [*1:день][*2:дня][*3:дня][*4:дня][11:дней][12:дней][13:дней][14:дней][?:дней]}" key="x_daily" js="1">{# [1:day][?:days]}</word>
+  <word key_rus="{# [*1:неделя][*2:недели][*3:недели][*4:недели][11:недель][12:недель][13:недель][14:недель][?:недель]}" key="x_weekly" js="1">{# [1:week][?:weeks]}</word>
+  <word key_rus="{# [*1:месяц][*2:месяца][*3:месяца][*4:месяца][11:месяцев][12:месяцев][13:месяцев][14:месяцев][?:месяцев]}" key="x_monthly" js="1">{# [1:month][?:months]}</word>
+  <word key_rus="{# [*1:год][*2:года][*3:года][*4:года][11:лет][12:лет][13:лет][14:лет][?:лет]}" key="x_yearly" js="1">{# [1:year][?:years]}</word>
+  <word key_rus="Каждые {{period}}" key="every_x" js="1">Every {{period}}</word>
+  <word key_rus="{# [*1:раз][*2:раза][*3:раза][*4:раза][11:раз][12:раз][13:раз][14:раз][?:раз]}" key="x_times" js="1">{# [1:time][?:times]}</word>
+  <word key_rus="до {{date}}" key="until" js="1">until {{date}}</word>
+  <word key_rus="Каждые {{interval}}, {{endAfter}}" key="with_end" js="1">{{interval}}, {{endAfter}}</word>
+  <word key_rus="Понедельник" key="MO" js="1">Monday</word>
+  <word key_rus="Вторник" key="TU" js="1">Tuesday</word>
+  <word key_rus="Среда" key="WE" js="1">Wednesday</word>
+  <word key_rus="Четверг" key="TH" js="1">Thursday</word>
+  <word key_rus="Пятница" key="FR" js="1">Friday</word>
+  <word key_rus="Суббота" key="SA" js="1">Saturday</word>
+  <word key_rus="Воскресенье" key="SU" js="1">Sunday</word>
+  <word key_rus="на {{first}}" key="one_day" js="1">on {{first}}</word>
+  <word key_rus="на {{days}} и {{last}}" key="multiple_day" js="1">on {{days}} and {{last}}</word>
+  <word key_rus="{{week}} {{days}}" key="week_string" js="1">{{week}} {{days}}</word>
+  <word key_rus="Не повторять" key="doesnt_repeat" js="1">Doesn't repeat</word>
+  <word key_rus="&lt;strong&gt;{{startDate}}&lt;/strong&gt;, c &lt;strong&gt;{{startTime}}&lt;/strong&gt; до &lt;strong&gt;{{endTime}}&lt;/strong&gt;" key="single_not_allday" js="1"><![CDATA[On <strong>{{startDate}}</strong>, from <strong>{{startTime}}</strong> to <strong>{{endTime}}</strong>]]></word>
+  <word key_rus="&lt;strong&gt;{{startDate}}&lt;/strong&gt; (весь день)" key="single_allday" js="1"><![CDATA[<strong>{{startDate}}</strong> (all day)]]></word>
+  <word key_rus="С &lt;strong&gt;{{startDate}}&lt;/strong&gt; в &lt;strong&gt;{{startTime}}&lt;/strong&gt; до &lt;strong&gt;{{endDate}}&lt;/strong&gt; в &lt;strong&gt;{{endTime}}&lt;/strong&gt;" key="not_single_not_allday" js="1"><![CDATA[From <strong>{{startDate}}</strong> at <strong>{{startTime}}</strong> until <strong>{{endDate}}</strong> at <strong>{{endTime}}</strong>]]></word>
+  <word key_rus="С &lt;strong&gt;{{startDate}}&lt;/strong&gt; до &lt;strong&gt;{{endDate}}&lt;/strong&gt;" key="not_single_allday" js="1"><![CDATA[From <strong>{{startDate}}</strong> to <strong>{{endDate}}</strong>]]></word>
+  <word key_rus="(укажите время)" key="select_time" js="1">(select time)</word>
+ </app>
+</language>

applications/calendar/data/schema.json

@@ -193,10 +193,10 @@
                 "comment": "",
                 "decimals": null,
                 "default": "0",
-                "length": 8,
+                "length": 20,
                 "name": "comment_mid",
-                "type": "MEDIUMINT",
-                "unsigned": false,
+                "type": "BIGINT",
+                "unsigned": true,
                 "values": [],
                 "zerofill": false
             },
@@ -404,10 +404,10 @@
                 "comment": "",
                 "decimals": null,
                 "default": "0",
-                "length": 11,
+                "length": 20,
                 "name": "rsvp_member_id",
-                "type": "INT",
-                "unsigned": false,
+                "type": "BIGINT",
+                "unsigned": true,
                 "values": [],
                 "zerofill": false
             },
@@ -511,9 +511,9 @@
                 "comment": "",
                 "decimals": null,
                 "default": "0",
-                "length": 8,
+                "length": 20,
                 "name": "event_member_id",
-                "type": "MEDIUMINT",
+                "type": "BIGINT",
                 "unsigned": true,
                 "values": [],
                 "zerofill": false
@@ -1047,8 +1047,7 @@
                 ]
             }
         },
-        "collation": "utf8mb4_unicode_ci",
-        "engine": "InnoDB"
+        "collation": "utf8mb4_unicode_ci"
     },
     "calendar_import_feeds": {
         "name": "calendar_import_feeds",
@@ -1144,10 +1143,10 @@
                 "comment": "",
                 "decimals": null,
                 "default": "0",
-                "length": 11,
+                "length": 20,
                 "name": "feed_member_id",
-                "type": "INT",
-                "unsigned": false,
+                "type": "BIGINT",
+                "unsigned": true,
                 "values": [],
                 "zerofill": false
             },
@@ -1357,7 +1356,7 @@
                 "default": "0",
                 "length": 8,
                 "name": "review_mid",
-                "type": "MEDIUMINT",
+                "type": "BIGINT",
                 "unsigned": true,
                 "values": [],
                 "zerofill": false

applications/calendar/data/settings.json

@@ -21,7 +21,7 @@
     },
     {
         "key": "ipb_calendar_mon",
-        "default": "0"
+        "default": "1"
     },
     {
         "key": "show_bday_calendar",

applications/calendar/data/theme.xml

@@ -1,11 +1,59 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <theme name="Default" author_name="Invision Power Services, Inc" author_url="http://www.invisionpower.com">
- <template template_group="browse" template_name="calendarDay" template_data="$calendars, $date, $featured, $birthdays, $events, $tomorrow, $yesterday, $today, $thisCalendar, $jump" template_location="front" template_app="calendar"><![CDATA[
+ <template template_group="browse" template_name="birthday" template_data="$table, $headers, $rows" template_location="front" template_app="calendar"><![CDATA[{{foreach $rows as $row}}
+	<li class='ipsGrid_span6 ipsPhotoPanel ipsPhotoPanel_mini ipsClearfix'>
+		{template="userPhoto" app="core" group="global" params="\IPS\Member::load( $row['member_id'] ), 'mini'"}
+		<div>
+			<h3 class='ipsType_normal ipsType_reset ipsTruncate ipsTruncate_line'>{member="name" id="$row['member_id']"}</h3>
+			<span class='ipsType_light'>
+				{{if $row['bday_year']}}
+				{lang="member_age" pluralize="\IPS\Member::load( $row['member_id'] )->age( \IPS\calendar\Date::getDate( \IPS\Request::i()->y ?: NULL, \IPS\Request::i()->m ?: NULL, \IPS\Request::i()->d ?: NULL ) )"}{{endif}}
+			</span>
+		</div>
+	</li>
+{{endforeach}}]]></template>
+ <template template_group="browse" template_name="birthdaysTable" template_data="$table, $headers, $rows, $quickSearch" template_location="front" template_app="calendar"><![CDATA[<div data-baseurl='{$table->baseUrl}' data-resort='{$table->resortKey}' data-controller='core.global.core.table' {{if $table->getPaginationKey() != 'page'}}data-pageParam='{$table->getPaginationKey()}'{{endif}}>
+
+	{{if $table->pages > 1}}
+		<div class="ipsButtonBar ipsPad_half ipsClearfix ipsClear">
+			<div data-role="tablePagination">
+				{template="pagination" group="global" app="core" location="global" params="$table->baseUrl, $table->pages, $table->page, $table->limit, TRUE, $table->getPaginationKey()"}
+			</div>
+		</div>
+	{{endif}}
+
+
+	{{if count( $rows )}}
+		<ol class='ipsGrid ipsGrid_collapsePhone ipsPad ipsClear {{foreach $table->classes as $class}}{$class} {{endforeach}}' id='elTable_{$table->uniqueId}' data-role="tableRows" itemscope itemtype="http://schema.org/ItemList">
+			{template="$table->rowsTemplate[1]" params="$table, $headers, $rows" object="$table->rowsTemplate[0]"}
+		</ol>
+	{{else}}
+		<div class='ipsType_center ipsPad'>
+			<p class='ipsType_large ipsType_light'>{lang="no_rows_in_table"}</p>
+			{{if method_exists( $table, 'container' ) AND $table->container() !== NULL}}
+				{{if $table->container()->can('add')}}
+					<a href='{$table->container()->url()->setQueryString( 'do', 'add' )}' class='ipsButton ipsButton_primary ipsButton_medium'>
+						{lang="submit_first_row"}
+					</a>
+				{{endif}}
+			{{endif}}
+		</div>
+	{{endif}}
+				
+	{{if $table->pages > 1}}
+		<div class="ipsButtonBar ipsPad_half ipsClearfix ipsClear">
+			<div data-role="tablePagination">
+				{template="pagination" group="global" app="core" location="global" params="$table->baseUrl, $table->pages, $table->page, $table->limit, TRUE, $table->getPaginationKey()"}
+			</div>
+		</div>
+	{{endif}}
+</div>]]></template>
+ <template template_group="browse" template_name="calendarDay" template_data="$calendars, $date, $featured, $birthdays, $birthdayCount, $events, $tomorrow, $yesterday, $today, $thisCalendar, $jump" template_location="front" template_app="calendar"><![CDATA[
 <div class='ipsGrid ipsGrid_collapsePhone ipsPager cCalendarNav ipsSpacer_bottom' data-ipsSticky data-ipsSticky-disableIn='phone'>
 	<div class='ipsGrid_span3 ipsType_left ipsPager_prev'>
-		<a href="{{if $thisCalendar}}{url="app=calendar&module=calendar&controller=view&id={$thisCalendar->_id}&y={$yesterday->year}&m={$yesterday->mon}&d={$yesterday->mday}" seoTemplate="calendar_calday" seoTitle="$thisCalendar->title_seo"}{{else}}{url="app=calendar&module=calendar&controller=view&y={$yesterday->year}&m={$yesterday->mon}&d={$yesterday->mday}" seoTemplate="calendar_day"}{{endif}}" title='{lang="cal_month_day" sprintf="$yesterday->monthName, $yesterday->mday, $yesterday->year"}' rel='prev' data-action='changeView'>
-			<span class='ipsPager_type ipsType_normal'>{lang="prev_day"}</span>
-			<span class='ipsPager_title ipsType_light'>{lang="cal_month_day" sprintf="$yesterday->monthName, $yesterday->mday, $yesterday->year"}</span>
+		<a href="{{if $thisCalendar}}{url="app=calendar&module=calendar&controller=view&id={$thisCalendar->_id}&y={$yesterday->year}&m={$yesterday->mon}&d={$yesterday->mday}" seoTemplate="calendar_calday" seoTitle="$thisCalendar->title_seo"}{{else}}{url="app=calendar&module=calendar&controller=view&y={$yesterday->year}&m={$yesterday->mon}&d={$yesterday->mday}" seoTemplate="calendar_day"}{{endif}}" title='{lang="cal_month_day" sprintf="$yesterday->monthName, $yesterday->mday, $yesterday->year"}' rel='prev nofollow' data-action='changeView'>
+			<span class='ipsPager_type ipsType_normal'>{lang="cal_month_day_noyear" sprintf="$yesterday->monthName, $yesterday->mday"}</span>
+			<span class='ipsPager_title ipsType_light'>{$yesterday->year}</span>
 		</a>
 	</div>
 	<div class='ipsGrid_span6 ipsType_center ipsPad cCalendarNav' data-role='calendarNav'>
@@ -18,9 +66,9 @@
 		</ul>
 	</div>
 	<div class='ipsGrid_span3 ipsType_right ipsPager_next'>
-		<a href="{{if $thisCalendar}}{url="app=calendar&module=calendar&controller=view&id={$thisCalendar->_id}&y={$tomorrow->year}&m={$tomorrow->mon}&d={$tomorrow->mday}" seoTemplate="calendar_calday" seoTitle="$thisCalendar->title_seo"}{{else}}{url="app=calendar&module=calendar&controller=view&y={$tomorrow->year}&m={$tomorrow->mon}&d={$tomorrow->mday}" seoTemplate="calendar_day"}{{endif}}" title='{lang="cal_month_day" sprintf="$tomorrow->monthName, $tomorrow->mday, $tomorrow->year"}' rel='next' data-action='changeView'>
-			<span class='ipsPager_type ipsType_normal'>{lang="next_day"}</span>
-			<span class='ipsPager_title ipsType_light'>{lang="cal_month_day" sprintf="$tomorrow->monthName, $tomorrow->mday, $tomorrow->year"}</span>
+		<a href="{{if $thisCalendar}}{url="app=calendar&module=calendar&controller=view&id={$thisCalendar->_id}&y={$tomorrow->year}&m={$tomorrow->mon}&d={$tomorrow->mday}" seoTemplate="calendar_calday" seoTitle="$thisCalendar->title_seo"}{{else}}{url="app=calendar&module=calendar&controller=view&y={$tomorrow->year}&m={$tomorrow->mon}&d={$tomorrow->mday}" seoTemplate="calendar_day"}{{endif}}" title='{lang="cal_month_day" sprintf="$tomorrow->monthName, $tomorrow->mday, $tomorrow->year"}' rel='next nofollow' data-action='changeView'>
+			<span class='ipsPager_type ipsType_normal'>{lang="cal_month_day_noyear" sprintf="$tomorrow->monthName, $tomorrow->mday"}</span>
+			<span class='ipsPager_title ipsType_light'>{$tomorrow->year}</span>
 		</a>
 	</div>
 </div>
@@ -85,8 +133,8 @@
 {{if count( $birthdays ) }}
 	</div>
 	<div class='ipsColumn ipsColumn_medium'>
-		{{foreach $birthdays AS $birthday}}
-			<h2 class='ipsType_sectionTitle ipsType_reset'>{lang="birthdays_today" pluralize="count( $birthday )"}</h2>
+		{{foreach $birthdays AS $bdayDate => $birthday}}
+			<h2 class='ipsType_sectionTitle ipsType_reset'>{lang="birthdays_today" pluralize="$birthdayCount[ $bdayDate ]"}</h2>
 			<ul class='ipsDataList ipsDataList_reducedSpacing'>
 				{{foreach $birthday AS $member}}
 					<li class='ipsDataItem ipsClearfix'>
@@ -95,11 +143,16 @@
 							<div>
 								{$member->link()|raw}
 								{{if $member->bday_year}}<br>
-								{lang="member_age" sprintf="$member->age( $date )"}{{endif}}
+								{lang="member_age" pluralize="$member->age( $date )"}{{endif}}
 							</div>
 						</div>
 					</li>
 				{{endforeach}}
+				{{if count($birthday) < $birthdayCount[ $bdayDate ]}}
+					<li class='ipsDataItem ipsClearfix ipsAreaBackground_light ipsPad ipsPad_half ipsType_center'>
+						<a data-ipsDialog data-ipsDialog-title='{lang="birthdays_today" pluralize="$birthdayCount[ $bdayDate ]"}' data-ipsDialog-size="narrow" href='{{if $thisCalendar}}{url="app=calendar&module=calendar&controller=view&view=day&id={$thisCalendar->_id}&y={$date->year}&m={$date->mon}&d={$date->mday}&show=birthdays" seoTemplate="calendar_calday" seoTitle="$thisCalendar->title_seo"}{{else}}{url="app=calendar&module=calendar&controller=view&view=day&y={$date->year}&m={$date->mon}&d={$date->mday}&show=birthdays" seoTemplate="calendar_day"}{{endif}}'>{lang="birthdays_view_all"}</a>
+					</li>
+				{{endif}}
 			</ul>
 		{{endforeach}}
 	</div>
@@ -138,9 +191,9 @@
 		{{if ( $thisCalendar AND $thisCalendar->can('add') ) OR ( !$thisCalendar AND \IPS\calendar\Calendar::canOnAny('add') )}}
 			&nbsp;&nbsp;
 			{{if $thisCalendar}}
-				<a href='{url="app=calendar&module=calendar&controller=submit&calendar={$thisCalendar->id}" seoTemplate="calendar_submit"}' class='ipsButton ipsButton_important ipsButton_small ipsResponsive_hidePhone ipsResponsive_inlineBlock'>{lang="create_event"}</a>
+				<a href='{url="app=calendar&module=calendar&controller=submit&do=submit&id={$thisCalendar->id}" seoTemplate="calendar_submit"}' class='ipsButton ipsButton_important ipsButton_small ipsResponsive_hidePhone ipsResponsive_inlineBlock'>{lang="create_event"}</a>
 			{{else}}
-				<a href='{url="app=calendar&module=calendar&controller=submit" seoTemplate="calendar_submit"}' class='ipsButton ipsButton_important ipsButton_small ipsResponsive_hidePhone ipsResponsive_inlineBlock'>{lang="create_event"}</a>
+				<a href='{url="app=calendar&module=calendar&controller=submit" seoTemplate="calendar_submit"}' data-ipsdialog data-ipsdialog-title='{lang="event_container"}' data-ipsdialog-size='narrow' class='ipsButton ipsButton_important ipsButton_small ipsResponsive_hidePhone ipsResponsive_inlineBlock'>{lang="create_event"}</a>
 			{{endif}}
 		{{endif}}
 		<a href='#elCalendarJump' data-ipsMenu data-ipsMenu-menuID='elCalendarJump' data-ipsMenu-closeOnClick='false' class='ipsButton ipsButton_light ipsButton_small ipsResponsive_showDesktop ipsResponsive_inlineBlock'>{lang="jump_to"} <i class='fa fa-caret-down'></i></a>		
@@ -164,9 +217,9 @@
 <hr class='ipsHr'>]]></template>
  <template template_group="browse" template_name="calendarMonth" template_data="$calendars, $date, $featured, $birthdays, $events, $today, $thisCalendar, $jump, $startDates=array()" template_location="front" template_app="calendar"><![CDATA[<div class='ipsGrid ipsGrid_collapsePhone ipsPager cCalendarNav ipsSpacer_bottom' data-ipsSticky data-ipsSticky-disableIn='phone'>
 	<div class='ipsGrid_span3 ipsType_left ipsPager_prev'>
-		<a href="{{if $thisCalendar}}{url="app=calendar&module=calendar&controller=view&view=month&id={$thisCalendar->_id}&y={$date->lastMonth('year')}&m={$date->lastMonth('mon')}" seoTemplate="calendar_calmonth" seoTitle="$thisCalendar->title_seo"}{{else}}{url="app=calendar&module=calendar&controller=view&y={$date->lastMonth('year')}&m={$date->lastMonth('mon')}" seoTemplate="calendar_month"}{{endif}}" title='{lang="cal_month_title" sprintf="$date->lastMonth('monthName'), $date->lastMonth('year')"}' rel='prev' data-action='changeView'>
-			<span class='ipsPager_type ipsType_normal'>{lang="previous_month"}</span>
-			<span class='ipsPager_title ipsType_light'>{lang="cal_month_title" sprintf="$date->lastMonth('monthName'), $date->lastMonth('year')"}</span>
+		<a href="{{if $thisCalendar}}{url="app=calendar&module=calendar&controller=view&view=month&id={$thisCalendar->_id}&y={$date->lastMonth('year')}&m={$date->lastMonth('mon')}" seoTemplate="calendar_calmonth" seoTitle="$thisCalendar->title_seo"}{{else}}{url="app=calendar&module=calendar&controller=view&y={$date->lastMonth('year')}&m={$date->lastMonth('mon')}" seoTemplate="calendar_month"}{{endif}}" title='{lang="cal_month_title" sprintf="$date->lastMonth('monthName'), $date->lastMonth('year')"}' rel='prev nofollow' data-action='changeView'>
+			<span class='ipsPager_type ipsType_normal'>{$date->lastMonth('monthName')}</span>
+			<span class='ipsPager_title ipsType_light'>{$date->lastMonth('year')}</span>
 		</a>
 	</div>
 	<div class='ipsGrid_span6 ipsType_center ipsPad' data-role='calendarNav'>
@@ -179,9 +232,9 @@
 		</ul>
 	</div>
 	<div class='ipsGrid_span3 ipsType_right ipsPager_next'>
-		<a href="{{if $thisCalendar}}{url="app=calendar&module=calendar&controller=view&view=month&id={$thisCalendar->_id}&y={$date->nextMonth('year')}&m={$date->nextMonth('mon')}" seoTemplate="calendar_calmonth" seoTitle="$thisCalendar->title_seo"}{{else}}{url="app=calendar&module=calendar&controller=view&y={$date->nextMonth('year')}&m={$date->nextMonth('mon')}" seoTemplate="calendar_month"}{{endif}}" title='{lang="cal_month_title" sprintf="$date->nextMonth('monthName'), $date->nextMonth('year')"}' rel='next' data-action='changeView'>
-			<span class='ipsPager_type ipsType_normal'>{lang="next_month"}</span>
-			<span class='ipsPager_title ipsType_light'>{lang="cal_month_title" sprintf="$date->nextMonth('monthName'), $date->nextMonth('year')"}</span>
+		<a href="{{if $thisCalendar}}{url="app=calendar&module=calendar&controller=view&view=month&id={$thisCalendar->_id}&y={$date->nextMonth('year')}&m={$date->nextMonth('mon')}" seoTemplate="calendar_calmonth" seoTitle="$thisCalendar->title_seo"}{{else}}{url="app=calendar&module=calendar&controller=view&y={$date->nextMonth('year')}&m={$date->nextMonth('mon')}" seoTemplate="calendar_month"}{{endif}}" title='{lang="cal_month_title" sprintf="$date->nextMonth('monthName'), $date->nextMonth('year')"}' rel='next nofollow' data-action='changeView'>
+			<span class='ipsPager_type ipsType_normal'>{$date->nextMonth('monthName')}</span>
+			<span class='ipsPager_title ipsType_light'>{$date->nextMonth('year')}</span>
 		</a>
 	</div>
 </div>
@@ -205,9 +258,9 @@
 			{{endif}}
 			<td class='cCalendar_date{{if $k == 1}} cCalendar_firstDay{{endif}}{{if $today->mysqlDatetime( FALSE ) == $date->year . '-' . $date->mon . '-' . $k }} cCalendar_today{{endif}}{{if isset( $events[ $date->year . '-' . $date->mon . '-' . $k ] )}} cCalendar_hasEvents{{endif}}'>
 				<div>
-					<a href='{{if $thisCalendar}}{url="app=calendar&module=calendar&controller=view&id={$thisCalendar->_id}&y={$date->year}&m={$date->mon}&d={$k}" seoTemplate="calendar_calday" seoTitle="$thisCalendar->title_seo"}{{else}}{url="app=calendar&module=calendar&controller=view&y={$date->year}&m={$date->mon}&d={$k}" seoTemplate="calendar_day"}{{endif}}' class='ipsType_blendLinks cCalendar_dayNumber'>{$k}</a>
+					<a href='{{if $thisCalendar}}{url="app=calendar&module=calendar&controller=view&id={$thisCalendar->_id}&y={$date->year}&m={$date->mon}&d={$k}&view=day" seoTemplate="calendar_calday" seoTitle="$thisCalendar->title_seo"}{{else}}{url="app=calendar&module=calendar&controller=view&y={$date->year}&m={$date->mon}&d={$k}&view=day" seoTemplate="calendar_day"}{{endif}}' class='ipsType_blendLinks cCalendar_dayNumber'>{$k}</a>
 					{{if ( $thisCalendar AND $thisCalendar->can('add') ) OR ( !$thisCalendar AND \IPS\calendar\Calendar::canOnAny('add') )}}
-						<a href='{{if $thisCalendar}}{url="app=calendar&module=calendar&controller=submit&id={$thisCalendar->_id}&y={$date->year}&m={$date->mon}&d={$k}" seoTemplate="calendar_submit"}{{else}}{url="app=calendar&module=calendar&controller=submit&y={$date->year}&m={$date->mon}&d={$k}" seoTemplate="calendar_submit"}{{endif}}' data-ipsTooltip title='{lang="add_event"}' class='ipsButton ipsButton_verySmall ipsButton_primary cCalendar_miniAddEvent'><i class='ipsType_small fa fa-plus'></i></a>
+						<a href='{{if $thisCalendar}}{url="app=calendar&module=calendar&controller=submit&do=submit&id={$thisCalendar->_id}&y={$date->year}&m={$date->mon}&d={$k}&view=day" seoTemplate="calendar_submit"}{{else}}{url="app=calendar&module=calendar&controller=submit&y={$date->year}&m={$date->mon}&d={$k}&view=day" seoTemplate="calendar_submit"}{{endif}}' data-ipsTooltip title='{lang="add_event"}' class='ipsButton ipsButton_verySmall ipsButton_primary cCalendar_miniAddEvent'><i class='ipsType_small fa fa-plus'></i></a>
 					{{endif}}
 					{{if isset( $events[ $date->year . '-' . $date->mon . '-' . $k ] )}}
 						<ul class='cEvents_wrapper'>
@@ -235,8 +288,8 @@
 							{{endif}}
 						</ul>
 					{{endif}}
-					{{if isset( $birthdays[ $date->mon . $k ] ) AND count( $birthdays[ $date->mon . $k ]) }}
-						<p class='cCalendar_birthdays ipsType_light'><a class='ipsType_blendLinks' href='{{if $thisCalendar}}{url="app=calendar&module=calendar&controller=view&id={$thisCalendar->_id}&y={$date->year}&m={$date->mon}&d={$k}" seoTemplate="calendar_calday" seoTitle="$thisCalendar->title_seo"}{{else}}{url="app=calendar&module=calendar&controller=view&y={$date->year}&m={$date->mon}&d={$k}" seoTemplate="calendar_day"}{{endif}}'>{lang="birthdays_count" pluralize="count($birthdays[ $date->mon . $k ])"}</a></p>
+					{{if isset( $birthdays[ $date->mon . $k ] ) AND $birthdays[ $date->mon . $k ] }}
+						<p class='cCalendar_birthdays ipsType_light'><a class='ipsType_blendLinks' href='{{if $thisCalendar}}{url="app=calendar&module=calendar&controller=view&id={$thisCalendar->_id}&y={$date->year}&m={$date->mon}&d={$k}" seoTemplate="calendar_calday" seoTitle="$thisCalendar->title_seo"}{{else}}{url="app=calendar&module=calendar&controller=view&y={$date->year}&m={$date->mon}&d={$k}" seoTemplate="calendar_day"}{{endif}}'>{lang="birthdays_count" pluralize="$birthdays[ $date->mon . $k ]"}</a></p>
 					{{endif}}
 				</div>
 			</td>
@@ -250,9 +303,9 @@
  <template template_group="browse" template_name="calendarStream" template_data="$calendars, $date, $featured, $events, $thisCalendar, $jump, $pagination" template_location="front" template_app="calendar"><![CDATA[
 <div class='ipsGrid ipsGrid_collapsePhone ipsPager cCalendarNav ipsSpacer_bottom' data-ipsSticky data-ipsSticky-disableIn='phone'>
 	<div class='ipsGrid_span3 ipsType_left ipsPager_prev'>
-		<a href="{{if $thisCalendar}}{url="app=calendar&module=calendar&controller=view&view=stream&id={$thisCalendar->_id}&y={$date->lastMonth('year')}&m={$date->lastMonth('mon')}" seoTemplate="calendar_calstream" seoTitle="$thisCalendar->title_seo"}{{else}}{url="app=calendar&module=calendar&controller=view&view=stream&y={$date->lastMonth('year')}&m={$date->lastMonth('mon')}" seoTemplate="calendar_stream"}{{endif}}" title='{lang="cal_month_stream_title" sprintf="$date->lastMonth('monthName'), $date->lastMonth('year')"}' rel='prev' data-action='changeView'>
-			<span class='ipsPager_type ipsType_normal'>{lang="previous_month"}</span>
-			<span class='ipsPager_title ipsType_light'>{lang="cal_month_title" sprintf="$date->lastMonth('monthName'), $date->lastMonth('year')"}</span>
+		<a href="{{if $thisCalendar}}{url="app=calendar&module=calendar&controller=view&view=stream&id={$thisCalendar->_id}&y={$date->lastMonth('year')}&m={$date->lastMonth('mon')}" seoTemplate="calendar_calstream" seoTitle="$thisCalendar->title_seo"}{{else}}{url="app=calendar&module=calendar&controller=view&view=stream&y={$date->lastMonth('year')}&m={$date->lastMonth('mon')}" seoTemplate="calendar_stream"}{{endif}}" title='{lang="cal_month_stream_title" sprintf="$date->lastMonth('monthName'), $date->lastMonth('year')"}' rel='prev nofollow' data-action='changeView'>
+			<span class='ipsPager_type ipsType_normal'>{$date->lastMonth('monthName')}</span>
+			<span class='ipsPager_title ipsType_light'>{$date->lastMonth('year')}</span>
 		</a>
 	</div>
 	<div class='ipsGrid_span6 ipsType_center ipsPad' data-role='calendarNav'>
@@ -265,9 +318,9 @@
 		</ul>
 	</div>
 	<div class='ipsGrid_span3 ipsType_right ipsPager_next'>
-		<a href="{{if $thisCalendar}}{url="app=calendar&module=calendar&controller=view&view=stream&id={$thisCalendar->_id}&y={$date->nextMonth('year')}&m={$date->nextMonth('mon')}" seoTemplate="calendar_calstream" seoTitle="$thisCalendar->title_seo"}{{else}}{url="app=calendar&module=calendar&controller=view&view=stream&y={$date->nextMonth('year')}&m={$date->nextMonth('mon')}" seoTemplate="calendar_stream"}{{endif}}" title='{lang="cal_month_stream_title" sprintf="$date->nextMonth('monthName'), $date->nextMonth('year')"}' rel='next' data-action='changeView'>
-			<span class='ipsPager_type ipsType_normal'>{lang="next_month"}</span>
-			<span class='ipsPager_title ipsType_light'>{lang="cal_month_title" sprintf="$date->nextMonth('monthName'), $date->nextMonth('year')"}</span>
+		<a href="{{if $thisCalendar}}{url="app=calendar&module=calendar&controller=view&view=stream&id={$thisCalendar->_id}&y={$date->nextMonth('year')}&m={$date->nextMonth('mon')}" seoTemplate="calendar_calstream" seoTitle="$thisCalendar->title_seo"}{{else}}{url="app=calendar&module=calendar&controller=view&view=stream&y={$date->nextMonth('year')}&m={$date->nextMonth('mon')}" seoTemplate="calendar_stream"}{{endif}}" title='{lang="cal_month_stream_title" sprintf="$date->nextMonth('monthName'), $date->nextMonth('year')"}' rel='next nofollow' data-action='changeView'>
+			<span class='ipsPager_type ipsType_normal'>{$date->nextMonth('monthName')}</span>
+			<span class='ipsPager_title ipsType_light'>{$date->nextMonth('year')}</span>
 		</a>
 	</div>
 </div>
@@ -284,7 +337,7 @@
 			<div class='ipsList_reset' data-role='patchworkList'>
 				{{foreach $events as $event}}
 					<div data-role='patchworkItem'>
-						{template="eventBlock" app="calendar" group="view" params="$event, $date, FALSE, array( 240, 185 ), TRUE"}
+						{template="eventBlock" app="calendar" group="view" params="$event, $date, TRUE, array( 240, 185 ), TRUE"}
 					</div>
 				{{endforeach}}
 			</div>
@@ -302,7 +355,7 @@
  <template template_group="browse" template_name="calendarWeek" template_data="$calendars, $date, $featured, $birthdays, $events, $nextWeek, $lastWeek, $days, $today, $thisCalendar, $jump, $startDates=array()" template_location="front" template_app="calendar"><![CDATA[
 <div class='ipsGrid ipsGrid_collapsePhone ipsPager cCalendarNav ipsSpacer_bottom' data-ipsSticky data-ipsSticky-disableIn='phone'>
 	<div class='ipsGrid_span3 ipsType_left ipsPager_prev'>
-		<a href="{{if $thisCalendar}}{url="app=calendar&module=calendar&controller=view&view=week&id={$thisCalendar->_id}&w={$lastWeek->year}-{$lastWeek->mon}-{$lastWeek->mday}" seoTemplate="calendar_calweek" seoTitle="$thisCalendar->title_seo"}{{else}}{url="app=calendar&module=calendar&controller=view&view=week&w={$lastWeek->year}-{$lastWeek->mon}-{$lastWeek->mday}" seoTemplate="calendar_week"}{{endif}}" title='{lang="cal_week_title" sprintf="$lastWeek->firstDayOfWeek('monthNameShort'), $lastWeek->firstDayOfWeek('mday'), $lastWeek->firstDayOfWeek('year'), $lastWeek->lastDayOfWeek('monthNameShort'), $lastWeek->lastDayOfWeek('mday'), $lastWeek->lastDayOfWeek('year')"}' rel='prev' data-action='changeView'>
+		<a href="{{if $thisCalendar}}{url="app=calendar&module=calendar&controller=view&view=week&id={$thisCalendar->_id}&w={$lastWeek->year}-{$lastWeek->mon}-{$lastWeek->mday}" seoTemplate="calendar_calweek" seoTitle="$thisCalendar->title_seo"}{{else}}{url="app=calendar&module=calendar&controller=view&view=week&w={$lastWeek->year}-{$lastWeek->mon}-{$lastWeek->mday}" seoTemplate="calendar_week"}{{endif}}" title='{lang="cal_week_title" sprintf="$lastWeek->firstDayOfWeek('monthNameShort'), $lastWeek->firstDayOfWeek('mday'), $lastWeek->firstDayOfWeek('year'), $lastWeek->lastDayOfWeek('monthNameShort'), $lastWeek->lastDayOfWeek('mday'), $lastWeek->lastDayOfWeek('year')"}' rel='prev nofollow' data-action='changeView'>
 			<span class='ipsPager_type ipsType_normal'>{lang="previous_week"}</span>
 			<span class='ipsPager_title ipsType_light'>
 				<span class='ipsResponsive_inline ipsResponsive_hidePhone'>
@@ -320,15 +373,15 @@
 			<li><a href='{{if $thisCalendar}}{url="app=calendar&module=calendar&controller=view&view=month&id={$thisCalendar->_id}&y={$date->year}&m={$date->mon}" seoTemplate="calendar_calmonth" seoTitle="$thisCalendar->title_seo"}{{else}}{url="app=calendar&module=calendar&controller=view&view=month&y={$date->year}&m={$date->mon}" seoTemplate="calendar_month"}{{endif}}' title='{lang="cal_month_title" sprintf="$date->monthName, $date->year"}' class='ipsButton ipsButton_light ipsButton_verySmall' data-action='changeView'>{lang="month"}</a></li>
 			<li><a href='#' class='ipsButton ipsButton_primary ipsButton_verySmall' title='{lang="cal_week_title" sprintf="$date->firstDayOfWeek('monthNameShort'), $date->firstDayOfWeek('mday'), $date->firstDayOfWeek('year'), $date->lastDayOfWeek('monthNameShort'), $date->lastDayOfWeek('mday'), $date->lastDayOfWeek('year')"}' data-action='changeView'>{lang="week"}</a></li>
 			{{if in_array( $today, $days )}}
-				<li><a href='{{if $thisCalendar}}{url="app=calendar&module=calendar&controller=view&view=day&id={$thisCalendar->_id}&y={$date->year}&m={$date->mon}&d={$today->mday}" seoTemplate="calendar_calday" seoTitle="$thisCalendar->title_seo"}{{else}}{url="app=calendar&module=calendar&controller=view&view=day&y={$date->year}&m={$date->mon}&d={$today->mday}" seoTemplate="calendar_day"}{{endif}}' title='{lang="cal_month_day" sprintf="$date->monthName, $today->mday, $date->year"}' class='ipsButton ipsButton_light ipsButton_verySmall' data-action='changeView'>{lang="day"}</a></li>
+				<li><a href='{{if $thisCalendar}}{url="app=calendar&module=calendar&controller=view&view=day&id={$thisCalendar->_id}&y={$date->year}&m={$date->mon}&d={$today->mday}&view=day" seoTemplate="calendar_calday" seoTitle="$thisCalendar->title_seo"}{{else}}{url="app=calendar&module=calendar&controller=view&view=day&y={$date->year}&m={$date->mon}&d={$today->mday}&view=day" seoTemplate="calendar_day"}{{endif}}' title='{lang="cal_month_day" sprintf="$date->monthName, $today->mday, $date->year"}' class='ipsButton ipsButton_light ipsButton_verySmall' data-action='changeView'>{lang="day"}</a></li>
 			{{else}}
-				<li><a href='{{if $thisCalendar}}{url="app=calendar&module=calendar&controller=view&view=day&id={$thisCalendar->_id}&y={$date->year}&m={$date->mon}&d=1" seoTemplate="calendar_calday" seoTitle="$thisCalendar->title_seo"}{{else}}{url="app=calendar&module=calendar&controller=view&view=day&y={$date->year}&m={$date->mon}&d=1" seoTemplate="calendar_day"}{{endif}}' title='{lang="cal_month_day" sprintf="$date->monthName, $date->mday, $date->year"}' class='ipsButton ipsButton_light ipsButton_verySmall' data-action='changeView'>{lang="day"}</a></li>
+				<li><a href='{{if $thisCalendar}}{url="app=calendar&module=calendar&controller=view&view=day&id={$thisCalendar->_id}&y={$date->year}&m={$date->mon}&d=1&view=day" seoTemplate="calendar_calday" seoTitle="$thisCalendar->title_seo"}{{else}}{url="app=calendar&module=calendar&controller=view&view=day&y={$date->year}&m={$date->mon}&d=1&view=day" seoTemplate="calendar_day"}{{endif}}' title='{lang="cal_month_day" sprintf="$date->monthName, $date->mday, $date->year"}' class='ipsButton ipsButton_light ipsButton_verySmall' data-action='changeView'>{lang="day"}</a></li>
 			{{endif}}
 			<li><a href='{{if $thisCalendar}}{url="app=calendar&module=calendar&controller=view&view=stream&id={$thisCalendar->_id}&y={$date->year}&m={$date->mon}" seoTemplate="calendar_calstream" seoTitle="$thisCalendar->title_seo"}{{else}}{url="app=calendar&module=calendar&controller=view&view=stream&y={$date->year}&m={$date->mon}" seoTemplate="calendar_stream"}{{endif}}' title='{lang="cal_month_stream_title" sprintf="$date->monthName, $date->year"}' class='ipsButton ipsButton_light ipsButton_verySmall' data-action='changeView'><span class='ipsResponsive_hidePhone ipsResponsive_inline'>{lang="event_stream"}</span><span class='ipsResponsive_showPhone ipsResponsive_inline'>{lang="event_stream_short"}</span></a></li>
 		</ul>
 	</div>
 	<div class='ipsGrid_span3 ipsType_right ipsPager_next'>
-		<a href="{{if $thisCalendar}}{url="app=calendar&module=calendar&controller=view&view=week&id={$thisCalendar->_id}&w={$nextWeek->year}-{$nextWeek->mon}-{$nextWeek->mday}" seoTemplate="calendar_calweek" seoTitle="$thisCalendar->title_seo"}{{else}}{url="app=calendar&module=calendar&controller=view&view=week&w={$nextWeek->year}-{$nextWeek->mon}-{$nextWeek->mday}" seoTemplate="calendar_week"}{{endif}}" title='{lang="cal_week_title" sprintf="$nextWeek->firstDayOfWeek('monthNameShort'), $nextWeek->firstDayOfWeek('mday'), $nextWeek->firstDayOfWeek('year'), $nextWeek->lastDayOfWeek('monthNameShort'), $nextWeek->lastDayOfWeek('mday'), $nextWeek->lastDayOfWeek('year')"}' rel='next' data-action='changeView'>
+		<a href="{{if $thisCalendar}}{url="app=calendar&module=calendar&controller=view&view=week&id={$thisCalendar->_id}&w={$nextWeek->year}-{$nextWeek->mon}-{$nextWeek->mday}" seoTemplate="calendar_calweek" seoTitle="$thisCalendar->title_seo"}{{else}}{url="app=calendar&module=calendar&controller=view&view=week&w={$nextWeek->year}-{$nextWeek->mon}-{$nextWeek->mday}" seoTemplate="calendar_week"}{{endif}}" title='{lang="cal_week_title" sprintf="$nextWeek->firstDayOfWeek('monthNameShort'), $nextWeek->firstDayOfWeek('mday'), $nextWeek->firstDayOfWeek('year'), $nextWeek->lastDayOfWeek('monthNameShort'), $nextWeek->lastDayOfWeek('mday'), $nextWeek->lastDayOfWeek('year')"}' rel='next nofollow' data-action='changeView'>
 			<span class='ipsPager_type ipsType_normal'>{lang="next_week"}</span>
 			<span class='ipsPager_title ipsType_light'>
 				<span class='ipsResponsive_inline ipsResponsive_hidePhone'>
@@ -348,7 +401,7 @@
 		<li class='ipsColumns ipsColumns_collapsePhone ipsBox'>
 			<div class='ipsColumn ipsColumn_wide ipsAreaBackground_light cCalendarWeek_day {{if $today->year == $day->year AND $today->mon == $day->mon AND $today->mday == $day->mday}} cCalendar_today{{endif}}'>
 				<div class='ipsPad'>
-					<h2 class='ipsType_sectionHead'><strong><a class='ipsType_blendLinks' href='{{if $thisCalendar}}{url="app=calendar&module=calendar&controller=view&id={$thisCalendar->_id}&y={$day->year}&m={$day->mon}&d={$day->mday}" seoTemplate="calendar_calday" seoTitle="$thisCalendar->title_seo"}{{else}}{url="app=calendar&module=calendar&controller=view&y={$day->year}&m={$day->mon}&d={$day->mday}" seoTemplate="calendar_day"}{{endif}}'>{$day->dayName}</a></strong></h2>
+					<h2 class='ipsType_sectionHead'><strong><a class='ipsType_blendLinks' href='{{if $thisCalendar}}{url="app=calendar&module=calendar&controller=view&id={$thisCalendar->_id}&y={$day->year}&m={$day->mon}&d={$day->mday}&view=day" seoTemplate="calendar_calday" seoTitle="$thisCalendar->title_seo"}{{else}}{url="app=calendar&module=calendar&controller=view&y={$day->year}&m={$day->mon}&d={$day->mday}&view=day" seoTemplate="calendar_day"}{{endif}}'>{$day->dayName}</a></strong></h2>
 					<p class='ipsType_reset ipsType_light ipsType_uppercase'>{lang="cal_month_day" sprintf="$day->monthName, $day->mday, $day->year"}</p>
 				</div>
 			</div>
@@ -382,8 +435,8 @@
 					{{else}}
 						<span class='ipsType_light ipsType_medium'>{lang="no_events_today"}</span>
 					{{endif}}
-					{{if isset( $birthdays[ $day->mon . $day->mday ] ) AND count( $birthdays[ $day->mon . $day->mday ] ) }}
-						<p class='cCalendar_birthdays ipsType_light'><a class='ipsType_blendLinks' href='{{if $thisCalendar}}{url="app=calendar&module=calendar&controller=view&id={$thisCalendar->_id}&y={$day->year}&m={$day->mon}&d={$day->mday}" seoTemplate="calendar_calday" seoTitle="$thisCalendar->title_seo"}{{else}}{url="app=calendar&module=calendar&controller=view&y={$day->year}&m={$day->mon}&d={$day->mday}" seoTemplate="calendar_day"}{{endif}}'>{lang="birthdays_today" pluralize="count($birthdays[ $day->mon . $day->mday ])"}</a></p>
+					{{if isset( $birthdays[ $day->mon . $day->mday ] ) AND $birthdays[ $day->mon . $day->mday ] }}
+						<p class='cCalendar_birthdays ipsType_light'><a class='ipsType_blendLinks' href='{{if $thisCalendar}}{url="app=calendar&module=calendar&controller=view&id={$thisCalendar->_id}&y={$day->year}&m={$day->mon}&d={$day->mday}&view=day" seoTemplate="calendar_calday" seoTitle="$thisCalendar->title_seo"}{{else}}{url="app=calendar&module=calendar&controller=view&y={$day->year}&m={$day->mon}&d={$day->mday}&view=day" seoTemplate="calendar_day"}{{endif}}'>{lang="birthdays_today" pluralize="$birthdays[ $day->mon . $day->mday ]"}</a></p>
 					{{endif}}
 				</div>
 			</div>
@@ -400,7 +453,11 @@
 
 <ul class="ipsToolList ipsToolList_horizontal ipsResponsive_showPhone ipsResponsive_block ipsClearfix ipsSpacer_top">
 	{{if ( $thisCalendar AND $thisCalendar->can('add') ) OR ( !$thisCalendar AND \IPS\calendar\Calendar::canOnAny('add') )}}
-		<li><a href='{url="app=calendar&module=calendar&controller=submit" seoTemplate="calendar_submit"}' class='ipsButton ipsButton_important ipsButton_normal ipsButton_fullWidth'>{lang="create_event"}</a></li>
+		{{if $thisCalendar}}
+			<li><a href='{url="app=calendar&module=calendar&controller=submit&calendar={$thisCalendar->id}" seoTemplate="calendar_submit"}' class='ipsButton ipsButton_important ipsButton_normal ipsButton_fullWidth'>{lang="create_event"}</a></li>
+		{{else}}
+			<li><a href='{url="app=calendar&module=calendar&controller=submit" seoTemplate="calendar_submit"}' class='ipsButton ipsButton_important ipsButton_normal ipsButton_fullWidth'>{lang="create_event"}</a></li>
+		{{endif}}
 		<li><a href='#elCalendarJump' data-ipsMenu data-ipsMenu-menuID='elCalendarJump' data-ipsMenu-closeOnClick='false' class='ipsButton ipsButton_light ipsButton_fullWidth ipsButton_normal'>{lang="jump_to"} <i class='fa fa-caret-down'></i></a></li>
 	{{endif}}
 </ul>
@@ -486,11 +543,11 @@
 			{{endif}}
 			{{if $event->container()->allow_reviews}}
 				<li>
-					<span itemprop="aggregateRating" itemscope itemtype="http://schema.org/AggregateRating">
+					<div itemprop="aggregateRating" itemscope itemtype="http://schema.org/AggregateRating">
 						<meta itemprop='ratingValue' content='{$event->averageReviewRating()}'>
 						<meta itemprop='reviewCount' content='{$event->reviews}'>
-						{template="rating" group="global" location="front" app="core" params="'small', $event->averageReviewRating(), \IPS\Settings::i()->reviews_rating_out_of"}
-					</span>
+						{template="rating" group="global" location="front" app="core" params="'small', $event->averageReviewRating(), \IPS\Settings::i()->reviews_rating_out_of, $event->memberReviewRating()"}
+					</div>
 				</li>
 			{{endif}}
 			{{if $event->container()->allow_comments}}
@@ -505,7 +562,7 @@
 	{{foreach $rows as $row}}
 	{{$idField = $row::$databaseColumnId;}}
 		<li class="ipsDataItem ipsDataItem_responsivePhoto {{if $row->unread()}}ipsDataItem_unread{{endif}} {{if method_exists( $row, 'tableClass' ) && $row->tableClass()}}ipsDataItem_{$row->tableClass()}{{endif}} {{if $row->hidden()}}ipsModerated{{endif}}" data-controller='core.front.system.manageFollowed' data-followID='{$row->_followData['follow_area']}-{$row->_followData['follow_rel_id']}'>
-			<div class='ipsDataItem_generic ipsDataItem_size2'>
+			<div class='ipsDataItem_generic ipsDataItem_size2 ipsDataItem_imageColumn'>
 				{{if $row->nextOccurrence( \IPS\calendar\Date::getDate(), 'startDate' )}}
 					<time datetime='{$row->nextOccurrence( \IPS\calendar\Date::getDate(), 'startDate' )->mysqlDatetime()}' class='ipsCalendarDate ipsCalendarDate_large'>
 						<span class='ipsCalendarDate_month'>{$row->nextOccurrence( \IPS\calendar\Date::getDate(), 'startDate' )->monthNameShort}</span>
@@ -519,7 +576,7 @@
 				{{endif}}
 			</div>
 			<div class='ipsDataItem_main ipsPos_middle'>
-				<h4 class='ipsDataItem_title ipsType_break ipsType_normal'>
+				<h4 class='ipsDataItem_title ipsContained_container'>
 					{{if $row->mapped('locked')}}
 						<i class="fa fa-lock"></i>
 					{{endif}}
@@ -541,12 +598,14 @@
 					{{endif}}
 
 					{{if $row->prefix()}}
-						{template="prefix" group="global" app="core" params="$row->prefix( TRUE ), $row->prefix()"}
+						<span>{template="prefix" group="global" app="core" params="$row->prefix( TRUE ), $row->prefix()"}</span>
 					{{endif}}
 					
-					<a href='{$row->url()}'>
-						{{if $row->mapped('title')}}{wordbreak="$row->mapped('title')"}{{else}}<em class="ipsType_light">{lang="content_deleted"}</em>{{endif}}
-					</a>
+					<div class='ipsType_break ipsContained'>
+						<a href='{$row->url()}'>
+							{{if $row->mapped('title')}}{$row->mapped('title')}{{else}}<em class="ipsType_light">{lang="content_deleted"}</em>{{endif}}
+						</a>
+					</div>
 				</h4>
 				<div class='ipsDataItem_meta ipsType_light ipsType_blendLinks' data-ipsTruncate data-ipsTruncate-size='2 lines' data-ipsTruncate-type='remove'>
 					{{if method_exists( $row, 'tableDescription' )}}
@@ -558,11 +617,11 @@
 				</div>				
 			</div>
 
-			<div class='ipsDataItem_generic ipsDataItem_size1 ipsType_center ipsType_large'>
+			<div class='ipsDataItem_generic ipsDataItem_size1 ipsType_center ipsType_large cFollowedContent_anon'>
 				<span class='ipsBadge ipsBadge_icon ipsBadge_new {{if !$row->_followData['follow_is_anon']}}ipsHide{{endif}}' data-role='followAnonymous' data-ipsTooltip title='{lang="follow_is_anon"}'><i class='fa fa-eye-slash'></i></span>
 			</div>
 
-			<div class='ipsDataItem_generic ipsDataItem_size6'>
+			<div class='ipsDataItem_generic ipsDataItem_size6 cFollowedContent_info'>
 				<ul class='ipsList_reset'>
 					<li title='{lang="follow_when"}' data-role='followDate'><i class='fa fa-clock-o'></i> {datetime="$row->_followData['follow_added']"}</li>
 					<li title='{lang="follow_how"}' data-role='followFrequency'>
@@ -575,7 +634,7 @@
 				</ul>
 			</div>
 
-			<div class='ipsDataItem_generic ipsDataItem_size6 ipsType_center'>
+			<div class='ipsDataItem_generic ipsDataItem_size6 ipsType_center cFollowedContent_manage'>
 				{template="manageFollow" group="system" app="core" params="$row->_followData['follow_app'], $row->_followData['follow_area'], $row->_followData['follow_rel_id']"}
 			</div>
 
@@ -632,9 +691,11 @@
 						{template="prefix" group="global" app="core" params="$row->prefix( TRUE ), $row->prefix()"}
 					{{endif}}
 					
-					<a href='{$row->url()}' class='ipsType_break' {{if $row->tableHoverUrl}}data-ipsHover{{endif}}>
-						{{if $row->mapped('title')}}{wordbreak="$row->mapped('title')"}{{else}}<em class="ipsType_light">{lang="content_deleted"}</em>{{endif}}
-					</a>
+					<div class='ipsType_break ipsContained'>
+						<a href='{$row->url()}' class='ipsTruncate ipsTruncate_line' {{if $row->tableHoverUrl}}data-ipsHover{{endif}}>
+							{{if $row->mapped('title')}}{$row->mapped('title')}{{else}}<em class="ipsType_light">{lang="content_deleted"}</em>{{endif}}
+						</a>
+					</div>
 				</h4>
 				<div class='ipsDataItem_meta ipsType_light ipsType_blendLinks'>
 					{$row->eventBlurb()|raw}
@@ -656,7 +717,7 @@
 								{{endif}}
 							{{endforeach}}
 							{{if count( $attendees[1] ) > 5}}
-								<li class='ipsType_light'>{lang="and_x_more" sprintf="count( $attendees[1] ) - 5"}</li>
+								<li class='ipsType_light'>{lang="and_x_more" pluralize="count( $attendees[1] ) - 5"}</li>
 							{{endif}}
 						</ul>
 					{{endif}}
@@ -664,30 +725,14 @@
 				{{if count( $row->tags() )}}
 					<ul class='ipsTags ipsList_inline'>
 						{{foreach $row->tags() as $tag}}
-							<li><a href="{url="app=core&module=search&controller=search&do=tags&tag={$tag}" seoTemplate="tags"}">{$tag}</a></li>
+							<li><a href="{url="app=core&module=search&controller=search&tags={$tag}" seoTemplate="tags"}">{$tag}</a></li>
 						{{endforeach}}
 					</ul>
 				{{endif}}
 			</div>
 			<div class='ipsDataItem_generic ipsDataItem_size8'>
 				{{if $row->container()->allow_reviews}}
-					<ul class='ipsList_inline ipsClearfix ipsRating ipsRating_large'>
-						{{foreach range( 1, 5 ) as $i}}
-							<li class='{{if $row->rating >= $i}}ipsRating_on{{else}}ipsRating_off{{endif}}'>
-								<i class='fa fa-star'></i>
-							</li>
-						{{endforeach}}
-					</ul>
-					&nbsp;&nbsp;
-					<span class='ipsType_normal'>
-						{{if $row->reviews}}
-							<a href='{$row->url()->setQueryString( 'tab', 'reviews' )->setFragment('replies')}'>
-						{{endif}}
-						{lang="num_reviews" pluralize="$row->reviews"}
-						{{if $row->reviews}}
-							</a>
-						{{endif}}
-					</span>
+					{template="rating" group="global" location="front" app="core" params="'large', $row->averageReviewRating(), \IPS\Settings::i()->reviews_rating_out_of, $row->memberReviewRating()"}&nbsp;&nbsp; <span class='ipsType_normal ipsType_light'>({lang="num_reviews" pluralize="$row->reviews"})</span>
 				{{endif}}
 				{{if $row->container()->allow_comments}}
 					<p class='ipsType_normal'>
@@ -745,7 +790,7 @@
 					{template="rating" app="core" params="'medium', $reviewRating" group="global"}
 				{{endif}}
 				{{if trim( $indexData['index_content'] ) !== ''}}
-					<div class='ipsType_richText ipsType_break ipsType_medium ipsSpacer_top ipsSpacer_half' {{if !( \IPS\Dispatcher::i()->application->directory == 'core' and \IPS\Dispatcher::i()->module and \IPS\Dispatcher::i()->module->key == 'search' )}}data-ipsTruncate data-ipsTruncate-type='remove' data-ipsTruncate-size='3 lines'{{else}}data-searchable data-findTerm{{endif}}>
+					<div class='ipsType_richText ipsType_break ipsType_medium ipsSpacer_top ipsSpacer_half' {{if !( \IPS\Dispatcher::i()->application->directory == 'core' and \IPS\Dispatcher::i()->module and \IPS\Dispatcher::i()->module->key == 'search' )}}data-ipsTruncate data-ipsTruncate-type='remove' data-ipsTruncate-size='3 lines' data-ipsTruncate-watch='false'{{else}}data-searchable data-findTerm{{endif}}>
 						{$indexData['index_content']|raw}
 					</div>
 				{{endif}}
@@ -780,7 +825,7 @@
 			</strong>
 
 			{{if trim( $indexData['index_content'] ) !== ''}}
-				<div class='ipsSpacer_top ipsSpacer_half ipsType_richText ipsType_break ipsType_medium' {{if !( \IPS\Dispatcher::i()->application->directory == 'core' and \IPS\Dispatcher::i()->module and \IPS\Dispatcher::i()->module->key == 'search' )}}data-ipsTruncate data-ipsTruncate-type='remove' data-ipsTruncate-size='2 lines'{{else}}data-searchable data-findTerm{{endif}}>
+				<div class='ipsSpacer_top ipsSpacer_half ipsType_richText ipsType_break ipsType_medium' {{if !( \IPS\Dispatcher::i()->application->directory == 'core' and \IPS\Dispatcher::i()->module and \IPS\Dispatcher::i()->module->key == 'search' )}}data-ipsTruncate data-ipsTruncate-type='remove' data-ipsTruncate-size='2 lines' data-ipsTruncate-watch='false'{{else}}data-searchable data-findTerm{{endif}}>
 					{$indexData['index_content']|raw}
 				</div>
 			{{endif}}
@@ -810,9 +855,9 @@
 						{{endif}}
 						{{if $item->author()->member_id != \IPS\Member::loggedIn()->member_id}}
 							{{if $item->author()->members_bitoptions['bw_is_spammer']}}
-								<li class='ipsMenu_item' data-ipsMenuValue='spamFlagButton'><a href='{url="app=core&module=system&controller=moderation&id={$item->author()->member_id}&s=0" seoTemplate="flag_as_spammer" seoTitle="$item->author()->members_seo_name" csrf="true"}' data-confirm data-confirmSubMessage="{lang="spam_unflag_confirm"}">{lang="spam_unflag"}</a></li>
+								<li class='ipsMenu_item' data-ipsMenuValue='spamFlagButton'><a href='{url="app=core&module=system&controller=moderation&do=flagAsSpammer&id={$item->author()->member_id}&s=0" seoTemplate="flag_as_spammer" seoTitle="$item->author()->members_seo_name" csrf="true"}' data-confirm data-confirmSubMessage="{lang="spam_unflag_confirm"}">{lang="spam_unflag"}</a></li>
 							{{else}}
-								<li class='ipsMenu_item' data-ipsMenuValue='spamFlagButton'><a href='{url="app=core&module=system&controller=moderation&id={$item->author()->member_id}&s=1" seoTemplate="flag_as_spammer" seoTitle="$item->author()->members_seo_name" csrf="true"}' data-confirm>{lang="spam_flag"}</a></li>
+								<li class='ipsMenu_item' data-ipsMenuValue='spamFlagButton'><a href='{url="app=core&module=system&controller=moderation&do=flagAsSpammer&id={$item->author()->member_id}&s=1" seoTemplate="flag_as_spammer" seoTitle="$item->author()->members_seo_name" csrf="true"}' data-confirm>{lang="spam_flag"}</a></li>
 							{{endif}}
 						{{endif}}
 						<li class="ipsMenu_item"><a href='{url="app=core&module=messaging&controller=messenger&do=compose&to={$item->author()->member_id}" seoTemplate="messenger_compose"}' data-ipsDialog data-ipsDialog-title='{lang="compose_new"}' data-ipsDialog-remoteSubmit data-ipsDialog-flashMessage="{lang="message_sent"}">{lang="message_send"}</a></li>
@@ -853,6 +898,10 @@
 			</div>
 		</div>
 	</article>
+</div>
+]]></template>
+ <template template_group="submit" template_name="calendarSelector" template_data="$form" template_location="front" template_app="calendar"><![CDATA[<div class='ipsPad'>
+    {$form|raw}
 </div>]]></template>
  <template template_group="submit" template_name="datesForm" template_data="$name, $value, $timeZones, $error=''" template_location="front" template_app="calendar"><![CDATA[
 <div data-controller='calendar.front.submit.dates' id='eventDateSelection' class='ipsAreaBackground_light ipsPad'>
@@ -865,19 +914,25 @@
 			<div class='ipsPad'>
 				<div class='cCalendarSubmit_field'>
 					<i class='fa fa-calendar'></i>
-					<input type="date" data-summaryControl name="event_dates[start_date]" value="{{if $value['start_date'] instanceof \IPS\DateTime}}{$value['start_date']->format('Y-m-d')}{{else}}{$value['start_date']}{{endif}}" data-preferredFormat="{{if $value['start_date'] instanceof \IPS\DateTime}}{$value['start_date']->fullYearLocaleDate()}{{else}}{$value['start_date']}{{endif}}" required aria-required='true' class="ipsField_short" data-control="date" placeholder='{expression="mb_strtoupper( str_replace( 'y', 'yy', \IPS\Member::loggedIn()->language()->preferredDateFormat() ) )"}'>
+					<input type="date" data-summaryControl name="event_dates[start_date]" value="{{if $value['start_date'] instanceof \IPS\DateTime}}{$value['start_date']->format('Y-m-d')}{{else}}{$value['start_date']}{{endif}}" data-preferredFormat="{{if $value['start_date'] instanceof \IPS\DateTime}}{$value['start_date']->fullYearLocaleDate()}{{else}}{$value['start_date']}{{endif}}" required aria-required='true' class="ipsField_short" data-control="date" placeholder='{expression="str_replace( array( 'YYYY', 'MM', 'DD' ), array( \IPS\Member::loggedIn()->language()->addToStack('_date_format_yyyy'), \IPS\Member::loggedIn()->language()->addToStack('_date_format_mm'), \IPS\Member::loggedIn()->language()->addToStack('_date_format_dd') ), str_replace( 'Y', 'YY', \IPS\Member::loggedIn()->language()->preferredDateFormat() ) )"}'>
 				</div>
 				<div class='cCalendarSubmit_field' id='start_time_wrap'>
 					<i class='fa fa-clock-o'></i>
-					<input name="event_dates[start_time]" id="start_time" type="time" size='12' class="ipsField_short" placeholder="HH:MM" step='60' min='00:00' value="{$value['start_time']}">
+					<input name="event_dates[start_time]" id="start_time" type="time" size='12' class="ipsField_short" placeholder="{lang="_time_format_hhmm"}" step='60' min='00:00' value="{$value['start_time']}">
 				</div>
 				<br><br>
 				<ul class='ipsList_inline'>
 					<li>
-						<input type="checkbox" role="checkbox" name="event_dates[single_day]" {{if isset($value['single_day']) AND $value['single_day']}}checked aria-checked='true'{{endif}} value="1" id="check_single_day"> <label for='check_single_day'>{lang="event_single_day"}</label>
+						<span class='ipsCustomInput'>
+							<input type="checkbox" role="checkbox" name="event_dates[single_day]" {{if isset($value['single_day']) AND $value['single_day']}}checked aria-checked='true'{{endif}} value="1" id="check_single_day">
+							<span></span>
+						</span> <label for='check_single_day'>{lang="event_single_day"}</label>
 					</li>
 					<li>
-						<input type="checkbox" role="checkbox" name="event_dates[all_day]" {{if isset($value['all_day']) AND $value['all_day']}}checked aria-checked='true'{{endif}} value="1" id="check_all_day"> <label for='check_all_day'>{lang="event_all_day"}</label>
+						<span class='ipsCustomInput'>
+							<input type="checkbox" role="checkbox" name="event_dates[all_day]" {{if isset($value['all_day']) AND $value['all_day']}}checked aria-checked='true'{{endif}} value="1" id="check_all_day"> 
+							<span></span>
+						</span> <label for='check_all_day'>{lang="event_all_day"}</label>
 					</li>
 				</ul>
 			</div>
@@ -890,11 +945,11 @@
 			<div class='ipsPad'>
 				<div class='cCalendarSubmit_field' id='event_end_date_wrap'>
 					<i class='fa fa-calendar'></i>
-					<input type="date" name="event_dates[end_date]" value="{{if $value['end_date'] instanceof \IPS\DateTime}}{$value['end_date']->format('Y-m-d')}{{else}}{$value['end_date']}{{endif}}" data-preferredFormat="{{if $value['end_date'] instanceof \IPS\DateTime}}{$value['end_date']->fullYearLocaleDate()}{{else}}{{if $value['start_date'] instanceof \IPS\DateTime}}{$value['start_date']->fullYearLocaleDate()}{{else}}{$value['end_date']}{{endif}}{{endif}}" class="ipsField_short" data-control="date" id="event_end_date" placeholder='{expression="mb_strtoupper( str_replace( 'y', 'yy', \IPS\Member::loggedIn()->language()->preferredDateFormat() ) )"}'>
+					<input type="date" name="event_dates[end_date]" value="{{if $value['end_date'] instanceof \IPS\DateTime}}{$value['end_date']->format('Y-m-d')}{{else}}{$value['end_date']}{{endif}}" data-preferredFormat="{{if $value['end_date'] instanceof \IPS\DateTime}}{$value['end_date']->fullYearLocaleDate()}{{else}}{{if $value['start_date'] instanceof \IPS\DateTime}}{$value['start_date']->fullYearLocaleDate()}{{else}}{$value['end_date']}{{endif}}{{endif}}" class="ipsField_short" data-control="date" id="event_end_date" placeholder='{expression="mb_strtoupper( str_replace( 'Y', 'YY', \IPS\Member::loggedIn()->language()->preferredDateFormat() ) )"}'>
 				</div>
 				<div class='cCalendarSubmit_field' id='end_time_wrap'>
 					<i class='fa fa-clock-o'></i>
-					<input name="event_dates[end_time]" id="end_time" type="time" size='12' class="ipsField_short" placeholder="HH:MM" step='60' min='00:00' value="{$value['end_time']}">
+					<input name="event_dates[end_time]" id="end_time" type="time" size='12' class="ipsField_short" placeholder="{lang="_time_format_hhmm"}" step='60' min='00:00' value="{$value['end_time']}">
 				</div>
 			</div>
 		</div>
@@ -907,7 +962,10 @@
 			<span data-role='dateSummary'></span>
 		</p>
 		<p class='ipsType_normal' id='elRepeatRow_hidden'>
-			<input type='checkbox' role='checkbox' name='event_dates[event_repeat]' value='1' id="elRepeatCb" {{if isset($value['event_repeat']) AND $value['event_repeat']}}checked aria-checked='true'{{endif}}> <label for='elRepeatCb'>{lang="submit_event_repeats_check"}</label>
+			<span class='ipsCustomInput'>
+				<input type='checkbox' role='checkbox' name='event_dates[event_repeat]' value='1' id="elRepeatCb" {{if isset($value['event_repeat']) AND $value['event_repeat']}}checked aria-checked='true'{{endif}}>
+				<span></span>
+			</span> <label for='elRepeatCb'>{lang="submit_event_repeats_check"}</label>
 		</p>
 		<div id='elRepeatRow_shown' class='ipsJS_hide'>
 			<br>
@@ -959,7 +1017,10 @@
 				<ul class='ipsFieldRow_content ipsList_reset'>
 					{{foreach \IPS\calendar\Date::getDayNames() as $day }}
 						<li class='ipsFieldRow_inlineCheckbox'>
-							<input type="checkbox" role="checkbox" name="event_dates[repeat_freq_on_{$day['ical']}]" value="1" id="check_repeat_freq_on_{$day['ical']}" data-iCal='{$day['ical']}' {{if ( isset( $value['repeat_freq_on_' . $day['ical'] ] ) AND $value['repeat_freq_on_' . $day['ical'] ] )}}checked aria-checked='true'{{endif}}> <label for="check_repeat_freq_on_{$day['ical']}">{$day['abbreviated']}</label>
+							<span class='ipsCustomInput'>
+								<input type="checkbox" role="checkbox" name="event_dates[repeat_freq_on_{$day['ical']}]" value="1" id="check_repeat_freq_on_{$day['ical']}" data-iCal='{$day['ical']}' {{if ( isset( $value['repeat_freq_on_' . $day['ical'] ] ) AND $value['repeat_freq_on_' . $day['ical'] ] )}}checked aria-checked='true'{{endif}}>
+								<span></span>
+							</span> <label for="check_repeat_freq_on_{$day['ical']}">{$day['abbreviated']}</label>
 						</li>
 					{{endforeach}}
 				</ul>
@@ -968,19 +1029,28 @@
 				<span class='ipsFieldRow_label' for=''>{lang="event_rpm_ends"}</span>
 				<ul class='ipsFieldRow_content ipsField_fieldList'>
 					<li>
-						<input type='radio' name='event_dates[repeat_end]' id='event_repeat_end_never' value='never'{{if !$value['repeat_end_occurrences'] AND !$value['repeat_end_date']}} checked{{endif}}>
+						<span class='ipsCustomInput'>
+							<input type='radio' name='event_dates[repeat_end]' id='event_repeat_end_never' value='never'{{if !$value['repeat_end_occurrences'] AND !$value['repeat_end_date']}} checked{{endif}}>
+							<span></span>
+						</span>
 						<div class='ipsField_fieldList_content'>
 							<label for="event_repeat_end_never">{lang="event_rpm_ends_never"}</label>
 						</div>
 					</li>
 					<li>
-						<input type='radio' name='event_dates[repeat_end]' id='event_repeat_end_afterx' value='after'{{if $value['repeat_end_occurrences']}} checked{{endif}}>
+						<span class='ipsCustomInput'>
+							<input type='radio' name='event_dates[repeat_end]' id='event_repeat_end_afterx' value='after'{{if $value['repeat_end_occurrences']}} checked{{endif}}>
+							<span></span>
+						</span>
 						<div class='ipsField_fieldList_content'>
 							<label for="event_repeat_end_afterx">{lang="event_rpm_ends_afterx"}</label> <input type='number' name='event_dates[repeat_end_occurrences]' class='cCalendar_shortInput' size='4' min='1' value='{$value['repeat_end_occurrences']}'> {lang="event_rpm_ends_occurrencesx"}
 						</div>
 					</li>
 					<li>
-						<input type='radio' name='event_dates[repeat_end]' id='event_repeat_end_ondate' value='date'{{if $value['repeat_end_date']}} checked{{endif}}>
+						<span class='ipsCustomInput'>
+							<input type='radio' name='event_dates[repeat_end]' id='event_repeat_end_ondate' value='date'{{if $value['repeat_end_date']}} checked{{endif}}>
+							<span></span>
+						</span>
 						<div class='ipsField_fieldList_content'>
 							<label for="event_repeat_end_ondate">{lang="event_rpm_ends_date"}</label> <input type='date' name='event_dates[repeat_end_date]' class='cCalendar_shortInput' size='10' value='{{if $value['repeat_end_date'] instanceof \IPS\calendar\Date}}{$value['repeat_end_date']->mysqlDatetime( FALSE )}{{endif}}'>
 						</div>
@@ -1077,7 +1147,7 @@
 		</ul>
 	{{endif}}
 </div>]]></template>
- <template template_group="view" template_name="comments" template_data="$event" template_location="front" template_app="calendar"><![CDATA[<div class='' data-controller='core.front.core.commentFeed' {{if settings.auto_polling_enabled}}data-autoPoll{{endif}} data-baseURL='{$event->url()}' {{if $event->isLastPage()}}data-lastPage{{endif}} data-feedID='event-{$event->id}' id='comments'>
+ <template template_group="view" template_name="comments" template_data="$event" template_location="front" template_app="calendar"><![CDATA[<div class='' data-controller='core.front.core.commentFeed, core.front.core.ignoredComments' {{if settings.auto_polling_enabled}}data-autoPoll{{endif}} data-baseURL='{$event->url()}' {{if $event->isLastPage()}}data-lastPage{{endif}} data-feedID='event-{$event->id}' id='comments'>
 	{{if $event->commentPageCount() > 1}}
 		{$event->commentPagination( array( 'tab' ) )|raw}
 		<br><br>
@@ -1126,9 +1196,9 @@
 	{{endif}}
 </div>]]></template>
  <template template_group="view" template_name="coverPhotoOverlay" template_data="$event" template_location="front" template_app="calendar"><![CDATA[<div class='cEvent_details'>
-	<h1 class='ipsType_pageTitle ipsTruncate ipsTruncate_line'>
+	<h1 class='ipsType_pageTitle ipsContained_container ipsTruncate ipsTruncate_line'>
 		{{if $event->prefix()}}
-			{template="prefix" group="global" app="core" params="$event->prefix( TRUE ), $event->prefix()"}
+			<span>{template="prefix" group="global" app="core" params="$event->prefix( TRUE ), $event->prefix()"}</span>
 		{{endif}}
 
 		{{if $event->locked()}}<i class='fa fa-lock'></i> {{endif}}
@@ -1146,8 +1216,15 @@
 				<span class="ipsBadge ipsBadge_icon ipsBadge_positive" data-ipsTooltip title='{lang="featured"}'><i class='fa fa-star'></i></span>
 			{{endif}}
 		{{endif}}
-
-		<span itemprop='name'>{$event->title}</span>
+		{{if $event->canEdit()}}
+			<div class='ipsType_break ipsContained' data-controller="core.front.core.moderation">
+				<span itemprop='name' data-role="editableTitle" title='{lang="click_hold_edit"}'>{$event->title}</span>
+			</div>
+		{{else}}
+			<div class='ipsType_break ipsContained'>
+				<span itemprop='name' class="">{$event->title}</span>
+			</div>
+		{{endif}}
 	</h1>
 	<p class='ipsType_normal ipsType_reset'>
 		<time itemprop='startDate' content='{expression="$event->_start_date->format( 'Y-m-d' )"}'>
@@ -1182,7 +1259,7 @@
 				<img src='{$event->author()->photo}' class="ipsUserPhoto ipsUserPhoto_mini" alt=''>
 			</div>
 			<div class='ipsColumn ipsColumn_fluid'>
-				<h2 class='ipsType_pageTitle'><a href='{$event->url()}' title='{$event->title}'>{truncate="$event->title" length="18"}{{if $event->hidden() === 1}} <span class="ipsBadge ipsBadge_icon ipsBadge_warning" data-ipsTooltip title='{lang="pending_approval"}'><i class='fa fa-warning'></i></span>{{endif}}</a></h2>
+				<h2 class='ipsType_pageTitle ipsType_blendLinks'><a href='{$event->url()}' title='{$event->title}'>{truncate="$event->title" length="18"}{{if $event->hidden() === 1}} <span class="ipsBadge ipsBadge_icon ipsBadge_warning" data-ipsTooltip title='{lang="pending_approval"}'><i class='fa fa-warning'></i></span>{{endif}}</a></h2>
 			</div>
 		</div>
 	</div>
@@ -1190,7 +1267,7 @@
 	<div class='ipsPad ipsClearfix'>
 		<h3 class='ipsType_reset'>
 			{{$startDate = $event->nextOccurrence( $date, 'startDate' );}}
-			{{if $revertToFirst AND $startDate->mon > $date->mon}}
+			{{if $revertToFirst AND $startDate AND $startDate->mon > $date->mon}}
 				{{$startDate = $event->nextOccurrence( \IPS\calendar\Date::getDate( $date->year, $date->mon, 1 ), 'startDate' );}}
 			{{endif}}
 			{{if $startDate}}
@@ -1257,14 +1334,21 @@
 		</li>
 	{{endforeach}}
 </ul>]]></template>
- <template template_group="view" template_name="eventSidebar" template_data="$event, $attendees, $tabId=''" template_location="front" template_app="calendar"><![CDATA[
+ <template template_group="view" template_name="eventSidebar" template_data="$event, $attendees, $tabId='', $address=NULL" template_location="front" template_app="calendar"><![CDATA[
 {{if $event->map( 250, 250 )}}
 	<div class='ipsPad_half ipsType_center ipsAreaBackground'>
 		{$event->map( 250, 250 )|raw}
 	</div>
 	<br>
 {{endif}}
-
+{{if $address}}
+	<div class='ipsPad_half ipsAreaBackground'>
+		<h3 class='ipsType_minorHeading'>
+			<strong>{lang="event_address"}</strong>
+		</h3>
+		{$address|raw}
+	</div>
+{{endif}}
 {{if $event->rsvp }}
 	{template="rsvpControls" group="view" params="$event, $attendees"}
 	<br>
@@ -1343,14 +1427,14 @@
 
 			{{if count($attendees[0]) OR count($attendees[1]) OR count($attendees[2]) }}
 				<div class='ipsPad_half ipsType_center ipsType_medium ipsAreaBackground_light'>
-					<a href='{$event->url('downloadRsvp')}' class=''><i class='fa fa-arrow-circle-o-down'></i> {lang="rsvp_download"}</a>
+					<a href='{$event->url('downloadRsvp')->csrf()}' class='' rel="noindex, nofollow" ><i class='fa fa-arrow-circle-o-down'></i> {lang="rsvp_download"}</a>
 				</div>
 			{{endif}}
 		</div>
 	</div>
 {{endif}}]]></template>
- <template template_group="view" template_name="reviews" template_data="$event" template_location="front" template_app="calendar"><![CDATA[<div data-controller='core.front.core.commentFeed' {{if settings.auto_polling_enabled}}data-autoPoll{{endif}} data-baseURL='{$event->url()}' {{if $event->isLastPage('reviews')}}data-lastPage{{endif}} data-feedID='event-{$event->id}-reviews' id='reviews'>
-	{{if $event->canReview()}}
+ <template template_group="view" template_name="reviews" template_data="$event" template_location="front" template_app="calendar"><![CDATA[<div data-controller='core.front.core.commentFeed' {{if settings.auto_polling_enabled}}data-autoPoll{{endif}} data-commentsType='reviews' data-baseURL='{$event->url()}' {{if $event->isLastPage('reviews')}}data-lastPage{{endif}} data-feedID='event-{$event->id}-reviews' id='reviews'>
+	{{if $event->reviewForm()}}
 		{{if $event->locked()}}
 			<strong class='ipsType_warning'><i class='fa fa-info-circle'></i> {lang="item_locked_can_review"}</strong>
 		{{endif}}
@@ -1358,34 +1442,42 @@
 			{$event->reviewForm()|raw}
 		</div>
 	{{else}}
-		{{if $event->locked()}}
-			{template="commentUnavailable" group="forms" location="front" app="core" params="'item_locked_cannot_comment'"}
+		{{if $event->hasReviewed()}}
+			<!-- Already reviewed -->
+		{{elseif $event->locked()}}
+			{template="commentUnavailable" group="forms" location="front" app="core" params="'item_locked_cannot_review'"}
 		{{elseif \IPS\Member::loggedin()->restrict_post}}
-			{template="commentUnavailable" group="forms" location="front" app="core" params="'restricted_cannot_comment', \IPS\Member::loggedIn()->restrict_post"}
+			{{if \IPS\Member::loggedIn()->restrict_post == -1}}
+				{template="reviewUnavailable" group="forms" location="front" app="core" params="'restricted_cannot_comment'"}
+			{{else}}
+				{template="reviewUnavailable" group="forms" location="front" app="core" params="'restricted_cannot_comment', \IPS\Member::loggedIn()->warnings(5,NULL,'rpa'), \IPS\Member::loggedIn()->restrict_post"}
+			{{endif}}
+		{{elseif \IPS\Member::loggedIn()->members_bitoptions['unacknowledged_warnings']}}
+			{template="reviewUnavailable" group="forms" location="front" app="core" params="'unacknowledged_warning_cannot_post', \IPS\Member::loggedIn()->warnings( 1, FALSE )"}
 		{{endif}}
 	{{endif}}
 	{{if count( $event->reviews() )}}
-		<hr class='ipsHr'>
-		<div class="ipsClearfix">
+		{{if !$event->hasReviewed()}}<hr class='ipsHr'>{{endif}}
+		<div class="ipsClearfix ipsSpacer_bottom">
 			{{if $event->reviewPageCount() > 1}}
-				<div class="ipsPos_left">
+				<div class="ipsPos_left ipsResponsive_noFloat">
 					{$event->reviewPagination( array( 'tab', 'sort' ) )|raw}
 				</div>
 			{{endif}}
-			<div class="ipsClearfix ipsResponsive_showDesktop ipsPos_right">
-				<ul class="ipsButtonRow ipsPos_left ipsClearfix">
-					<li data-action="tableFilter" data-filter="helpful">
+			<div class="ipsClearfix ipsPos_right ipsResponsive_hidePhone">
+				<ul class="ipsButtonRow ipsClearfix">
+					<li data-action="tableFilter">
 						<a href="{$event->url()->setQueryString( array( 'tab' => 'reviews', 'page' => 1, 'sort' => 'helpful' ) )}" class="{{if !isset( request.sort ) or request.sort != 'newest'}}ipsButtonRow_active{{endif}}" data-action="filterClick">{lang="most_helpful"}</a>
 					</li>
-					<li data-action="tableFilter" data-filter="newest">
+					<li data-action="tableFilter">
 						<a href="{$event->url()->setQueryString( array( 'tab' => 'reviews', 'page' => 1, 'sort' => 'newest' ) )}" class="{{if isset( request.sort ) and request.sort == 'newest'}}ipsButtonRow_active{{endif}}" data-action="filterClick">{lang="newest"}</a>
 					</li>
 				</ul>
 			</div>
 		</div>
-		<br>
+
 		<div data-role='commentFeed' data-controller='core.front.core.moderation'>
-			<form action="{$event->url()->setQueryString( 'do', 'multimodReview' )}" method="post" data-ipsPageAction data-role='moderationTools'>
+			<form action="{$event->url()->csrf()->setQueryString( 'do', 'multimodReview' )}" method="post" data-ipsPageAction data-role='moderationTools'>
 				{{$reviewCount=0; $timeLastRead = $event->timeLastRead(); $lined = FALSE;}}
 				{{foreach $event->reviews() as $review}}
 					{{if !$lined and $timeLastRead and $timeLastRead->getTimestamp() < $review->mapped('date')}}
@@ -1400,8 +1492,9 @@
 			</form>
 		</div>
 		{{if $event->reviewPageCount() > 1}}
-			<hr class='ipsHr'>
-			{$event->reviewPagination( array( 'tab', 'sort' ) )|raw}
+			<div>
+				{$event->reviewPagination( array( 'tab', 'sort' ) )|raw}
+			</div>
 		{{endif}}
 	{{elseif !$event->canReview()}}
 		<p class="ipsType_normal ipsType_light ipsType_reset" data-role="noReviews">{lang="no_reviews"}</p>
@@ -1423,14 +1516,14 @@
 		<ul class="ipsToolList ipsToolList_vertical">
 			{{if isset( $attendees[2][ \IPS\Member::loggedIn()->member_id ] )}}
 				<li>
-					<a href='{$event->url('rsvp')->setQueryString( 'action', 'yes' )}' class='ipsButton ipsButton_important ipsButton_fullWidth'>{lang="rsvp_attend_event"}</a>
+					<a href='{$event->url('rsvp')->setQueryString( 'action', 'yes' )->csrf()}' class='ipsButton ipsButton_important ipsButton_fullWidth'>{lang="rsvp_attend_event"}</a>
 				</li>
 				<li>
-					<a href='{$event->url('rsvp')->setQueryString( 'action', 'no' )}' class='ipsButton ipsButton_veryLight ipsButton_fullWidth ipsButton_verySmall'>{lang="rsvp_notgoing_event"}</a>
+					<a href='{$event->url('rsvp')->setQueryString( 'action', 'no' )->csrf()}' class='ipsButton ipsButton_veryLight ipsButton_fullWidth ipsButton_verySmall'>{lang="rsvp_notgoing_event"}</a>
 				</li>
 			{{else}}
 				<li class='ipsType_center'>
-					<a href='{$event->url('rsvp')->setQueryString( 'action', 'leave' )}' class=''>{lang="rsvp_leave_event"}</a>
+					<a href='{$event->url('rsvp')->setQueryString( 'action', 'leave' )->csrf()}' class=''>{lang="rsvp_leave_event"}</a>
 				</li>
 			{{endif}}
 		</ul>
@@ -1441,16 +1534,16 @@
 			<div class='ipsMessage ipsMessage_info'>{lang="rsvp_limit_reached"}</div>
 		{{else}}
 			{{if $event->rsvp_limit > 0}}<div class='ipsMessage ipsMessage_info'>{lang="rsvp_limit_info" pluralize="count($attendees[1])" sprintf="$event->rsvp_limit"}</div>{{endif}}
-			<a href='{$event->url('rsvp')->setQueryString( 'action', 'yes' )}' class='ipsButton ipsButton_important ipsButton_fullWidth'>{lang="rsvp_attend_event"}</a>
+			<a href='{$event->url('rsvp')->setQueryString( 'action', 'yes' )->csrf()}' class='ipsButton ipsButton_important ipsButton_fullWidth'>{lang="rsvp_attend_event"}</a>
 			<br>
 			<div class='ipsGrid'>
-				{{if $event->rsvp_limit == -1}}<div class='ipsGrid_span6'><a href='{$event->url('rsvp')->setQueryString( 'action', 'maybe' )}' class='ipsButton ipsButton_primary ipsButton_fullWidth ipsButton_verySmall'>{lang="rsvp_maybe_event"}</a></div>{{endif}}
-				<div class='ipsGrid_span{{if $event->rsvp_limit == -1}}6{{else}}12{{endif}}'><a href='{$event->url('rsvp')->setQueryString( 'action', 'no' )}' class='ipsButton ipsButton_primary ipsButton_fullWidth ipsButton_verySmall'>{lang="rsvp_notgoing_event"}</a></div>
+				{{if $event->rsvp_limit == -1}}<div class='ipsGrid_span6'><a href='{$event->url('rsvp')->setQueryString( 'action', 'maybe' )->csrf()}' class='ipsButton ipsButton_primary ipsButton_fullWidth ipsButton_verySmall'>{lang="rsvp_maybe_event"}</a></div>{{endif}}
+				<div class='ipsGrid_span{{if $event->rsvp_limit == -1}}6{{else}}12{{endif}}'><a href='{$event->url('rsvp')->setQueryString( 'action', 'no' )->csrf()}' class='ipsButton ipsButton_primary ipsButton_fullWidth ipsButton_verySmall'>{lang="rsvp_notgoing_event"}</a></div>
 			</div>
 		{{endif}}
 	</div>
 {{endif}}]]></template>
- <template template_group="view" template_name="view" template_data="$event, $commentsAndReviews, $attendees" template_location="front" template_app="calendar"><![CDATA[<div itemscope itemtype="http://schema.org/Event">
+ <template template_group="view" template_name="view" template_data="$event, $commentsAndReviews, $attendees, $address=NULL" template_location="front" template_app="calendar"><![CDATA[<div itemscope itemtype="http://schema.org/Event">
 	<header class='ipsClearfix ipsSpacer_bottom'>
 		<div id="elEventHeader">{$event->coverPhoto()|raw}</div>
 		<div id='elEventHeader_details' class='ipsClearfix ipsAreaBackground ipsPad'>
@@ -1462,11 +1555,11 @@
 						{lang="event_created_by" htmlsprintf="$event->author()->link( $event->warningRef() )"}
 					</p>
 					{{if $event->container()->allow_reviews}}
-						<span itemprop="aggregateRating" itemscope itemtype="http://schema.org/AggregateRating">
+						<div itemprop="aggregateRating" itemscope itemtype="http://schema.org/AggregateRating">
 							<meta itemprop='ratingValue' content='{$event->averageReviewRating()}'>
 							<meta itemprop='reviewCount' content='{$event->reviews}'>
-							{template="rating" group="global" location="front" app="core" params="'large', $event->averageReviewRating(), \IPS\Settings::i()->reviews_rating_out_of"}&nbsp;&nbsp; <span class='ipsType_medium ipsType_light'>({lang="num_reviews" pluralize="$event->reviews"})</span>
-						</span>
+							{template="rating" group="global" location="front" app="core" params="'large', $event->averageReviewRating(), \IPS\Settings::i()->reviews_rating_out_of, $event->memberReviewRating()"}&nbsp;&nbsp; <span class='ipsType_medium ipsType_light'>({lang="num_reviews" pluralize="$event->reviews"})</span>
+						</div>
 					{{endif}}
 				</div>
 			</div>
@@ -1490,7 +1583,7 @@
 			<div class='ipsColumns ipsColumns_collapsePhone'>
 				<aside class='ipsColumn ipsColumn_wide'>
 					<div class='ipsAreaBackground_light'>
-						{template="eventSidebar" group="view" params="$event, $attendees, 'Mob'"}
+						{template="eventSidebar" group="view" params="$event, $attendees, 'Mob', $address"}
 					</div>
 				</aside>
 				<div class='ipsColumn ipsColumn_fluid'>
@@ -1509,13 +1602,13 @@
 				{{endif}}	
 				<h2 class='ipsType_sectionHead ipsSpacer_bottom'>{lang="event_details"}</h2>
 				
-				{{if count( $event->tags() )}}
-					{template="tags" group="global" app="core" params="$event->tags()"}
+				{{if count( $event->tags() ) OR ( $event->canEdit() AND $event::canTag( NULL, $event->container() ) )}}
+					{template="tags" group="global" app="core" params="$event->tags(), FALSE, FALSE, ( $event->canEdit() AND $event::canTag( NULL, $event->container() ) ) ? $event->url() : NULL"}
 					<br>
 				{{endif}}
 				<div class='ipsComment_content ipsType_medium'>
 					<div class='ipsClear ipsType_normal ipsType_richText ipsType_break'>
-						{$event->content|raw}
+						{$event->content()|raw}
 					</div>
 				</div>
 
@@ -1541,7 +1634,7 @@
 							<a href='#elEventActions_menu' id='elEventActions' class='ipsButton ipsButton_light ipsButton_verySmall ipsButton_fullWidth' data-ipsMenu>{lang="manage_event"} <i class='fa fa-caret-down'></i></a>
 							<ul id='elEventActions_menu' class='ipsMenu ipsMenu_auto ipsHide'>
 								{{if $event->canEdit()}}				
-									<li class='ipsMenu_item'><a href='{$event->url()->csrf()->setQueryString( array( 'do' => 'edit' ) )}' title='{lang="calendar_edit_details_title"}'>{lang="calendar_edit_details"}</a></li>
+									<li class='ipsMenu_item'><a href='{$event->url()->csrf()->setQueryString( array( 'do' => 'edit' ) )}' title="{lang="calendar_edit_details_title"}">{lang="calendar_edit_details"}</a></li>
 								{{endif}}
 								{{if $event->canFeature()}}				
 									<li class='ipsMenu_item'><a href='{$event->url()->csrf()->setQueryString( array( 'do' => 'moderate', 'action' => 'feature' ) )}' title='{lang="feature_title_event"}'>{lang="feature"}</a></li>
@@ -1581,7 +1674,7 @@
 						</li>
 					{{endif}}
 
-					<li><a href='{$event->url('download')}' title='{lang="download_ical_title"}' class='ipsButton ipsButton_link ipsButton_verySmall ipsButton_fullWidth'>{lang="download_ical"}</a></li>
+					<li><a href='{$event->url('download')}' rel="noindex, nofollow" title='{lang="download_ical_title"}' class='ipsButton ipsButton_link ipsButton_verySmall ipsButton_fullWidth'>{lang="download_ical"}</a></li>
 				</ul>
 
 				<div class='ipsResponsive_showPhone ipsResponsive_block'>
@@ -1628,8 +1721,8 @@
 							<div class='ipsDataItem_icon'>
 								{template="userPhoto" app="core" group="global" params="$review->author(), 'tiny'"}
 							</div>
-							<div class='ipsDataItem_main ipsType_break'>
-								<a href="{$review->item()->url()}" title='{lang="view_this_event" sprintf="$review->item()->title"}'>{wordbreak="$review->item()->title"}</a><br>
+							<div class='ipsDataItem_main ipsType_break ipsContained'>
+								<a href="{$review->item()->url()}" title='{lang="view_this_event" sprintf="$review->item()->title"}' class='ipsTruncate ipsTruncate_line'>{$review->item()->title}</a><br>
 								<span class='ipsType_light ipsType_medium'>{lang="byline_nodate" htmlsprintf="$review->author()->link()"}</span><br>
 								{template="rating" group="global" location="front" app="core" params="'small', $review->rating, \IPS\Settings::i()->reviews_rating_out_of"} &nbsp;&nbsp;
 								<span class='ipsType_small ipsType_reset'><time datetime="{$review->mapped('date')}" itemprop="dtreviewed">{datetime="$review->mapped('date')" norelative="true"}</time></span>
@@ -1649,10 +1742,10 @@
 						<div class='ipsDataItem_icon'>
 							{template="userPhoto" app="core" group="global" params="$review->author(), 'tiny'"}
 						</div>
-						<div class='ipsDataItem_main ipsType_break'>
-							<a href="{$review->item()->url()}" title='{lang="view_this_event" sprintf="$review->item()->title"}'>{wordbreak="$review->item()->title"}</a><br>
+						<div class='ipsDataItem_main ipsType_break ipsContained'>
+							<a href="{$review->item()->url()}" title='{lang="view_this_event" sprintf="$review->item()->title"}' class='ipsTruncate ipsTruncate_line'>{$review->item()->title}</a><br>
 							<span class='ipsType_light ipsType_medium'>{lang="byline_nodate" htmlsprintf="$review->author()->link()"}</span>, <span class='ipsType_small ipsType_reset ipsType_light'><time datetime="{$review->mapped('date')}" itemprop="dtreviewed">{datetime="$review->mapped('date')" norelative="true"}</time></span><br>
-							<div class='ipsType_medium ipsType_richText' data-ipsTruncate data-ipsTruncate-type='remove' data-ipsTruncate-size='2 lines'>
+							<div class='ipsType_medium ipsType_richText' data-ipsTruncate data-ipsTruncate-type='remove' data-ipsTruncate-size='2 lines' data-ipsTruncate-watch='false'>
 								{template="rating" group="global" location="front" app="core" params="'small', $review->rating, \IPS\Settings::i()->reviews_rating_out_of"} &nbsp;&nbsp; {$review->truncated()|raw}
 							</div>
 						</div>
@@ -1664,40 +1757,41 @@
 		{{endif}}
 	{{endif}}
 </div>]]></template>
- <template template_group="widgets" template_name="todaysBirthdays" template_data="$members, $orientation='vertical'" template_location="front" template_app="calendar"><![CDATA[<h3 class='ipsType_reset ipsWidget_title'>{lang="block_todaysBirthdays"}</h3>
-<div class='ipsWidget_inner'>
+ <template template_group="widgets" template_name="todaysBirthdays" template_data="$members, $count, $today, $orientation='vertical'" template_location="front" template_app="calendar"><![CDATA[<h3 class='ipsType_reset ipsWidget_title'>{lang="block_todaysBirthdays"}</h3>
+<div class='ipsWidget_inner {{if $orientation == 'vertical'}}ipsPad{{else}}ipsPad_half{{endif}}'>
 	{{if $orientation == 'vertical'}}
-		<div class='ipsPad_half'>
-			{{if !empty($members) }}
-				<ol class='ipsDataList ipsDataList_reducedSpacing'>
-					{{foreach $members as $member}}
-						<li class='ipsDataItem'>
-							<div class='ipsDataItem_main ipsPhotoPanel ipsPhotoPanel_tiny ipsClearfix'>
-								{template="userPhoto" app="core" group="global" params="$member, 'tiny'"}
-								<div>
-									{$member->link()|raw}
-									{{if $member->bday_year}}<br><span class='ipsType_light'>{lang="member_age" sprintf="$member->age()"}</span>{{endif}}
-								</div>
-							</div>
-						</li>
-					{{endforeach}}
-				</ol>
-			{{else}}
-				<div class='ipsType_light ipsPad_half ipsType_center'>{lang="no_members_birthday_today"}</div>
-			{{endif}}
-		</div>
-	{{else}}
 		{{if !empty($members) }}
-			<ol class='ipsList_inline ipsList_noSpacing'>
-				{{foreach $members as $idx => $member}}
-					<li>
-						{$member->link()|raw} {{if $member->bday_year}} <span class='ipsType_light'>{lang="member_age" sprintf="$member->age()"}</span>{{endif}}{{if $idx != count( $members ) - 1}},{{endif}}
+			<ol class='ipsDataList ipsDataList_reducedSpacing'>
+				{{foreach $members as $member}}
+					<li class='ipsDataItem'>
+						<div class='ipsDataItem_main ipsPhotoPanel ipsPhotoPanel_tiny ipsClearfix'>
+							{template="userPhoto" app="core" group="global" params="$member, 'tiny'"}
+							<div>
+								{$member->link()|raw}
+								{{if $member->bday_year}}<br><span class='ipsType_light'>{lang="member_age" pluralize="$member->age()"}</span>{{endif}}
+							</div>
+						</div>
 					</li>
 				{{endforeach}}
 			</ol>
 		{{else}}
 			<div class='ipsType_light ipsPad_half ipsType_center'>{lang="no_members_birthday_today"}</div>
 		{{endif}}
+	{{else}}
+		{{if !empty($members) }}
+			<ol class='ipsList_inline ipsList_noSpacing'>
+				{{foreach $members as $idx => $member}}
+					<li>
+						{$member->link()|raw} {{if $member->bday_year}} <span class='ipsType_light'>{lang="member_age" pluralize="$member->age()"}</span>{{endif}}{{if $idx != count( $members ) - 1}},{{endif}}
+					</li>
+				{{endforeach}}
+			</ol>
+		{{else}}
+			<div class='ipsType_light ipsPad_half ipsType_center'>{lang="no_members_birthday_today"}</div>
+		{{endif}}
+	{{endif}}
+	{{if $count > count($members)}}
+		<a data-ipsDialog data-ipsDialog-title='{lang="birthdays_today" pluralize="$count"}' data-ipsDialog-size="narrow" href='{url="app=calendar&module=calendar&controller=view&view=day&y={$today->year}&m={$today->mon}&d={$today->mday}&show=birthdays" seoTemplate="calendar_day"}'>{lang="birthdays_view_all"}</a>
 	{{endif}}
 </div>]]></template>
  <template template_group="widgets" template_name="upcomingEvents" template_data="$events, $today, $orientation='vertical'" template_location="front" template_app="calendar"><![CDATA[<h3 class='ipsType_reset ipsWidget_title'>{lang="block_upcomingEvents"}</h3>
@@ -1708,18 +1802,27 @@
 	{{if !empty( $events ) }}
 		<ul class='ipsDataList ipsDataList_reducedSpacing'>
 			{{foreach $events as $event}}
-				<li class='ipsDataItem'>
+				<li class='ipsDataItem ipsClearfix'>
 					<div class='ipsDataItem_icon cCalendar_date_overlay'>
-						<time datetime='{$event->nextOccurrence( $today, 'startDate' )->mysqlDatetime()}' class='ipsCalendarDate'>
-							<span class='ipsCalendarDate_month'>{$event->nextOccurrence( $today, 'startDate' )->monthNameShort}</span>
-							<span class='ipsCalendarDate_date'>{$event->nextOccurrence( $today, 'startDate' )->mday}</span>
-						</time>
+						{{if $event->nextOccurrence( $today, 'startDate' )}}
+							<time datetime='{$event->nextOccurrence( $today, 'startDate' )->mysqlDatetime()}' class='ipsCalendarDate'>
+								<span class='ipsCalendarDate_month'>{$event->nextOccurrence( $today, 'startDate' )->monthNameShort}</span>
+								<span class='ipsCalendarDate_date'>{$event->nextOccurrence( $today, 'startDate' )->mday}</span>
+							</time>
+						{{else}}
+							<time datetime='{$event->lastOccurrence( 'startDate' )->mysqlDatetime()}' class='ipsCalendarDate'>
+								<span class='ipsCalendarDate_month'>{$event->lastOccurrence( 'startDate' )->monthNameShort}</span>
+								<span class='ipsCalendarDate_date'>{$event->lastOccurrence( 'startDate' )->mday}</span>
+							</time>
+						{{endif}}
 					</div>
-					<div class='ipsDataItem_main ipsType_break ipsContained'>
+					<div class='ipsDataItem_main cWidgetComments'>
 						{{if $event->container()->allow_comments && $orientation == 'vertical'}}
 							<div class="ipsCommentCount ipsPos_right {{if $event->comments === 0}}ipsFaded{{endif}}" data-ipsTooltip title='{lang="replies_number" pluralize="$event->comments"}'>{expression="$event->comments"}</div>
 						{{endif}}
-						{{if $event->unread()}}<span class="ipsItemStatus ipsItemStatus_tiny"><i class="fa fa-circle"></i></span> <strong>{{endif}}<a href="{$event->url()}" title='{lang="view_this_event" sprintf="$event->title"}'>{$event->title}</a>{{if $event->unread()}}</strong>{{endif}}<br>
+						<div class='ipsType_break ipsContained'>
+							<a href="{$event->url()}" title='{lang="view_this_event" sprintf="$event->title"}'>{$event->title}</a>
+						</div>
 						<strong class='ipsType_small'>
 							{{if $event->nextOccurrence( $today, 'startDate' )}}
 								{$event->nextOccurrence( $today, 'startDate' )->calendarDate()}{{if !$event->all_day}} {$event->nextOccurrence( $today, 'startDate' )->localeTime( FALSE )} {{endif}}
@@ -1741,15 +1844,8 @@
 						{{if $event->container()->allow_comments && $orientation == 'horizontal'}}
 							<span class="{{if $event->comments === 0}}ipsFaded{{endif}}" data-ipsTooltip title='{lang="replies_number" pluralize="$event->comments"}'><i class='fa fa-comment'></i> {expression="$event->comments"}</span>&nbsp;&nbsp;
 						{{endif}}
-						{{if $event->rsvp}}
-							{{$attendees = $event->attendees();}}
-							<i class='fa fa-user'></i> {lang="x_users_going" pluralize="count( $attendees[1] )"}
-							{{if isset( $attendees[1][ \IPS\Member::loggedIn()->member_id ] )}}
-								{{if $orientation == 'vertical'}}<br>{{else}}&nbsp;&nbsp;{{endif}}<strong class='ipsType_success'><i class='fa fa-check-circle'></i> {lang="you_are_going"}</strong>
-							{{endif}}
-						{{endif}}
 						{{if $orientation == 'horizontal'}}
-							<div class='ipsType_medium ipsType_richText' data-ipsTruncate data-ipsTruncate-type='remove' data-ipsTruncate-size='2 lines'>
+							<div class='ipsType_medium ipsType_richText' data-ipsTruncate data-ipsTruncate-type='remove' data-ipsTruncate-size='2 lines' data-ipsTruncate-watch='false'>
 								{$event->truncated()|raw}
 							</div>
 						{{endif}}

applications/calendar/data/versions.json

@@ -1,4 +1,5 @@
 {
+    "31007": "3.1.4",
     "32000": "3.2.0 Beta 1",
     "32001": "3.2.0 Beta 2",
     "32003": "3.2.0",
@@ -68,5 +69,79 @@
     "101009": "4.1.0 Beta 10",
     "101010": "4.1.0",
     "101011": "4.1.1",
-    "101012": "4.1.2"
+    "101012": "4.1.2",
+    "101013": "4.1.3",
+    "101014": "4.1.3.1",
+    "101015": "4.1.3.2",
+    "101016": "4.1.4",
+    "101017": "4.1.4.1",
+    "101018": "4.1.5",
+    "101019": "4.1.5.1",
+    "101020": "4.1.5.2",
+    "101021": "4.1.6",
+    "101022": "4.1.6.1",
+    "101023": "4.1.7",
+    "101024": "4.1.8",
+    "101025": "4.1.8.1",
+    "101026": "4.1.9",
+    "101027": "4.1.10",
+    "101028": "4.1.11",
+    "101029": "4.1.11.1",
+    "101030": "4.1.12",
+    "101031": "4.1.12.1",
+    "101032": "4.1.12.2",
+    "101033": "4.1.12.3",
+    "101034": "4.1.13 Beta 1",
+    "101035": "4.1.13 Beta 2",
+    "101036": "4.1.13",
+    "101037": "4.1.13",
+    "101038": "4.1.13.1",
+    "101040": "4.1.13.2",
+    "101041": "4.1.13.2",
+    "101042": "4.1.14 Beta 1",
+    "101043": "4.1.14 Beta 2",
+    "101044": "4.1.14 Beta 3",
+    "101045": "4.1.14 Beta 4",
+    "101046": "4.1.14 Beta 5",
+    "101049": "4.1.14 Beta 6",
+    "101050": "4.1.14 Beta 7",
+    "101051": "4.1.14 RC",
+    "101052": "4.1.14",
+    "101053": "4.1.14.1",
+    "101054": "4.1.14.2",
+    "101055": "4.1.14.3",
+    "101056": "4.1.15",
+    "101057": "4.1.15 Beta 1",
+    "101058": "4.1.15 Beta 2",
+    "101059": "4.1.15 Beta 2a",
+    "101060": "4.1.15 Beta 3",
+    "101061": "4.1.15",
+    "101062": "4.1.15",
+    "101063": "4.1.15",
+    "101064": "4.1.16 Beta 1",
+    "101065": "4.1.16 Beta 2",
+    "101066": "4.1.16 Beta 3",
+    "101067": "4.1.16 Beta 4",
+    "101068": "4.1.16 Beta 5",
+    "101069": "4.1.16",
+    "101070": "4.1.16.1",
+    "101071": "4.1.17 Beta 1",
+    "101072": "4.1.17 Beta 1a",
+    "101073": "4.1.17 Beta 1b",
+    "101074": "4.1.17 Beta 2",
+    "101075": "4.1.17 Beta 3",
+    "101076": "4.1.17 Beta 3",
+    "101077": "4.1.17",
+    "101078": "4.1.17.1",
+    "101079": "4.1.18 Beta 1",
+    "101082": "4.1.18 Beta 1b",
+    "101083": "4.1.18 Beta 2",
+    "101084": "4.1.18 Beta 3",
+    "101085": "4.1.18",
+    "101088": "4.1.18.1",
+    "101089": "4.1.18.2",
+    "101090": "4.1.19 Beta 1",
+    "101091": "4.1.19 Beta 2",
+    "101092": "4.1.19 Beta 3",
+    "101093": "4.1.19"
 }

applications/calendar/extensions/core/Announcements/Calendars.php

@@ -2,9 +2,9 @@
 /**
  * @brief		Announcements Extension: Calendar
  * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - SVN_YYYY Invision Power Services, Inc.
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
  * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Social Suite
+ * @package		IPS Community Suite
  * @subpackage	Calendar	
  * @since		29 Apr 2014
  * @version		SVN_VERSION_NUMBER

applications/calendar/extensions/core/ContentRouter/calendar.php

@@ -2,9 +2,9 @@
 /**
  * @brief		Content Router extension: Calendar
  * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - SVN_YYYY Invision Power Services, Inc.
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
  * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Social Suite
+ * @package		IPS Community Suite
  * @subpackage	Calendar
  * @since		7 Jan 2014
  * @version		SVN_VERSION_NUMBER

applications/calendar/extensions/core/CreateMenu/Event.php

@@ -2,9 +2,9 @@
 /**
  * @brief		Create Menu Extension
  * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - SVN_YYYY Invision Power Services, Inc.
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
  * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Social Suite
+ * @package		IPS Community Suite
  * @subpackage	Calendar
  * @since		23 Dec 2013
  * @version		SVN_VERSION_NUMBER
@@ -30,10 +30,15 @@ class _Event
 	 * @return	array
 	 */
 	public function getItems()
-	{		
+	{
 		if ( \IPS\calendar\Calendar::canOnAny( 'add' ) )
 		{
-			return array( 'event' => array( 'link' => \IPS\Http\Url::internal( "app=calendar&module=calendar&controller=submit&_new=1", 'front', 'calendar_submit' ) ) );
+			return array( 'event' => array(
+				'link' => \IPS\Http\Url::internal( "app=calendar&module=calendar&controller=submit&_new=1", 'front', 'calendar_submit' ),
+				'extraData'	=> array( 'data-ipsDialog' => true, 'data-ipsDialog-size' => "narrow", ),
+				'title' 	=> 'select_calendar'
+			)
+			);
 		}
 
 		return array();