Ticket #622 - For Persons and Organizations modules.

modules/boonex/organizations/classes/BxOrgsConfig.php

@@ -15,7 +15,11 @@ class BxOrgsConfig extends BxBaseModProfileConfig
     {
         parent::__construct($aModule);
 
-        $aMenuItems2Methods = array (
+        $aMenuItems2MethodsSubmenu = array (
+        	'organization-profile-subscriptions' => 'checkAllowedSubscriptionsView'
+        );
+
+        $aMenuItems2MethodsActions = array (
             'view-organization-profile' => 'checkAllowedView',
             'edit-organization-profile' => 'checkAllowedEdit',
             'edit-organization-cover' => 'checkAllowedChangeCover',
@@ -49,6 +53,8 @@ class BxOrgsConfig extends BxBaseModProfileConfig
             'FIELD_PICTURE' => 'picture',
             'FIELD_COVER' => 'cover',
             'FIELD_ALLOW_VIEW_TO' => 'allow_view_to',
+        	'FIELD_PUB_SBSN' => 'public_subscriptions',
+        	'FIELD_PUB_SBSD' => 'public_subscribed_me',
             'FIELDS_QUICK_SEARCH' => array('org_name'),
             'FIELDS_WITH_KEYWORDS' => 'auto', // can be 'auto', array of fields or comma separated string of field names, works only when OBJECT_METATAGS is specified
 
@@ -116,8 +122,9 @@ class BxOrgsConfig extends BxBaseModProfileConfig
 
             // menu items which visibility depends on custom visibility checking
             'MENU_ITEM_TO_METHOD' => array (
-                'bx_organizations_view_actions' => $aMenuItems2Methods,
-                'bx_organizations_view_actions_more' => $aMenuItems2Methods,
+        		'bx_organizations_view_submenu' => $aMenuItems2MethodsSubmenu,
+                'bx_organizations_view_actions' => $aMenuItems2MethodsActions,
+                'bx_organizations_view_actions_more' => $aMenuItems2MethodsActions,
             ),
 
             // informer messages

modules/boonex/organizations/install/langs/en.xml

@@ -20,6 +20,10 @@
     <string name="_bx_orgs_form_profile_input_sys_do_submit"><![CDATA[Submit]]></string>
     <string name="_bx_orgs_form_profile_input_sys_allow_view_to"><![CDATA[Visible to]]></string>
     <string name="_bx_orgs_form_profile_input_allow_view_to"><![CDATA[Visible to]]></string>
+    <string name="_bx_orgs_form_profile_input_sys_public_subscriptions"><![CDATA[Public subscriptions list]]></string>
+    <string name="_bx_orgs_form_profile_input_public_subscriptions"><![CDATA[Public subscriptions list]]></string>
+    <string name="_bx_orgs_form_profile_input_sys_public_subscribed_me"><![CDATA[Public subscribers list]]></string>
+    <string name="_bx_orgs_form_profile_input_public_subscribed_me"><![CDATA[Public subscribers list]]></string>
     <string name="_bx_orgs_form_profile_input_sys_org_name"><![CDATA[Organization Name]]></string>
     <string name="_bx_orgs_form_profile_input_org_name"><![CDATA[Organization Name]]></string>
     <string name="_bx_orgs_form_profile_input_org_name_err"><![CDATA[This information is essential. Please, fill in this field.]]></string>
@@ -68,9 +72,7 @@
 	<string name="_bx_orgs_page_title_sys_profile_friends"><![CDATA[Friends]]></string>
 	<string name="_bx_orgs_page_title_profile_friends"><![CDATA[Friends]]></string>
 	<string name="_bx_orgs_page_title_sys_profile_subscriptions"><![CDATA[Subscriptions]]></string>
-    <string name="_bx_orgs_page_title_profile_subscriptions"><![CDATA[Subscriptions]]></string>
-    <string name="_bx_orgs_page_title_sys_profile_subscribed_me"><![CDATA[Subscribed Us]]></string>
-    <string name="_bx_orgs_page_title_profile_subscribed_me"><![CDATA[Subscribed Us]]></string>
+    <string name="_bx_orgs_page_title_profile_subscriptions"><![CDATA[Subscriptions & Subscribers]]></string>
 	<string name="_bx_orgs_page_title_sys_profile_info"><![CDATA[Profile Info]]></string>
 	<string name="_bx_orgs_page_title_profile_info"><![CDATA[Info about {display_name}]]></string>
 	<string name="_bx_orgs_page_title_sys_recent"><![CDATA[New Organizations]]></string>
@@ -100,10 +102,10 @@
 	<string name="_bx_orgs_page_block_title_profile_friends_link"><![CDATA[Friends of <a href="{profile_link}">{display_name}</a>]]></string>
 	<string name="_bx_orgs_page_block_title_profile_friends"><![CDATA[Friends]]></string>
 	<string name="_bx_orgs_page_block_title_system_profile_friends"><![CDATA[Friends]]></string>
-	<string name="_bx_orgs_page_block_title_system_profile_subscriptions"><![CDATA[Subscriptions]]></string>
-    <string name="_bx_orgs_page_block_title_profile_subscriptions"><![CDATA[Subscriptions]]></string>
-    <string name="_bx_orgs_page_block_title_system_profile_subscribed_me"><![CDATA[Subscribed Us]]></string>
-    <string name="_bx_orgs_page_block_title_profile_subscribed_me"><![CDATA[Subscribed Us]]></string>
+	<string name="_bx_orgs_page_block_title_system_profile_subscriptions"><![CDATA[Our Subscriptions]]></string>
+    <string name="_bx_orgs_page_block_title_profile_subscriptions"><![CDATA[Our Subscriptions]]></string>
+    <string name="_bx_orgs_page_block_title_system_profile_subscribed_me"><![CDATA[Our Subscribers]]></string>
+    <string name="_bx_orgs_page_block_title_profile_subscribed_me"><![CDATA[Our Subscribers]]></string>
 	<string name="_bx_orgs_page_block_title_profile_actions"><![CDATA[Actions]]></string>
 	<string name="_bx_orgs_page_block_title_featured_profiles"><![CDATA[Featured Organizations]]></string>
 	<string name="_bx_orgs_page_block_title_latest_profiles"><![CDATA[New Organizations]]></string>

modules/boonex/organizations/install/sql/disable.sql

@@ -10,7 +10,7 @@ DELETE FROM `sys_options_types` WHERE `id` = @iTypeId;
 -- PAGES
 
 DELETE FROM `sys_objects_page` WHERE `module` = 'bx_organizations';
-DELETE FROM `sys_pages_blocks` WHERE `module` = 'bx_organizations' OR `object` IN('bx_organizations_create_profile', 'bx_organizations_delete_profile', 'bx_organizations_edit_profile', 'bx_organizations_edit_profile_cover', 'bx_organizations_view_profile', 'bx_organizations_view_profile_closed', 'bx_organizations_profile_info', 'bx_organizations_profile_friends', 'bx_organizations_profile_favorites', 'bx_organizations_profile_subscriptions', 'bx_organizations_profile_subscribed_me', 'bx_organizations_home');
+DELETE FROM `sys_pages_blocks` WHERE `module` = 'bx_organizations' OR `object` IN('bx_organizations_create_profile', 'bx_organizations_delete_profile', 'bx_organizations_edit_profile', 'bx_organizations_edit_profile_cover', 'bx_organizations_view_profile', 'bx_organizations_view_profile_closed', 'bx_organizations_profile_info', 'bx_organizations_profile_friends', 'bx_organizations_profile_favorites', 'bx_organizations_profile_subscriptions', 'bx_organizations_home');
 
 -- MENU
 

modules/boonex/organizations/install/sql/enable.sql

@@ -99,14 +99,8 @@ INSERT INTO `sys_objects_page`(`object`, `uri`, `title_system`, `title`, `module
 ('bx_organizations_profile_subscriptions', 'organization-profile-subscriptions', '_bx_orgs_page_title_sys_profile_subscriptions', '_bx_orgs_page_title_profile_subscriptions', 'bx_organizations', 5, 2147483647, 1, 'page.php?i=organization-profile-subscriptions', '', '', '', 0, 1, 0, 'BxOrgsPageEntry', 'modules/boonex/organizations/classes/BxOrgsPageEntry.php');
 
 INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title_system`, `title`, `designbox_id`, `visible_for_levels`, `type`, `content`, `deletable`, `copyable`, `active`, `order`) VALUES 
-('bx_organizations_profile_subscriptions', 1, 'bx_organizations', '_bx_orgs_page_block_title_system_profile_subscriptions', '_bx_orgs_page_block_title_profile_subscriptions', 11, 2147483647, 'service', 'a:3:{s:6:\"module\";s:6:\"system\";s:6:\"method\";s:19:\"subscriptions_table\";s:5:\"class\";s:23:\"TemplServiceConnections\";}', 0, 1, 1, 1);
-
--- PAGE: profile subscribed me
-INSERT INTO `sys_objects_page`(`object`, `uri`, `title_system`, `title`, `module`, `layout_id`, `visible_for_levels`, `visible_for_levels_editable`, `url`, `meta_description`, `meta_keywords`, `meta_robots`, `cache_lifetime`, `cache_editable`, `deletable`, `override_class_name`, `override_class_file`) VALUES 
-('bx_organizations_profile_subscribed_me', 'organization-profile-subscribed-me', '_bx_orgs_page_title_sys_profile_subscribed_me', '_bx_orgs_page_title_profile_subscribed_me', 'bx_organizations', 5, 2147483647, 1, 'page.php?i=organization-profile-subscribed-me', '', '', '', 0, 1, 0, 'BxOrgsPageEntry', 'modules/boonex/organizations/classes/BxOrgsPageEntry.php');
-
-INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title_system`, `title`, `designbox_id`, `visible_for_levels`, `type`, `content`, `deletable`, `copyable`, `active`, `order`) VALUES 
-('bx_organizations_profile_subscribed_me', 1, 'bx_organizations', '_bx_orgs_page_block_title_system_profile_subscribed_me', '_bx_orgs_page_block_title_profile_subscribed_me', 11, 2147483647, 'service', 'a:3:{s:6:\"module\";s:6:\"system\";s:6:\"method\";s:19:\"subscribed_me_table\";s:5:\"class\";s:23:\"TemplServiceConnections\";}', 0, 1, 1, 1);
+('bx_organizations_profile_subscriptions', 1, 'bx_organizations', '_bx_orgs_page_block_title_system_profile_subscriptions', '_bx_orgs_page_block_title_profile_subscriptions', 11, 2147483647, 'service', 'a:3:{s:6:\"module\";s:6:\"system\";s:6:\"method\";s:19:\"subscriptions_table\";s:5:\"class\";s:23:\"TemplServiceConnections\";}', 0, 1, 1, 1),
+('bx_organizations_profile_subscriptions', 1, 'bx_organizations', '_bx_orgs_page_block_title_system_profile_subscribed_me', '_bx_orgs_page_block_title_profile_subscribed_me', 11, 2147483647, 'service', 'a:3:{s:6:\"module\";s:6:\"system\";s:6:\"method\";s:19:\"subscribed_me_table\";s:5:\"class\";s:23:\"TemplServiceConnections\";}', 0, 1, 1, 2);
 
 -- PAGE: module home
 INSERT INTO `sys_objects_page`(`object`, `title_system`, `title`, `module`, `layout_id`, `visible_for_levels`, `visible_for_levels_editable`, `uri`, `url`, `meta_description`, `meta_keywords`, `meta_robots`, `cache_lifetime`, `cache_editable`, `deletable`, `override_class_name`, `override_class_file`) VALUES 
@@ -236,7 +230,7 @@ INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `titl
 ('bx_organizations_view_submenu', 'bx_organizations', 'view-organization-profile', '_bx_orgs_menu_item_title_system_view_profile_view', '_bx_orgs_menu_item_title_view_profile_view', 'page.php?i=view-organization-profile&id={content_id}', '', '', 'briefcase col-red2', '', 2147483647, 1, 0, 1),
 ('bx_organizations_view_submenu', 'bx_organizations', 'organization-profile-info', '_bx_orgs_menu_item_title_system_view_profile_info', '_bx_orgs_menu_item_title_view_profile_info', 'page.php?i=organization-profile-info&id={content_id}', '', '', 'info-circle col-gray', '', 2147483647, 1, 0, 2),
 ('bx_organizations_view_submenu', 'bx_organizations', 'organization-profile-friends', '_bx_orgs_menu_item_title_system_view_profile_friends', '_bx_orgs_menu_item_title_view_profile_friends', 'page.php?i=organization-profile-friends&profile_id={profile_id}', '', '', 'group col-blue3', '', 2147483647, 1, 0, 3),
-('bx_organizations_view_submenu', 'bx_organizations', 'organization-profile-subscriptions', '_bx_orgs_menu_item_title_system_view_profile_subscriptions', '_bx_orgs_menu_item_title_view_profile_subscriptions', 'page.php?i=organization-profile-subscriptions&profile_id={profile_id}', '', '', 'check col-blue3', '', 2147483647, 0, 0, 4);
+('bx_organizations_view_submenu', 'bx_organizations', 'organization-profile-subscriptions', '_bx_orgs_menu_item_title_system_view_profile_subscriptions', '_bx_orgs_menu_item_title_view_profile_subscriptions', 'page.php?i=organization-profile-subscriptions&profile_id={profile_id}', '', '', 'check col-blue3', '', 2147483647, 1, 0, 4);
 
 -- MENU: notifications menu in account popup
 

modules/boonex/organizations/install/sql/install.sql

@@ -12,6 +12,8 @@ CREATE TABLE IF NOT EXISTS `bx_organizations_data` (
   `org_name` varchar(255) NOT NULL,
   `org_cat` int(11) NOT NULL,
   `org_desc` text NOT NULL,
+  `public_subscriptions` tinyint(4) NOT NULL DEFAULT '0',
+  `public_subscribed_me` tinyint(4) NOT NULL DEFAULT '0',
   `views` int(11) NOT NULL default '0',
   `favorites` int(11) NOT NULL default '0',
   `reports` int(11) NOT NULL default '0',
@@ -141,18 +143,20 @@ INSERT INTO `sys_form_inputs`(`object`, `module`, `name`, `value`, `values`, `ch
 ('bx_organization', 'bx_organizations', 'org_cat', '', '#!bx_organizations_cats', 0, 'select', '_bx_orgs_form_profile_input_sys_org_cat', '_bx_orgs_form_profile_input_org_cat', '', 1, 0, 0, '', '', '', 'avail', '', '_bx_orgs_form_profile_input_org_cat_err', 'Xss', '', 1, 1),
 ('bx_organization', 'bx_organizations', 'org_name', '', '', 0, 'text', '_bx_orgs_form_profile_input_sys_org_name', '_bx_orgs_form_profile_input_org_name', '', 1, 0, 0, '', '', '', 'avail', '', '_bx_orgs_form_profile_input_org_name_err', 'Xss', '', 1, 0),
 ('bx_organization', 'bx_organizations', 'cover', 'a:1:{i:0;s:27:"bx_organizations_cover_crop";}', 'a:1:{s:27:"bx_organizations_cover_crop";s:24:"_sys_uploader_crop_title";}', 0, 'files', '_bx_orgs_form_profile_input_sys_cover', '_bx_orgs_form_profile_input_cover', '', 0, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
-('bx_organization', 'bx_organizations', 'picture', 'a:1:{i:0;s:29:"bx_organizations_picture_crop";}', 'a:1:{s:29:"bx_organizations_picture_crop";s:24:"_sys_uploader_crop_title";}', 0, 'files', '_bx_orgs_form_profile_input_sys_picture', '_bx_orgs_form_profile_input_picture', '', 0, 0, 0, '', '', '', '', '', '_bx_orgs_form_profile_input_picture_err', '', '', 1, 0);
+('bx_organization', 'bx_organizations', 'picture', 'a:1:{i:0;s:29:"bx_organizations_picture_crop";}', 'a:1:{s:29:"bx_organizations_picture_crop";s:24:"_sys_uploader_crop_title";}', 0, 'files', '_bx_orgs_form_profile_input_sys_picture', '_bx_orgs_form_profile_input_picture', '', 0, 0, 0, '', '', '', '', '', '_bx_orgs_form_profile_input_picture_err', '', '', 1, 0),
+('bx_organization', 'bx_organizations', 'public_subscriptions', 1, '', 0, 'checkbox', '_bx_orgs_form_profile_input_sys_public_subscriptions', '_bx_orgs_form_profile_input_public_subscriptions', '', 0, 0, 0, '', '', '', '', '', '', 'Int', '', 1, 0),
+('bx_organization', 'bx_organizations', 'public_subscribed_me', 1, '', 0, 'checkbox', '_bx_orgs_form_profile_input_sys_public_subscribed_me', '_bx_orgs_form_profile_input_public_subscribed_me', '', 0, 0, 0, '', '', '', '', '', '', 'Int', '', 1, 0);
 
 
 INSERT INTO `sys_form_display_inputs`(`display_name`, `input_name`, `visible_for_levels`, `active`, `order`) VALUES 
-('bx_organization_add', 'delete_confirm', 2147483647, 0, 3),
-('bx_organization_add', 'cover', 2147483647, 0, 4),
-('bx_organization_add', 'picture', 2147483647, 1, 5),
-('bx_organization_add', 'org_name', 2147483647, 1, 6),
-('bx_organization_add', 'org_cat', 2147483647, 1, 7),
-('bx_organization_add', 'org_desc', 2147483647, 1, 8),
-('bx_organization_add', 'allow_view_to', 2147483647, 1, 9),
-('bx_organization_add', 'do_submit', 2147483647, 1, 10),
+('bx_organization_add', 'picture', 2147483647, 1, 1),
+('bx_organization_add', 'org_name', 2147483647, 1, 2),
+('bx_organization_add', 'org_cat', 2147483647, 1, 3),
+('bx_organization_add', 'org_desc', 2147483647, 1, 4),
+('bx_organization_add', 'allow_view_to', 2147483647, 1, 5),
+('bx_organization_add', 'public_subscriptions', 2147483647, 1, 6),
+('bx_organization_add', 'public_subscribed_me', 2147483647, 1, 7),
+('bx_organization_add', 'do_submit', 2147483647, 1, 8),
 
 ('bx_organization_delete', 'picture', 2147483647, 0, 0),
 ('bx_organization_delete', 'delete_confirm', 2147483647, 1, 0),
@@ -161,14 +165,14 @@ INSERT INTO `sys_form_display_inputs`(`display_name`, `input_name`, `visible_for
 ('bx_organization_delete', 'org_name', 2147483647, 0, 2),
 ('bx_organization_delete', 'org_cat', 2147483647, 0, 3),
 
-('bx_organization_edit', 'delete_confirm', 2147483647, 0, 2),
-('bx_organization_edit', 'cover', 2147483647, 0, 3),
-('bx_organization_edit', 'picture', 2147483647, 1, 5),
-('bx_organization_edit', 'org_name', 2147483647, 1, 6),
-('bx_organization_edit', 'org_cat', 2147483647, 1, 7),
-('bx_organization_edit', 'org_desc', 2147483647, 1, 8),
-('bx_organization_edit', 'allow_view_to', 2147483647, 1, 9),
-('bx_organization_edit', 'do_submit', 2147483647, 1, 10),
+('bx_organization_edit', 'picture', 2147483647, 1, 1),
+('bx_organization_edit', 'org_name', 2147483647, 1, 2),
+('bx_organization_edit', 'org_cat', 2147483647, 1, 3),
+('bx_organization_edit', 'org_desc', 2147483647, 1, 4),
+('bx_organization_edit', 'allow_view_to', 2147483647, 1, 5),
+('bx_organization_edit', 'public_subscriptions', 2147483647, 1, 6),
+('bx_organization_edit', 'public_subscribed_me', 2147483647, 1, 7),
+('bx_organization_edit', 'do_submit', 2147483647, 1, 8),
 
 ('bx_organization_edit_cover', 'delete_confirm', 2147483647, 0, 1),
 ('bx_organization_edit_cover', 'org_name', 2147483647, 0, 2),

modules/boonex/persons/classes/BxPersonsConfig.php

@@ -15,7 +15,11 @@ class BxPersonsConfig extends BxBaseModProfileConfig
     {
         parent::__construct($aModule);
 
-        $aMenuItems2Methods = array (
+        $aMenuItems2MethodsSubmenu = array (
+        	'persons-profile-subscriptions' => 'checkAllowedSubscriptionsView'
+        );
+
+        $aMenuItems2MethodsActions = array (
             'view-persons-profile' => 'checkAllowedView',
             'edit-persons-profile' => 'checkAllowedEdit',
             'edit-persons-cover' => 'checkAllowedChangeCover',
@@ -49,6 +53,8 @@ class BxPersonsConfig extends BxBaseModProfileConfig
             'FIELD_PICTURE' => 'picture',
             'FIELD_COVER' => 'cover',
             'FIELD_ALLOW_VIEW_TO' => 'allow_view_to',
+        	'FIELD_PUB_SBSN' => 'public_subscriptions',
+        	'FIELD_PUB_SBSD' => 'public_subscribed_me',
             'FIELDS_QUICK_SEARCH' => array('fullname'),
             'FIELDS_WITH_KEYWORDS' => 'auto', // can be 'auto', array of fields or comma separated string of field names, works only when OBJECT_METATAGS is specified
 
@@ -116,8 +122,9 @@ class BxPersonsConfig extends BxBaseModProfileConfig
 
             // menu items which visibility depends on custom visibility checking
             'MENU_ITEM_TO_METHOD' => array (
-                'bx_persons_view_actions' => $aMenuItems2Methods,
-                'bx_persons_view_actions_more' => $aMenuItems2Methods,
+                'bx_persons_view_submenu' => $aMenuItems2MethodsSubmenu,
+                'bx_persons_view_actions' => $aMenuItems2MethodsActions,
+                'bx_persons_view_actions_more' => $aMenuItems2MethodsActions,
             ),
 
             // informer messages

modules/boonex/persons/install/langs/en.xml

@@ -21,6 +21,10 @@
     <string name="_bx_persons_form_profile_input_submit"><![CDATA[Submit]]></string>
     <string name="_bx_persons_form_profile_input_sys_allow_view_to"><![CDATA[Visible to]]></string>
     <string name="_bx_persons_form_profile_input_allow_view_to"><![CDATA[Visible to]]></string>
+    <string name="_bx_persons_form_profile_input_sys_public_subscriptions"><![CDATA[Public subscriptions list]]></string>
+    <string name="_bx_persons_form_profile_input_public_subscriptions"><![CDATA[Public subscriptions list]]></string>
+    <string name="_bx_persons_form_profile_input_sys_public_subscribed_me"><![CDATA[Public subscribers list]]></string>
+    <string name="_bx_persons_form_profile_input_public_subscribed_me"><![CDATA[Public subscribers list]]></string>
 	<string name="_bx_persons_form_profile_input_sys_fullname"><![CDATA[Full Name]]></string>
 	<string name="_bx_persons_form_profile_input_fullname"><![CDATA[Full Name]]></string>
 	<string name="_bx_persons_form_profile_input_fullname_err"><![CDATA[This information is essential. Please, fill in this field.]]></string>
@@ -66,9 +70,7 @@
 	<string name="_bx_persons_page_title_sys_profile_friends"><![CDATA[Friends]]></string>
 	<string name="_bx_persons_page_title_profile_friends"><![CDATA[Friends]]></string>
 	<string name="_bx_persons_page_title_sys_profile_subscriptions"><![CDATA[Subscriptions]]></string>
-    <string name="_bx_persons_page_title_profile_subscriptions"><![CDATA[Subscriptions]]></string>
-    <string name="_bx_persons_page_title_sys_profile_subscribed_me"><![CDATA[Subscribed Me]]></string>
-    <string name="_bx_persons_page_title_profile_subscribed_me"><![CDATA[Subscribed Me]]></string>
+    <string name="_bx_persons_page_title_profile_subscriptions"><![CDATA[Subscriptions & Subscribers]]></string>
 	<string name="_bx_persons_page_title_sys_profile_info"><![CDATA[Profile Info]]></string>
 	<string name="_bx_persons_page_title_profile_info"><![CDATA[Info about {display_name}]]></string>
 	<string name="_bx_persons_page_title_sys_recent"><![CDATA[New People]]></string>
@@ -98,10 +100,10 @@
 	<string name="_bx_persons_page_block_title_profile_friends_link"><![CDATA[Friends of <a href="{profile_link}">{display_name}</a>]]></string>
 	<string name="_bx_persons_page_block_title_profile_friends"><![CDATA[Friends]]></string>
 	<string name="_bx_persons_page_block_title_system_profile_friends"><![CDATA[Friends]]></string>
-	<string name="_bx_persons_page_block_title_system_profile_subscriptions"><![CDATA[Subscriptions]]></string>
-	<string name="_bx_persons_page_block_title_profile_subscriptions"><![CDATA[Subscriptions]]></string>
-	<string name="_bx_persons_page_block_title_system_profile_subscribed_me"><![CDATA[Subscribed Me]]></string>
-    <string name="_bx_persons_page_block_title_profile_subscribed_me"><![CDATA[Subscribed Me]]></string>
+	<string name="_bx_persons_page_block_title_system_profile_subscriptions"><![CDATA[My Subscriptions]]></string>
+	<string name="_bx_persons_page_block_title_profile_subscriptions"><![CDATA[My Subscriptions]]></string>
+	<string name="_bx_persons_page_block_title_system_profile_subscribed_me"><![CDATA[My Subscribers]]></string>
+    <string name="_bx_persons_page_block_title_profile_subscribed_me"><![CDATA[My Subscribers]]></string>
 	<string name="_bx_persons_page_block_title_featured_profiles"><![CDATA[Featured People]]></string>
 	<string name="_bx_persons_page_block_title_profile_actions"><![CDATA[Actions]]></string>
 	<string name="_bx_persons_page_block_title_latest_profiles"><![CDATA[New People]]></string>

modules/boonex/persons/install/sql/disable.sql

@@ -10,7 +10,7 @@ DELETE FROM `sys_options_types` WHERE `id` = @iTypeId;
 -- PAGES
 
 DELETE FROM `sys_objects_page` WHERE `module` = 'bx_persons';
-DELETE FROM `sys_pages_blocks` WHERE `module` = 'bx_persons' OR `object` IN('bx_persons_create_profile', 'bx_persons_delete_profile', 'bx_persons_edit_profile', 'bx_persons_edit_profile_cover', 'bx_persons_view_profile', 'bx_persons_view_profile_closed', 'bx_persons_profile_info', 'bx_persons_profile_friends', 'bx_persons_profile_favorites', 'bx_persons_profile_subscriptions', 'bx_persons_profile_subscribed_me', 'bx_persons_home');
+DELETE FROM `sys_pages_blocks` WHERE `module` = 'bx_persons' OR `object` IN('bx_persons_create_profile', 'bx_persons_delete_profile', 'bx_persons_edit_profile', 'bx_persons_edit_profile_cover', 'bx_persons_view_profile', 'bx_persons_view_profile_closed', 'bx_persons_profile_info', 'bx_persons_profile_friends', 'bx_persons_profile_favorites', 'bx_persons_profile_subscriptions', 'bx_persons_home');
 
 -- MENU
 

modules/boonex/persons/install/sql/enable.sql

@@ -94,15 +94,8 @@ INSERT INTO `sys_objects_page`(`object`, `uri`, `title_system`, `title`, `module
 ('bx_persons_profile_subscriptions', 'persons-profile-subscriptions', '_bx_persons_page_title_sys_profile_subscriptions', '_bx_persons_page_title_profile_subscriptions', 'bx_persons', 5, 2147483647, 1, 'page.php?i=persons-profile-subscriptions', '', '', '', 0, 1, 0, 'BxPersonsPageEntry', 'modules/boonex/persons/classes/BxPersonsPageEntry.php');
 
 INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title_system`, `title`, `designbox_id`, `visible_for_levels`, `type`, `content`, `deletable`, `copyable`, `active`, `order`) VALUES 
-('bx_persons_profile_subscriptions', 1, 'bx_persons', '_bx_persons_page_block_title_system_profile_subscriptions', '_bx_persons_page_block_title_profile_subscriptions', 11, 2147483647, 'service', 'a:3:{s:6:\"module\";s:6:\"system\";s:6:\"method\";s:19:\"subscriptions_table\";s:5:\"class\";s:23:\"TemplServiceConnections\";}', 0, 1, 1, 1);
-
--- PAGE: profile subscribed me
-INSERT INTO `sys_objects_page`(`object`, `uri`, `title_system`, `title`, `module`, `layout_id`, `visible_for_levels`, `visible_for_levels_editable`, `url`, `meta_description`, `meta_keywords`, `meta_robots`, `cache_lifetime`, `cache_editable`, `deletable`, `override_class_name`, `override_class_file`) VALUES 
-('bx_persons_profile_subscribed_me', 'persons-profile-subscribed-me', '_bx_persons_page_title_sys_profile_subscribed_me', '_bx_persons_page_title_profile_subscribed_me', 'bx_persons', 5, 2147483647, 1, 'page.php?i=persons-profile-subscribed-me', '', '', '', 0, 1, 0, 'BxPersonsPageEntry', 'modules/boonex/persons/classes/BxPersonsPageEntry.php');
-
-INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title_system`, `title`, `designbox_id`, `visible_for_levels`, `type`, `content`, `deletable`, `copyable`, `active`, `order`) VALUES 
-('bx_persons_profile_subscribed_me', 1, 'bx_persons', '_bx_persons_page_block_title_system_profile_subscribed_me', '_bx_persons_page_block_title_profile_subscribed_me', 11, 2147483647, 'service', 'a:3:{s:6:\"module\";s:6:\"system\";s:6:\"method\";s:19:\"subscribed_me_table\";s:5:\"class\";s:23:\"TemplServiceConnections\";}', 0, 1, 1, 1);
-
+('bx_persons_profile_subscriptions', 1, 'bx_persons', '_bx_persons_page_block_title_system_profile_subscriptions', '_bx_persons_page_block_title_profile_subscriptions', 11, 2147483647, 'service', 'a:3:{s:6:\"module\";s:6:\"system\";s:6:\"method\";s:19:\"subscriptions_table\";s:5:\"class\";s:23:\"TemplServiceConnections\";}', 0, 1, 1, 1),
+('bx_persons_profile_subscriptions', 1, 'bx_persons', '_bx_persons_page_block_title_system_profile_subscribed_me', '_bx_persons_page_block_title_profile_subscribed_me', 11, 2147483647, 'service', 'a:3:{s:6:\"module\";s:6:\"system\";s:6:\"method\";s:19:\"subscribed_me_table\";s:5:\"class\";s:23:\"TemplServiceConnections\";}', 0, 1, 1, 2);
 
 -- PAGE: module home
 INSERT INTO `sys_objects_page`(`object`, `title_system`, `title`, `module`, `layout_id`, `visible_for_levels`, `visible_for_levels_editable`, `uri`, `url`, `meta_description`, `meta_keywords`, `meta_robots`, `cache_lifetime`, `cache_editable`, `deletable`, `override_class_name`, `override_class_file`) VALUES 
@@ -226,7 +219,7 @@ INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `titl
 ('bx_persons_view_submenu', 'bx_persons', 'view-persons-profile', '_bx_persons_menu_item_title_system_view_profile_view', '_bx_persons_menu_item_title_view_profile_view', 'page.php?i=view-persons-profile&id={content_id}', '', '', 'user col-blue3', '', 2147483647, 1, 0, 1),
 ('bx_persons_view_submenu', 'bx_persons', 'persons-profile-info', '_bx_persons_menu_item_title_system_view_profile_info', '_bx_persons_menu_item_title_view_profile_info', 'page.php?i=persons-profile-info&id={content_id}', '', '', 'info-circle col-gray', '', 2147483647, 1, 0, 2),
 ('bx_persons_view_submenu', 'bx_persons', 'persons-profile-friends', '_bx_persons_menu_item_title_system_view_profile_friends', '_bx_persons_menu_item_title_view_profile_friends', 'page.php?i=persons-profile-friends&profile_id={profile_id}', '', '', 'group col-blue3', '', 2147483647, 1, 0, 3),
-('bx_persons_view_submenu', 'bx_persons', 'persons-profile-subscriptions', '_bx_persons_menu_item_title_system_view_profile_subscriptions', '_bx_persons_menu_item_title_view_profile_subscriptions', 'page.php?i=persons-profile-subscriptions&profile_id={profile_id}', '', '', 'check col-blue3', '', 2147483647, 0, 0, 4);
+('bx_persons_view_submenu', 'bx_persons', 'persons-profile-subscriptions', '_bx_persons_menu_item_title_system_view_profile_subscriptions', '_bx_persons_menu_item_title_view_profile_subscriptions', 'page.php?i=persons-profile-subscriptions&profile_id={profile_id}', '', '', 'check col-blue3', '', 2147483647, 1, 0, 4);
 
 -- MENU: notifications menu in account popup
 SET @iNotifMenuOrder = (SELECT `order` FROM `sys_menu_items` WHERE `set_name` = 'sys_account_notifications' AND `active` = 1 ORDER BY `order` DESC LIMIT 1);
@@ -240,7 +233,7 @@ INSERT INTO `sys_menu_items` (`set_name`, `module`, `name`, `title_system`, `tit
 ('sys_profile_stats', 'bx_persons', 'profile-stats-manage-profiles', '_bx_persons_menu_item_title_system_manage_my_profiles', '_bx_persons_menu_item_title_manage_my_profiles', 'page.php?i=persons-manage', '', '_self', 'group col-blue3', 'a:2:{s:6:"module";s:10:"bx_persons";s:6:"method";s:41:"get_menu_addon_manage_tools_profile_stats";}', '', 2147483646, 1, 0, @iNotifMenuOrder + 2),
 ('sys_profile_stats', 'bx_persons', 'profile-stats-favorite-persons', '_bx_persons_menu_item_title_system_favorites', '_bx_persons_menu_item_title_favorites', 'page.php?i=persons-profile-favorites&profile_id={member_id}', '', '', 'star col-blue3', 'a:2:{s:6:"module";s:10:"bx_persons";s:6:"method";s:38:"get_menu_addon_favorites_profile_stats";}', '', 2147483646, 1, 0, @iNotifMenuOrder + 3),
 ('sys_profile_stats', 'bx_persons', 'profile-stats-subscriptions', '_bx_persons_menu_item_title_system_subscriptions', '_bx_persons_menu_item_title_subscriptions', 'page.php?i=persons-profile-subscriptions&profile_id={member_id}', '', '_self', 'group col-blue3', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:25:"get_connected_content_num";s:6:"params";a:1:{i:0;s:26:"sys_profiles_subscriptions";}s:5:"class";s:23:"TemplServiceConnections";}', '', 2147483646, 1, 0, @iNotifMenuOrder + 4),
-('sys_profile_stats', 'bx_persons', 'profile-stats-subscribed-me', '_bx_persons_menu_item_title_system_subscribed_me', '_bx_persons_menu_item_title_subscribed_me', 'page.php?i=persons-profile-subscribed-me&profile_id={member_id}', '', '_self', 'group col-blue3', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:28:"get_connected_initiators_num";s:6:"params";a:1:{i:0;s:26:"sys_profiles_subscriptions";}s:5:"class";s:23:"TemplServiceConnections";}', '', 2147483646, 1, 0, @iNotifMenuOrder + 5);
+('sys_profile_stats', 'bx_persons', 'profile-stats-subscribed-me', '_bx_persons_menu_item_title_system_subscribed_me', '_bx_persons_menu_item_title_subscribed_me', 'page.php?i=persons-profile-subscriptions&profile_id={member_id}', '', '_self', 'group col-blue3', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:28:"get_connected_initiators_num";s:6:"params";a:1:{i:0;s:26:"sys_profiles_subscriptions";}s:5:"class";s:23:"TemplServiceConnections";}', '', 2147483646, 1, 0, @iNotifMenuOrder + 5);
 
 -- MENU: manage tools submenu
 INSERT INTO `sys_objects_menu`(`object`, `title`, `set_name`, `module`, `template_id`, `deletable`, `active`, `override_class_name`, `override_class_file`) VALUES 

modules/boonex/persons/install/sql/install.sql

@@ -11,6 +11,8 @@ CREATE TABLE IF NOT EXISTS `bx_persons_data` (
   `cover` int(11) NOT NULL,
   `fullname` varchar(255) NOT NULL,
   `description` text NOT NULL,
+  `public_subscriptions` tinyint(4) NOT NULL DEFAULT '0',
+  `public_subscribed_me` tinyint(4) NOT NULL DEFAULT '0',
   `views` int(11) NOT NULL default '0',
   `favorites` int(11) NOT NULL default '0',
   `reports` int(11) NOT NULL default '0',
@@ -139,17 +141,19 @@ INSERT INTO `sys_form_inputs`(`object`, `module`, `name`, `value`, `values`, `ch
 ('bx_person', 'bx_persons', 'description', '', '', 0, 'textarea', '_bx_persons_form_profile_input_sys_desc', '_bx_persons_form_profile_input_desc', '', 0, 0, 0, '', '', '', '', '', '', 'XssMultiline', '', 1, 1),
 ('bx_person', 'bx_persons', 'fullname', '', '', 0, 'text', '_bx_persons_form_profile_input_sys_fullname', '_bx_persons_form_profile_input_fullname', '', 1, 0, 0, '', '', '', 'Avail', '', '_bx_persons_form_profile_input_fullname_err', 'Xss', '', 1, 0),
 ('bx_person', 'bx_persons', 'cover', 'a:1:{i:0;s:21:"bx_persons_cover_crop";}', 'a:1:{s:21:"bx_persons_cover_crop";s:24:"_sys_uploader_crop_title";}', 0, 'files', '_bx_persons_form_profile_input_sys_cover', '_bx_persons_form_profile_input_cover', '', 0, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
-('bx_person', 'bx_persons', 'picture', 'a:1:{i:0;s:23:"bx_persons_picture_crop";}', 'a:1:{s:23:"bx_persons_picture_crop";s:24:"_sys_uploader_crop_title";}', 0, 'files', '_bx_persons_form_profile_input_sys_picture', '_bx_persons_form_profile_input_picture', '', 0, 0, 0, '', '', '', '', '', '_bx_persons_form_profile_input_picture_err', '', '', 1, 0);
+('bx_person', 'bx_persons', 'picture', 'a:1:{i:0;s:23:"bx_persons_picture_crop";}', 'a:1:{s:23:"bx_persons_picture_crop";s:24:"_sys_uploader_crop_title";}', 0, 'files', '_bx_persons_form_profile_input_sys_picture', '_bx_persons_form_profile_input_picture', '', 0, 0, 0, '', '', '', '', '', '_bx_persons_form_profile_input_picture_err', '', '', 1, 0),
+('bx_person', 'bx_persons', 'public_subscriptions', 1, '', 0, 'checkbox', '_bx_persons_form_profile_input_sys_public_subscriptions', '_bx_persons_form_profile_input_public_subscriptions', '', 0, 0, 0, '', '', '', '', '', '', 'Int', '', 1, 0),
+('bx_person', 'bx_persons', 'public_subscribed_me', 1, '', 0, 'checkbox', '_bx_persons_form_profile_input_sys_public_subscribed_me', '_bx_persons_form_profile_input_public_subscribed_me', '', 0, 0, 0, '', '', '', '', '', '', 'Int', '', 1, 0);
 
 
 INSERT INTO `sys_form_display_inputs`(`display_name`, `input_name`, `visible_for_levels`, `active`, `order`) VALUES 
-('bx_person_add', 'delete_confirm', 2147483647, 0, 3),
-('bx_person_add', 'cover', 2147483647, 0, 4),
-('bx_person_add', 'picture', 2147483647, 1, 5),
-('bx_person_add', 'fullname', 2147483647, 1, 6),
-('bx_person_add', 'description', 2147483647, 1, 8),
-('bx_person_add', 'allow_view_to', 2147483647, 1, 9),
-('bx_person_add', 'do_submit', 2147483647, 1, 10),
+('bx_person_add', 'picture', 2147483647, 1, 1),
+('bx_person_add', 'fullname', 2147483647, 1, 2),
+('bx_person_add', 'description', 2147483647, 1, 3),
+('bx_person_add', 'allow_view_to', 2147483647, 1, 4),
+('bx_person_add', 'public_subscriptions', 2147483647, 1, 5),
+('bx_person_add', 'public_subscribed_me', 2147483647, 1, 6),
+('bx_person_add', 'do_submit', 2147483647, 1, 7),
 
 ('bx_person_delete', 'cover', 2147483647, 0, 0),
 ('bx_person_delete', 'picture', 2147483647, 0, 0),
@@ -157,13 +161,13 @@ INSERT INTO `sys_form_display_inputs`(`display_name`, `input_name`, `visible_for
 ('bx_person_delete', 'do_submit', 2147483647, 1, 1),
 ('bx_person_delete', 'fullname', 2147483647, 0, 2),
 
-('bx_person_edit', 'delete_confirm', 2147483647, 0, 2),
-('bx_person_edit', 'cover', 2147483647, 0, 3),
-('bx_person_edit', 'picture', 2147483647, 1, 5),
-('bx_person_edit', 'fullname', 2147483647, 1, 6),
-('bx_person_edit', 'description', 2147483647, 1, 7),
-('bx_person_edit', 'allow_view_to', 2147483647, 1, 8),
-('bx_person_edit', 'do_submit', 2147483647, 1, 9),
+('bx_person_edit', 'picture', 2147483647, 1, 1),
+('bx_person_edit', 'fullname', 2147483647, 1, 2),
+('bx_person_edit', 'description', 2147483647, 1, 3),
+('bx_person_edit', 'allow_view_to', 2147483647, 1, 4),
+('bx_person_edit', 'public_subscriptions', 2147483647, 1, 5),
+('bx_person_edit', 'public_subscribed_me', 2147483647, 1, 6),
+('bx_person_edit', 'do_submit', 2147483647, 1, 7),
 
 ('bx_person_edit_cover', 'delete_confirm', 2147483647, 0, 1),
 ('bx_person_edit_cover', 'fullname', 2147483647, 0, 2),

modules/boonex/russian/data/langs/bx_organizations/ru.xml

@@ -20,6 +20,10 @@
     <string name="_bx_orgs_form_profile_input_sys_do_submit"><![CDATA[Выполнить]]></string>
     <string name="_bx_orgs_form_profile_input_sys_allow_view_to"><![CDATA[Доступен для]]></string>
     <string name="_bx_orgs_form_profile_input_allow_view_to"><![CDATA[Доступен для]]></string>
+    <string name="_bx_orgs_form_profile_input_sys_public_subscriptions"><![CDATA[Открытый список подписок]]></string>
+    <string name="_bx_orgs_form_profile_input_public_subscriptions"><![CDATA[Открытый список подписок]]></string>
+    <string name="_bx_orgs_form_profile_input_sys_public_subscribed_me"><![CDATA[Открытый список подписчиков]]></string>
+    <string name="_bx_orgs_form_profile_input_public_subscribed_me"><![CDATA[Открытый список подписчиков]]></string>
     <string name="_bx_orgs_form_profile_input_sys_org_name"><![CDATA[Название организации]]></string>
     <string name="_bx_orgs_form_profile_input_org_name"><![CDATA[Название организации]]></string>
     <string name="_bx_orgs_form_profile_input_org_name_err"><![CDATA[Эта информация необходима. Пожалуйста, заполните это поле.]]></string>
@@ -68,9 +72,7 @@
 	<string name="_bx_orgs_page_title_sys_profile_friends"><![CDATA[Друзья]]></string>
 	<string name="_bx_orgs_page_title_profile_friends"><![CDATA[Друзья]]></string>
 	<string name="_bx_orgs_page_title_sys_profile_subscriptions"><![CDATA[Подписки]]></string>
-    <string name="_bx_orgs_page_title_profile_subscriptions"><![CDATA[Подписки]]></string>
-    <string name="_bx_orgs_page_title_sys_profile_subscribed_me"><![CDATA[Наши подписчики]]></string>
-    <string name="_bx_orgs_page_title_profile_subscribed_me"><![CDATA[Наши подписчики]]></string>
+    <string name="_bx_orgs_page_title_profile_subscriptions"><![CDATA[Подписки и подписчики]]></string>
 	<string name="_bx_orgs_page_title_sys_profile_info"><![CDATA[Инфо профиля]]></string>
 	<string name="_bx_orgs_page_title_profile_info"><![CDATA[Инфо о {display_name}]]></string>
 	<string name="_bx_orgs_page_title_sys_recent"><![CDATA[Последние Добавленные Организации]]></string>
@@ -100,8 +102,8 @@
 	<string name="_bx_orgs_page_block_title_profile_friends_link"><![CDATA[<a href="{profile_link}">{display_name}</a> - Друзья]]></string>
 	<string name="_bx_orgs_page_block_title_profile_friends"><![CDATA[Друзья]]></string>
 	<string name="_bx_orgs_page_block_title_system_profile_friends"><![CDATA[Друзья]]></string>
-	<string name="_bx_orgs_page_block_title_system_profile_subscriptions"><![CDATA[Подписки]]></string>
-    <string name="_bx_orgs_page_block_title_profile_subscriptions"><![CDATA[Подписки]]></string>
+	<string name="_bx_orgs_page_block_title_system_profile_subscriptions"><![CDATA[Наши подписки]]></string>
+    <string name="_bx_orgs_page_block_title_profile_subscriptions"><![CDATA[Наши подписки]]></string>
     <string name="_bx_orgs_page_block_title_system_profile_subscribed_me"><![CDATA[Наши подписчики]]></string>
     <string name="_bx_orgs_page_block_title_profile_subscribed_me"><![CDATA[Наши подписчики]]></string>
 	<string name="_bx_orgs_page_block_title_profile_actions"><![CDATA[Действия]]></string>

modules/boonex/russian/data/langs/bx_persons/ru.xml

@@ -21,6 +21,10 @@
     <string name="_bx_persons_form_profile_input_submit"><![CDATA[Выполнить]]></string>
     <string name="_bx_persons_form_profile_input_sys_allow_view_to"><![CDATA[Доступен для]]></string>
     <string name="_bx_persons_form_profile_input_allow_view_to"><![CDATA[Доступен для]]></string>
+    <string name="_bx_persons_form_profile_input_sys_public_subscriptions"><![CDATA[Открытый список подписок]]></string>
+    <string name="_bx_persons_form_profile_input_public_subscriptions"><![CDATA[Открытый список подписок]]></string>
+    <string name="_bx_persons_form_profile_input_sys_public_subscribed_me"><![CDATA[Открытый список подписчиков]]></string>
+    <string name="_bx_persons_form_profile_input_public_subscribed_me"><![CDATA[Открытый список подписчиков]]></string>
 	<string name="_bx_persons_form_profile_input_sys_fullname"><![CDATA[Полное имя]]></string>
 	<string name="_bx_persons_form_profile_input_fullname"><![CDATA[Полное имя]]></string>
 	<string name="_bx_persons_form_profile_input_fullname_err"><![CDATA[Эта информация необходима. Пожалуйста, заполните это поле.]]></string>
@@ -66,9 +70,7 @@
 	<string name="_bx_persons_page_title_sys_profile_friends"><![CDATA[Друзья]]></string>
 	<string name="_bx_persons_page_title_profile_friends"><![CDATA[Друзья]]></string>
 	<string name="_bx_persons_page_title_sys_profile_subscriptions"><![CDATA[Подписки]]></string>
-    <string name="_bx_persons_page_title_profile_subscriptions"><![CDATA[Подписки]]></string>
-    <string name="_bx_persons_page_title_sys_profile_subscribed_me"><![CDATA[Мои подписчики]]></string>
-    <string name="_bx_persons_page_title_profile_subscribed_me"><![CDATA[Мои подписчики]]></string>
+    <string name="_bx_persons_page_title_profile_subscriptions"><![CDATA[Подписки и подписчики]]></string>
 	<string name="_bx_persons_page_title_sys_profile_info"><![CDATA[Инфо профиля]]></string>
 	<string name="_bx_persons_page_title_profile_info"><![CDATA[Инфо о {display_name}]]></string>
 	<string name="_bx_persons_page_title_sys_recent"><![CDATA[Последние Присоединившиеся Пользователи]]></string>
@@ -98,8 +100,8 @@
 	<string name="_bx_persons_page_block_title_profile_friends_link"><![CDATA[<a href="{profile_link}">{display_name}</a> - Друзья]]></string>
 	<string name="_bx_persons_page_block_title_profile_friends"><![CDATA[Друзья]]></string>
 	<string name="_bx_persons_page_block_title_system_profile_friends"><![CDATA[Друзья]]></string>
-	<string name="_bx_persons_page_block_title_system_profile_subscriptions"><![CDATA[Подписки]]></string>
-    <string name="_bx_persons_page_block_title_profile_subscriptions"><![CDATA[Подписки]]></string>
+	<string name="_bx_persons_page_block_title_system_profile_subscriptions"><![CDATA[Мои подписки]]></string>
+    <string name="_bx_persons_page_block_title_profile_subscriptions"><![CDATA[Мои подписки]]></string>
     <string name="_bx_persons_page_block_title_system_profile_subscribed_me"><![CDATA[Мои подписчики]]></string>
     <string name="_bx_persons_page_block_title_profile_subscribed_me"><![CDATA[Мои подписчики]]></string>
 	<string name="_bx_persons_page_block_title_profile_actions"><![CDATA[Действия]]></string>