Index: branches/5.2.x/core/admin_templates/categories/categories_edit.tpl
===================================================================
diff -u -N -r14929 -r14978
--- branches/5.2.x/core/admin_templates/categories/categories_edit.tpl	(.../categories_edit.tpl)	(revision 14929)
+++ branches/5.2.x/core/admin_templates/categories/categories_edit.tpl	(.../categories_edit.tpl)	(revision 14978)
@@ -147,7 +147,7 @@
 				<inp2:m_RenderElement name="inp_label" prefix="c" field="Protected" title="la_fld_Protected"/>
 			</inp2:m_if>
 
-		<inp2:m_RenderElement name="subsection" prefix="c" fields="Status,DirectLinkEnabled,NewItem,EditorsPick,Priority,UseMenuIconUrl,MenuIconUrl,UseExternalUrl,ExternalUrl,CreatedOn,MetaKeywords,MetaDescription,IndexTools" title="la_section_Properties"/>
+		<inp2:m_RenderElement name="subsection" prefix="c" fields="Status,DirectLinkEnabled,RequireSSL,RequireLogin,NewItem,EditorsPick,Priority,UseMenuIconUrl,MenuIconUrl,UseExternalUrl,ExternalUrl,CreatedOn,MetaKeywords,MetaDescription,IndexTools" title="la_section_Properties"/>
 			<inp2:m_if check="c_PageEditable">
 				<inp2:m_RenderElement name="inp_edit_radio" prefix="c" field="Status" title="la_fld_Status"/>
 			<inp2:m_else/>
@@ -171,6 +171,9 @@
 				</inp2:m_RenderElement>
 			</inp2:m_ifnot>
 
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c" field="RequireSSL"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c" field="RequireLogin"/>
+
 			<inp2:m_RenderElement name="inp_edit_radio" prefix="c" field="NewItem" title="la_fld_New"/>
 			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c" field="EditorsPick" title="la_fld_EditorsPick"/>
 
Index: branches/5.2.x/core/install/install_schema.sql
===================================================================
diff -u -N -r14973 -r14978
--- branches/5.2.x/core/install/install_schema.sql	(.../install_schema.sql)	(revision 14973)
+++ branches/5.2.x/core/install/install_schema.sql	(.../install_schema.sql)	(revision 14978)
@@ -481,6 +481,8 @@
   DirectLinkEnabled tinyint(4) NOT NULL DEFAULT '1',
   DirectLinkAuthKey varchar(20) NOT NULL,
   PromoBlockGroupId int(10) unsigned NOT NULL DEFAULT '0',
+  RequireSSL tinyint(4) NOT NULL DEFAULT '0',
+  RequireLogin tinyint(4) NOT NULL DEFAULT '0',
   PRIMARY KEY (CategoryId),
   UNIQUE KEY ResourceId (ResourceId),
   KEY ParentId (ParentId),
Index: branches/5.2.x/core/install/upgrades.sql
===================================================================
diff -u -N -r14973 -r14978
--- branches/5.2.x/core/install/upgrades.sql	(.../upgrades.sql)	(revision 14973)
+++ branches/5.2.x/core/install/upgrades.sql	(.../upgrades.sql)	(revision 14978)
@@ -2519,3 +2519,7 @@
 
 INSERT INTO Events (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'USER.EMAIL.CHANGE.VERIFY', NULL, 1, 0, 'Core', 'Changed E-mail Verification', 0, 1, 1);
 INSERT INTO Events (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'USER.EMAIL.CHANGE.UNDO', NULL, 1, 0, 'Core', 'Changed E-mail Rollback', 0, 1, 1);
+
+ALTER TABLE Category
+    ADD RequireSSL TINYINT NOT NULL DEFAULT '0',
+    ADD RequireLogin TINYINT NOT NULL DEFAULT '0';
Index: branches/5.2.x/core/units/categories/categories_config.php
===================================================================
diff -u -N -r14929 -r14978
--- branches/5.2.x/core/units/categories/categories_config.php	(.../categories_config.php)	(revision 14929)
+++ branches/5.2.x/core/units/categories/categories_config.php	(.../categories_config.php)	(revision 14978)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: categories_config.php 14929 2011-12-28 14:01:17Z alex $
+* @version	$Id: categories_config.php 14978 2012-01-04 09:35:33Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -413,6 +413,16 @@
 				'options_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'PromoBlockGroups ORDER BY Title', 'option_title_field' => 'Title', 'option_key_field' => 'PromoBlockGroupId',
 				'not_null' => 1, 'default' => 0,
 			),
