Index: branches/5.2.x/units/topics/topics_tag_processor.php
===================================================================
diff -u -N -r15155 -r15286
--- branches/5.2.x/units/topics/topics_tag_processor.php	(.../topics_tag_processor.php)	(revision 15155)
+++ branches/5.2.x/units/topics/topics_tag_processor.php	(.../topics_tag_processor.php)	(revision 15286)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: topics_tag_processor.php 15155 2012-03-04 09:27:01Z alex $
+* @version	$Id: topics_tag_processor.php 15286 2012-04-11 08:48:42Z alex $
 * @package	In-Bulletin
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -76,4 +76,47 @@
 
 			return $this->Application->ProcessParsedTag('m', 'Link', $params);
 		}
+
+		/**
+		 * Detects if current user is subscribed to new topics in this category
+		 *
+		 * @param Array $params
+		 * @return bool
+		 */
+		function SubscribedToCategoryTopics($params)
+		{
+			static $subscribed = null;
+
+			if ( !isset($subscribed) ) {
+				$post_helper = $this->Application->recallObject('PostHelper');
+				/* @var $post_helper PostHelper */
+
+				$subscribed = $post_helper->getSubscriptionManager('CategoryTopics')->subscribed();
+			}
+
+			return $subscribed;
+		}
+
+		/**
+		 * Detects if current user is subscribed to this topic posts
+		 *
+		 * @param Array $params
+		 * @return bool
+		 */
+		function SubscribedToTopicPosts($params)
+		{
+			static $subscribed = null;
+
+			if ( !isset($subscribed) ) {
+				$object = $this->getObject($params);
+				/* @var $object kDBItem */
+
+				$post_helper = $this->Application->recallObject('PostHelper');
+				/* @var $post_helper PostHelper */
+
+				$subscribed = $post_helper->getSubscriptionManager('TopicPosts', Array ($object->GetID()))->subscribed();
+			}
+
+			return $subscribed;
+		}
 	}
\ No newline at end of file
Index: branches/5.2.x/install/english.lang
===================================================================
diff -u -N -r15218 -r15286
--- branches/5.2.x/install/english.lang	(.../english.lang)	(revision 15218)
+++ branches/5.2.x/install/english.lang	(.../english.lang)	(revision 15286)
@@ -136,6 +136,10 @@
 				<SUBJECT>TmV3IFRvcGljIFJlcGx5IGhhcyBiZWVuIEFkZGVk</SUBJECT>
 				<HTMLBODY>TmV3IHJlcGx5IGhhcyBiZWVuIGFkZGVkIHRvIHRoZSBUb3BpYzogIDxhIGhyZWY9IjxpbnAyOmJiX1RvcGljTGluayB0ZW1wbGF0ZT0iX19kZWZhdWx0X18iLz4iPjxpbnAyOmJiX0ZpZWxkIG5hbWU9IlRvcGljVGV4dCIvPjwvYT4=</HTMLBODY>
 			</EVENT>
+			<EVENT Event="POST.ADD.SUB" Type="0">
+				<SUBJECT>TmV3IFJlcGx5IGhhcyBiZWVuIGFkZGVkIHRvIFRvcGljICI8aW5wMjpiYl9GaWVsZCBuYW1lPSdUb3BpY1RleHQnLz4i</SUBJECT>
+				<HTMLBODY>TmV3IHJlcGx5IGhhcyBiZWVuIGFkZGVkIHRvIDxhIGhyZWY9IjxpbnAyOmJiX1RvcGljTGluayB0ZW1wbGF0ZT0nX19kZWZhdWx0X18nLz4iPjxpbnAyOmJiX0ZpZWxkIG5hbWU9IlRvcGljVGV4dCIvPjwvYT4gdG9waWMuPGJyLz4NCjxici8+DQo8YnIvPg0KU3ViamVjdDogPGlucDI6RmllbGQgbmFtZT0iU3ViamVjdCIvPjxici8+DQpNZXNzYWdlOjxici8+DQo8aW5wMjpGaWVsZCBuYW1lPSJQb3N0aW5nVGV4dCIgbmwyYnI9IjEiLz4=</HTMLBODY>
+			</EVENT>
 			<EVENT Event="POST.MODIFY" Type="1">
 				<SUBJECT>UG9zdCBoYXMgYmVlbiBNb2RpZmllZA==</SUBJECT>
 				<HTMLBODY>QSBwb3N0IGhhcyBiZWVuIG1vZGlmaWVkLg==</HTMLBODY>
