Index: admin/system_presets/simple/categories_c.php
===================================================================
--- admin/system_presets/simple/categories_c.php (revision 14975)
+++ admin/system_presets/simple/categories_c.php (working copy)
@@ -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: core/admin_templates/categories/categories_edit.tpl
===================================================================
--- core/admin_templates/categories/categories_edit.tpl (revision 14975)
+++ core/admin_templates/categories/categories_edit.tpl (working copy)
@@ -147,7 +147,7 @@
-
+
@@ -171,6 +171,9 @@
+
+
+
Index: core/install/english.lang
===================================================================
--- core/install/english.lang (revision 14975)
+++ core/install/english.lang (working copy)
@@ -581,6 +581,7 @@
UmVwb3J0ZWQgT24=
UmVxdWlyZWQ=
UmVxdWlyZSBMb2dpbg==
+ UmVxdWlyZSBTU0w=
Q29tbWVudA==
UHJvbW8gUm90YXRpb24gRGVsYXkgKHNlY29uZHMp
UnVsZSBUeXBl
Index: core/install/install_schema.sql
===================================================================
--- core/install/install_schema.sql (revision 14975)
+++ core/install/install_schema.sql (working copy)
@@ -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: core/install/upgrades.sql
===================================================================
--- core/install/upgrades.sql (revision 14975)
+++ core/install/upgrades.sql (working copy)
@@ -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: core/units/categories/categories_config.php
===================================================================
--- core/units/categories/categories_config.php (revision 14975)
+++ core/units/categories/categories_config.php (working copy)
@@ -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),
),
),
),