+			'RequireSSL' => Array (
+				'type' => 'int',
+				'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
+				'not_null' => 1, 'default' => 0
+			),
+			'RequireLogin' => Array (
+				'type' => 'int',
+				'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
+				'not_null' => 1, 'default' => 0
+			),
 		),
 
 		'VirtualFields' => Array (
@@ -455,7 +465,8 @@
 					'Type' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
 					'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
 					'Protected' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
-
+					'RequireSSL' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
+					'RequireLogin' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
 				),
 			),
 
@@ -483,6 +494,8 @@
 					'Type' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
 					'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
 					'Protected' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
+					'RequireSSL' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
+					'RequireLogin' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
 				),
 			),
 
@@ -509,6 +522,8 @@
 					'Type' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
 					'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
 					'Protected' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
+					'RequireSSL' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
+					'RequireLogin' => Array ('filter_block' => 'grid_options_filter', 'width' => 100),
 				),
 			),
 		),
Index: branches/5.2.x/admin/system_presets/simple/categories_c.php
===================================================================
diff -u -N -r14929 -r14978
--- branches/5.2.x/admin/system_presets/simple/categories_c.php	(.../categories_c.php)	(revision 14929)
+++ branches/5.2.x/admin/system_presets/simple/categories_c.php	(.../categories_c.php)	(revision 14978)
@@ -38,12 +38,13 @@
 	// fields to hide
 	$hidden_fields = Array (
 		'CategoryId', /*'Type', 'SymLinkCategoryId', 'ParentId', 'Name', 'Filename', 'AutomaticFilename',*/
-		/*'Description',*/ 'CreatedOn', 'EditorsPick', 'Status', 'DirectLinkEnabled', /*'Priority', 'MetaKeywords', 'CachedDescendantCatsQty',
-		'CachedNavbar',*/ 'CreatedById', /*'ResourceId', 'ParentPath', 'TreeLeft', 'TreeRight', 'NamedParentPath',
-		'MetaDescription', 'HotItem',*/ 'NewItem', /*'PopItem', 'Modified', 'ModifiedById', 'CachedTemplate',*/
-		'Template', /*'UseExternalUrl', 'ExternalUrl',*/ 'UseMenuIconUrl', 'MenuIconUrl', 'Title', 'MenuTitle',
-		/*'MetaTitle', 'IndexTools', 'IsMenu',*/'PromoBlockGroupId', 'Protected', 'Type', 'FormId', 'FormSubmittedTemplate',
-		/*'FriendlyURL', 'ThemeId', 'EnablePageCache', 'OverridePageCacheKey', 'PageCacheKey', 'PageExpiration'*/
+		/*'Description',*/ 'CreatedOn', 'EditorsPick', 'Status', 'DirectLinkEnabled', 'RequireSSL', 'RequireLogin',
+		/*'Priority', 'MetaKeywords', 'CachedDescendantCatsQty', 'CachedNavbar',*/ 'CreatedById', /*'ResourceId',
+ 		'ParentPath', 'TreeLeft', 'TreeRight', 'NamedParentPath', 'MetaDescription', 'HotItem',*/ 'NewItem',
+ 		/*'PopItem', 'Modified', 'ModifiedById', 'CachedTemplate',*/ 'Template', /*'UseExternalUrl', 'ExternalUrl',*/
+		'UseMenuIconUrl', 'MenuIconUrl', 'Title', 'MenuTitle', /*'MetaTitle', 'IndexTools', 'IsMenu',*/'
+		PromoBlockGroupId', 'Protected', 'Type', 'FormId', 'FormSubmittedTemplate', /*'FriendlyURL', 'ThemeId',
+ 		'EnablePageCache', 'OverridePageCacheKey', 'PageCacheKey', 'PageExpiration'*/
 	);
 
 	// virtual fields to hide