@@ -156,6 +160,10 @@
 				<SUBJECT>TmV3IFRvcGljICI8aW5wMjpiYl9GaWVsZCBuYW1lPSJUb3BpY1RleHQiLz4iIGlzIHBlbmRpbmc=</SUBJECT>
 				<HTMLBODY>TmV3IHRvcGljIGhhcyBiZWVuIHN1Ym1pdHRlZCBhbmQgcGVuZGluZyBmb3IgeW91ciBhcHByb3ZhbC48YnI+PGJyPg0KDQpUb3BpYzogPGlucDI6YmJfRmllbGQgbmFtZT0iVG9waWNUZXh0Ii8+</HTMLBODY>
 			</EVENT>
+			<EVENT Event="TOPIC.ADD.SUB" Type="0">
+				<SUBJECT>TmV3IFRvcGljICI8aW5wMjpiYl9GaWVsZCBuYW1lPSdUb3BpY1RleHQnLz4iIGhhcyBiZWVuIHN1Ym1pdHRlZA==</SUBJECT>
+				<HTMLBODY>TmV3IFRvcGljIDxhIGhyZWY9IjxpbnAyOmJiX1RvcGljTGluayB0ZW1wbGF0ZT0nX19kZWZhdWx0X18nLz4iPjxpbnAyOmJiX0ZpZWxkIG5hbWU9IlRvcGljVGV4dCIvPjwvYT4gaGFzIGJlZW4gc3VibWl0dGVkIG9uIDxpbnAyOm1fQmFzZVVybC8+PGJyLz4NCjxici8+DQo8YnIvPg0KPGlucDI6YmJfRmllbGQgbmFtZT0iUG9zdGluZ1RleHQiIG5sMmJyPSIxIi8+</HTMLBODY>
+			</EVENT>
 			<EVENT Event="TOPIC.APPROVE" Type="0">
 				<SUBJECT>VG9waWMgIjxpbnAyOmJiX0ZpZWxkIG5hbWU9IlRvcGljVGV4dCIvPiIgaXMgYXBwcm92ZWQ=</SUBJECT>
 				<HTMLBODY>WW91ciB0b3BpYyBoYXMgYmVlbiBhcHByb3ZlZCBvbiA8aW5wMjptX0Jhc2VVcmwvPjxicj48YnI+DQoNClRvcGljOiA8aW5wMjpiYl9GaWVsZCBuYW1lPSJUb3BpY1RleHQiLz4=</HTMLBODY>
Index: branches/5.2.x/install/install_data.sql
===================================================================
diff -u -N -r15008 -r15286
--- branches/5.2.x/install/install_data.sql	(.../install_data.sql)	(revision 15008)
+++ branches/5.2.x/install/install_data.sql	(.../install_data.sql)	(revision 15286)
@@ -76,6 +76,8 @@
 INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'POST.MODIFY', NULL, 1, 1, 'In-Bulletin', 'Post Modified', 1, 1, 1);
 INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'POST.ADD', NULL, 1, 0, 'In-Bulletin', 'Post Added', 0, 1, 1);
 INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'PM.ADD', NULL, 1, 0, 'In-Bulletin', 'New Private Message', 0, 1, 1);
+INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient, BindToSystemEvent) VALUES(DEFAULT, 'POST.ADD.SUB', NULL, 1, 0, 'In-Bulletin', 'Post Added (for subscribers)', 0, 1, 0, 'bb-post:OnCreate');
+INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient, BindToSystemEvent) VALUES(DEFAULT, 'TOPIC.ADD.SUB', NULL, 1, 0, 'In-Bulletin', 'Topic Added (for subscribers)', 0, 1, 0, 'bb:OnCreate');
 
 INSERT INTO ItemTypes VALUES (3, 'In-Bulletin', 'bb', 'Topic', 'TopicText', 'OwnerId', 'Views', 'CachedRating', 'la_ItemTab_Topics', 1, '', 'clsTopic', 'Topic');
 INSERT INTO ItemTypes VALUES (30, 'In-Bulletin', 'posting', 'Posting', 'Subject', 'CreatedById', NULL, NULL, 'la_ItemTab_Posts', 0, '', '', 'Post');
Index: branches/5.2.x/units/helpers/post_helper.php
===================================================================
diff -u -N -r15249 -r15286
--- branches/5.2.x/units/helpers/post_helper.php	(.../post_helper.php)	(revision 15249)
+++ branches/5.2.x/units/helpers/post_helper.php	(.../post_helper.php)	(revision 15286)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: post_helper.php 15249 2012-03-30 16:27:14Z alex $
+* @version	$Id: post_helper.php 15286 2012-04-11 08:48:42Z alex $
 * @package	In-Bulletin
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -415,4 +415,49 @@
 			return $input_string;
 		}
 
