Răsfoiți Sursa

Ticket #622 - For Persons and Organizations modules.

AntonLV 9 ani în urmă
părinte
comite
8a916ddf6b

+ 1 - 1
modules/base/profile/classes/BxBaseModProfileModule.php

@@ -611,7 +611,7 @@ class BxBaseModProfileModule extends BxBaseModGeneralModule implements iBxDolPro
         $CNF = &$this->_oConfig->CNF;
 
         $oProfile = BxDolProfile::getInstanceByContentAndType($aDataEntry[$CNF['FIELD_ID']], $this->_aModule['name']);
-        if(!$oProfile || ($oProfile->id() != $this->_iProfileId && (int)$aDataEntry[$CNF['FIELD_PUB_SBSN']] == 0 && (int)$aDataEntry[$CNF['FIELD_PUB_SBSD']] == 0))
+        if(!$oProfile || ($oProfile->id() != $this->_iProfileId && $this->_oDb->getParam($CNF['PARAM_PUBLIC_SBSN']) != 'on' && $this->_oDb->getParam($CNF['PARAM_PUBLIC_SBSD']) != 'on'))
             return _t('_sys_txt_access_denied');
 
         return CHECK_ACTION_RESULT_ALLOWED;

+ 2 - 2
modules/boonex/organizations/classes/BxOrgsConfig.php

@@ -53,8 +53,6 @@ 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
 
@@ -77,6 +75,8 @@ class BxOrgsConfig extends BxBaseModProfileConfig
             'PARAM_NUM_RSS' => 'bx_organizations_num_rss',
             'PARAM_NUM_CONNECTIONS_QUICK' => 'bx_organizations_num_connections_quick',
             'PARAM_SEARCHABLE_FIELDS' => 'bx_organizations_searchable_fields',
+        	'PARAM_PUBLIC_SBSN' => 'bx_organizations_public_subscriptions',
+            'PARAM_PUBLIC_SBSD' => 'bx_organizations_public_subscribed_me',
 
             // objects
             'OBJECT_STORAGE' => 'bx_organizations_pics',

+ 2 - 4
modules/boonex/organizations/install/langs/en.xml

@@ -9,6 +9,8 @@
 	<string name="_bx_orgs_option_per_page_browse"><![CDATA[Number of items per page]]></string>
     <string name="_bx_orgs_option_num_rss"><![CDATA[Number of items in RSS feed]]></string>
     <string name="_bx_orgs_option_searchable_fields"><![CDATA[Searchable fields]]></string>
+    <string name="_bx_orgs_option_public_subscriptions"><![CDATA[Public subscriptions list]]></string>
+    <string name="_bx_orgs_option_public_subscribed_me"><![CDATA[Public subscribers list]]></string>
 
 	<string name="_bx_orgs_form_profile"><![CDATA[Organizations]]></string>
 	<string name="_bx_orgs_form_profile_display_add"><![CDATA[Add Organization]]></string>
@@ -20,10 +22,6 @@
     <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>

+ 3 - 1
modules/boonex/organizations/install/sql/enable.sql