@@ -73,9 +74,9 @@
 
 	// hide columns in grids
 	$hide_columns = Array (
-		'Default' => Array (/*'CategoryId', 'Name', 'Modified',*/ 'Template', /*'IsMenu',*/ 'Protected', /*'Type',*/ 'Priority'),
-		'DefaultShowAll' => Array (/*'CategoryId', 'Name', 'Modified',*/ 'Template', /*'IsMenu',*/ 'Protected',/*'Type', 'Priority', 'CachedNavbar'*/),
-		'Radio' => Array (/*'CategoryId', 'Name', 'Modified',*/ 'Template', /*'IsMenu',*/ 'Protected', /*'Type',*/ 'Priority'),
-		'RadioShowALl' => Array (/*'CategoryId', 'Name', 'Modified',*/ 'Template', /*'IsMenu',*/ 'Protected'/*, 'Type', 'Priority', 'CachedNavbar'*/),
-		'Structure' => Array (/*'CategoryId', 'Name', 'Modified',*/ 'Template', /*'IsMenu', 'Path',*/ 'Protected',/*'Type',*/ 'Priority'),
+		'Default' => Array (/*'CategoryId', 'Name', 'Modified',*/ 'Template', /*'IsMenu',*/ 'Protected', 'RequireSSL', 'RequireLogin', /*'Type',*/ 'Priority'),
+		'DefaultShowAll' => Array (/*'CategoryId', 'Name', 'Modified',*/ 'Template', /*'IsMenu',*/ 'Protected', 'RequireSSL', 'RequireLogin',/*'Type', 'Priority', 'CachedNavbar'*/),
+		'Radio' => Array (/*'CategoryId', 'Name', 'Modified',*/ 'Template', /*'IsMenu',*/ 'Protected', 'RequireSSL', 'RequireLogin', /*'Type',*/ 'Priority'),
+		'RadioShowALl' => Array (/*'CategoryId', 'Name', 'Modified',*/ 'Template', /*'IsMenu',*/ 'Protected', 'RequireSSL', 'RequireLogin',/*'Type', 'Priority', 'CachedNavbar'*/),
+		'Structure' => Array (/*'CategoryId', 'Name', 'Modified',*/ 'Template', /*'IsMenu', 'Path',*/ 'Protected','RequireSSL', 'RequireLogin',/*'Type',*/ 'Priority'),
 	);
\ No newline at end of file
Index: branches/5.2.x/core/install/english.lang
===================================================================
diff -u -N -r14973 -r14978
--- branches/5.2.x/core/install/english.lang	(.../english.lang)	(revision 14973)
+++ branches/5.2.x/core/install/english.lang	(.../english.lang)	(revision 14978)
@@ -581,6 +581,7 @@
 			<PHRASE Label="la_fld_ReportedOn" Module="Core" Type="1" Column="UmVwb3J0ZWQgT24=">UmVwb3J0ZWQgT24=</PHRASE>
 			<PHRASE Label="la_fld_Required" Module="Core" Type="1" Column="UmVxdWlyZWQ=">UmVxdWlyZWQ=</PHRASE>
 			<PHRASE Label="la_fld_RequireLogin" Module="Core" Type="1" Column="UmVxdWlyZSBMb2dpbg==">UmVxdWlyZSBMb2dpbg==</PHRASE>
+			<PHRASE Label="la_fld_RequireSSL" Module="Core" Type="1" Column="UmVxdWlyZSBTU0w=">UmVxdWlyZSBTU0w=</PHRASE>
 			<PHRASE Label="la_fld_ReviewText" Module="Core" Type="1" Column="Q29tbWVudA==">Q29tbWVudA==</PHRASE>
 			<PHRASE Label="la_fld_RotationDelay" Module="Core" Type="1" Column="UHJvbW8gUm90YXRpb24gRGVsYXkgKHNlY29uZHMp">UHJvbW8gUm90YXRpb24gRGVsYXkgKHNlY29uZHMp</PHRASE>
 			<PHRASE Label="la_fld_RuleType" Module="Core" Type="1" Column="UnVsZSBUeXBl">UnVsZSBUeXBl</PHRASE>