+		/**
+		 * Returns subscription manager by name
+		 *
+		 * @param string $name
+		 * @param array $arguments
+		 * @return kSubscriptionManager
+		 * @throws InvalidArgumentException
+		 */
+		public function getSubscriptionManager($name, $arguments = Array ())
+		{
+			if ( $name != 'CategoryTopics' && $name != 'TopicPosts' ) {
+				throw new InvalidArgumentException('Unknown subscription manager "' . $name . '"');
+			}
+
+			$manager = $this->Application->makeClass('kSubscriptionManager');
+			/* @var $manager kSubscriptionManager */
+
+			$fields_hash = Array ();
+
+			$user_id = isset($arguments[1]) ? $arguments[1] : $this->Application->RecallVar('user_id');
+
+			switch ( $name ) {
+				case 'CategoryTopics':
+					$category_id = isset($arguments[0]) ? $arguments[0] : $this->Application->GetVar('m_cat_id');
+
+					$fields_hash = Array (
+						'EmailEventId' => $manager->getEmailEventId('TOPIC.ADD.SUB'),
+						'UserId' => $user_id,
+						'CategoryId' => $category_id,
+					);
+					break;
+
+				case 'TopicPosts':
+					$fields_hash = Array (
+						'EmailEventId' => $manager->getEmailEventId('POST.ADD.SUB'),
+						'UserId' => $user_id,
+						'ParentItemId' => $arguments[0],
+					);
+					break;
+			}
+
+			$manager->add($fields_hash);
+
+			return $manager;
+		}
 	}
\ No newline at end of file
Index: branches/5.2.x/units/topics/topics_event_handler.php
===================================================================
diff -u -N -r15148 -r15286
--- branches/5.2.x/units/topics/topics_event_handler.php	(.../topics_event_handler.php)	(revision 15148)
+++ branches/5.2.x/units/topics/topics_event_handler.php	(.../topics_event_handler.php)	(revision 15286)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: topics_event_handler.php 15148 2012-03-04 09:04:48Z alex $
+* @version	$Id: topics_event_handler.php 15286 2012-04-11 08:48:42Z alex $
 * @package	In-Bulletin
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -44,6 +44,10 @@
 				return $perm_status;
 			}
 
+			if ( $event->Name == 'OnToogleCategoryTopicsSubscribe' || $event->Name == 'OnToogleTopicPostsSubscribe' ) {
+				return $this->Application->LoggedIn();
+			}
+
 			return parent::CheckPermission($event);
 		}
 
@@ -249,4 +253,51 @@
 				$this->Application->setUnitOption($event->MasterEvent->Prefix, 'Clones', $clones);
 			}
 		}
+
+		/**
+		 * Subscribes/unsubscribes to new topics in given current category
+		 *
+		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 */
+		protected function OnToogleCategoryTopicsSubscribe(kEvent $event)
+		{
+			$post_helper = $this->Application->recallObject('PostHelper');
+			/* @var $post_helper PostHelper */
+
+			$manager = $post_helper->getSubscriptionManager('CategoryTopics');
+
+			if ( $manager->subscribed() ) {
+				$manager->unsubscribe();
+			}
+			else {
+				$manager->subscribe();
+			}
+		}
+
+		/**
+		 * Subscribes/unsubscribes to new posts in current topic
+		 *
+		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 */
+		protected function OnToogleTopicPostsSubscribe(kEvent $event)
+		{
+			$object = $event->getObject();
+			/* @var $object kDBItem */
+
+			$post_helper = $this->Application->recallObject('PostHelper');
+			/* @var $post_helper PostHelper */
+
+			$manager = $post_helper->getSubscriptionManager('TopicPosts', Array ($object->GetID()));
+
+			if ( $manager->subscribed() ) {
+				$manager->unsubscribe();
+			}
+			else {
+				$manager->subscribe();
+			}
+		}
 	}
\ No newline at end of file
Index: branches/5.2.x/install/upgrades.sql
===================================================================
diff -u -N -r15218 -r15286
--- branches/5.2.x/install/upgrades.sql	(.../upgrades.sql)	(revision 15218)
+++ branches/5.2.x/install/upgrades.sql	(.../upgrades.sql)	(revision 15286)
@@ -257,3 +257,5 @@
 SET main_table.CachedReviewsQty = (SELECT COUNT(*) FROM <%TABLE_PREFIX%>CatalogReviews review_table WHERE review_table.ItemId = main_table.ResourceId);
 
 # ===== v 5.2.0-B3 =====
+INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient, BindToSystemEvent) VALUES(DEFAULT, 'POST.ADD.SUB', NULL, 1, 0, 'In-Bulletin', 'Post Added (for subscribers)', 0, 1, 0, 'bb-post:OnCreate');
+INSERT INTO EmailEvents (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient, BindToSystemEvent) VALUES(DEFAULT, 'TOPIC.ADD.SUB', NULL, 1, 0, 'In-Bulletin', 'Topic Added (for subscribers)', 0, 1, 0, 'bb:OnCreate');