@@ -16,7 +16,9 @@ INSERT INTO `sys_options` (`name`, `value`, `category_id`, `caption`, `type`, `e
 ('bx_organizations_num_connections_quick', '4', @iCategId, '_bx_orgs_option_num_connections_quick', 'digit', '', '', '', 10),
 ('bx_organizations_per_page_browse', '20', @iCategId, '_bx_orgs_option_per_page_browse', 'digit', '', '', '', 11),
 ('bx_organizations_num_rss', '10', @iCategId, '_bx_orgs_option_num_rss', 'digit', '', '', '', 12),
-('bx_organizations_searchable_fields', 'org_name,org_desc', @iCategId, '_bx_orgs_option_searchable_fields', 'list', 'a:2:{s:6:"module";s:16:"bx_organizations";s:6:"method";s:21:"get_searchable_fields";}', '', '', 20);
+('bx_organizations_searchable_fields', 'org_name,org_desc', @iCategId, '_bx_orgs_option_searchable_fields', 'list', 'a:2:{s:6:"module";s:16:"bx_organizations";s:6:"method";s:21:"get_searchable_fields";}', '', '', 20),
+('bx_organizations_public_subscriptions', '', @iCategId, '_bx_orgs_option_public_subscriptions', 'checkbox', '', '', '', 30),
+('bx_organizations_public_subscribed_me', '', @iCategId, '_bx_orgs_option_public_subscribed_me', 'checkbox', '', '', '', 31);
 
 -- PAGES
 

+ 3 - 11
modules/boonex/organizations/install/sql/install.sql

@@ -12,8 +12,6 @@ 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',
@@ -143,9 +141,7 @@ 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', '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);
+('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);
 
 
 INSERT INTO `sys_form_display_inputs`(`display_name`, `input_name`, `visible_for_levels`, `active`, `order`) VALUES 
@@ -154,9 +150,7 @@ INSERT INTO `sys_form_display_inputs`(`display_name`, `input_name`, `visible_for
 ('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_add', 'do_submit', 2147483647, 1, 6),
 
 ('bx_organization_delete', 'picture', 2147483647, 0, 0),
 ('bx_organization_delete', 'delete_confirm', 2147483647, 1, 0),
@@ -170,9 +164,7 @@ INSERT INTO `sys_form_display_inputs`(`display_name`, `input_name`, `visible_for
 ('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', 'do_submit', 2147483647, 1, 6),
 
 ('bx_organization_edit_cover', 'delete_confirm', 2147483647, 0, 1),
 ('bx_organization_edit_cover', 'org_name', 2147483647, 0, 2),

+ 2 - 2
modules/boonex/persons/classes/BxPersonsConfig.php

@@ -53,8 +53,6 @@ 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
 
@@ -77,6 +75,8 @@ class BxPersonsConfig extends BxBaseModProfileConfig
             'PARAM_NUM_RSS' => 'bx_persons_num_rss',
             'PARAM_NUM_CONNECTIONS_QUICK' => 'bx_persons_num_connections_quick',
             'PARAM_SEARCHABLE_FIELDS' => 'bx_persons_searchable_fields',
+            'PARAM_PUBLIC_SBSN' => 'bx_persons_public_subscriptions',
+            'PARAM_PUBLIC_SBSD' => 'bx_persons_public_subscribed_me',
 
             // objects
             'OBJECT_STORAGE' => 'bx_persons_pictures',

+ 2 - 4
modules/boonex/persons/install/langs/en.xml

@@ -9,6 +9,8 @@
 	<string name="_bx_persons_option_per_page_browse"><![CDATA[Number of items per page]]></string>
 	<string name="_bx_persons_option_num_rss"><![CDATA[Number of items in RSS feed]]></string>
 	<string name="_bx_persons_option_searchable_fields"><![CDATA[Searchable fields]]></string>
+    <string name="_bx_persons_option_public_subscriptions"><![CDATA[Public subscriptions list]]></string>
+    <string name="_bx_persons_option_public_subscribed_me"><![CDATA[Public subscribers list]]></string>
 
 	<string name="_bx_persons_form_profile"><![CDATA[Persons]]></string>
 	<string name="_bx_persons_form_profile_display_add"><![CDATA[Add Person]]></string>
@@ -21,10 +23,6 @@
     <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>

+ 3 - 1
modules/boonex/persons/install/sql/enable.sql

@@ -16,7 +16,9 @@ INSERT INTO `sys_options` (`name`, `value`, `category_id`, `caption`, `type`, `e
 ('bx_persons_num_connections_quick', '4', @iCategId, '_bx_persons_option_num_connections_quick', 'digit', '', '', '', 10),
 ('bx_persons_per_page_browse', '20', @iCategId, '_bx_persons_option_per_page_browse', 'digit', '', '', '', 11),
 ('bx_persons_num_rss', '10', @iCategId, '_bx_persons_option_num_rss', 'digit', '', '', '', 12),
-('bx_persons_searchable_fields', 'fullname,description', @iCategId, '_bx_persons_option_searchable_fields', 'list', 'a:2:{s:6:"module";s:10:"bx_persons";s:6:"method";s:21:"get_searchable_fields";}', '', '', 20);
+('bx_persons_searchable_fields', 'fullname,description', @iCategId, '_bx_persons_option_searchable_fields', 'list', 'a:2:{s:6:"module";s:10:"bx_persons";s:6:"method";s:21:"get_searchable_fields";}', '', '', 20),
+('bx_persons_public_subscriptions', '', @iCategId, '_bx_persons_option_public_subscriptions', 'checkbox', '', '', '', 30),
+('bx_persons_public_subscribed_me', '', @iCategId, '_bx_persons_option_public_subscribed_me', 'checkbox', '', '', '', 31);
 
 -- PAGES
 

+ 3 - 11
modules/boonex/persons/install/sql/install.sql

@@ -11,8 +11,6 @@ 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',
@@ -141,9 +139,7 @@ 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', '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);
+('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);
 
 
 INSERT INTO `sys_form_display_inputs`(`display_name`, `input_name`, `visible_for_levels`, `active`, `order`) VALUES 
@@ -151,9 +147,7 @@ INSERT INTO `sys_form_display_inputs`(`display_name`, `input_name`, `visible_for
 ('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_add', 'do_submit', 2147483647, 1, 5),
 
 ('bx_person_delete', 'cover', 2147483647, 0, 0),
 ('bx_person_delete', 'picture', 2147483647, 0, 0),
@@ -165,9 +159,7 @@ INSERT INTO `sys_form_display_inputs`(`display_name`, `input_name`, `visible_for
 ('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', 'do_submit', 2147483647, 1, 5),
 
 ('bx_person_edit_cover', 'delete_confirm', 2147483647, 0, 1),
 ('bx_person_edit_cover', 'fullname', 2147483647, 0, 2),

+ 2 - 4
modules/boonex/russian/data/langs/bx_organizations/ru.xml

@@ -9,6 +9,8 @@
 	<string name="_bx_orgs_option_per_page_browse"><![CDATA[Число элементов на странице]]></string>
     <string name="_bx_orgs_option_num_rss"><![CDATA[Число элементов в ленте RSS]]></string>
     <string name="_bx_orgs_option_searchable_fields"><![CDATA[Поля для поиска]]></string>
+    <string name="_bx_orgs_option_public_subscriptions"><![CDATA[Открытый список подписок]]></string>
+    <string name="_bx_orgs_option_public_subscribed_me"><![CDATA[Открытый список подписчиков]]></string>
 
 	<string name="_bx_orgs_form_profile"><![CDATA[Организации]]></string>
 	<string name="_bx_orgs_form_profile_display_add"><![CDATA[Добавление организации]]></string>
@@ -20,10 +22,6 @@
     <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>

+ 2 - 4
modules/boonex/russian/data/langs/bx_persons/ru.xml

@@ -9,6 +9,8 @@
 	<string name="_bx_persons_option_per_page_browse"><![CDATA[Число элементов на странице]]></string>
     <string name="_bx_persons_option_num_rss"><![CDATA[Число элементов в ленте RSS]]></string>
     <string name="_bx_persons_option_searchable_fields"><![CDATA[Поля для поиска]]></string>
+    <string name="_bx_persons_option_public_subscriptions"><![CDATA[Открытый список подписок]]></string>
+    <string name="_bx_persons_option_public_subscribed_me"><![CDATA[Открытый список подписчиков]]></string>
 
 	<string name="_bx_persons_form_profile"><![CDATA[Персоны]]></string>
 	<string name="_bx_persons_form_profile_display_add"><![CDATA[Добавление персоны]]></string>
@@ -21,10 +23,6 @@
     <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>

+ 4 - 10
template/scripts/BxBaseServiceConnections.php

@@ -110,11 +110,8 @@ class BxBaseServiceConnections extends BxDol
         if(empty($aProfile) || !is_array($aProfile))
             return false;
 
-        $aProfileInfo = BxDolService::call($aProfile['type'], 'get_content_info_by_id', array($aProfile['content_id']));
-        if(empty($aProfileInfo) || !is_array($aProfileInfo))
-            return false;
-
-        if((int)$aProfileInfo['public_subscriptions'] == 0 && $aProfile['id'] != bx_get_logged_profile_id())
+        $CNF = &BxDolModule::getInstance($aProfile['type'])->_oConfig->CNF;
+        if(getParam($CNF['PARAM_PUBLIC_SBSN']) != 'on' && $aProfile['id'] != bx_get_logged_profile_id())
             return false;
 
         $oGrid = BxDolGrid::getObjectInstance('sys_grid_subscriptions');
@@ -136,11 +133,8 @@ class BxBaseServiceConnections extends BxDol
         if(empty($aProfile) || !is_array($aProfile))
             return false;
 
-        $aProfileInfo = BxDolService::call($aProfile['type'], 'get_content_info_by_id', array($aProfile['content_id']));
-        if(empty($aProfileInfo) || !is_array($aProfileInfo))
-            return false;
-
-        if((int)$aProfileInfo['public_subscribed_me'] == 0 && $aProfile['id'] != bx_get_logged_profile_id())
+        $CNF = &BxDolModule::getInstance($aProfile['type'])->_oConfig->CNF;
+        if(getParam($CNF['PARAM_PUBLIC_SBSD']) != 'on' && $aProfile['id'] != bx_get_logged_profile_id())
             return false;
 
         $oGrid = BxDolGrid::getObjectInstance('sys_grid_subscribed_me');