Ticket #2090 - Going and Interested.

modules/boonex/events/classes/BxEventsConfig.php

@@ -74,8 +74,8 @@ class BxEventsConfig extends BxBaseModProfileConfig
 
             'PARAM_NUM_RSS' => 'bx_events_num_rss',
             'PARAM_NUM_CONNECTIONS_QUICK' => 'bx_events_num_connections_quick',
-            
             'PARAM_SEARCHABLE_FIELDS' => 'bx_events_searchable_fields',
+            'PARAM_PUBLIC_SBSD' => 'bx_events_public_subscribed_me',
             'PARAM_PER_PAGE_BROWSE_SHOWCASE' => 'bx_events_per_page_browse_showcase',
             'PARAM_PER_PAGE_BROWSE_RECOMMENDED' => 'bx_events_per_page_browse_recommended',
 

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

@@ -10,6 +10,7 @@
     <string name="_bx_events_option_time_format"><![CDATA[Time format]]></string>
     <string name="_bx_events_option_short_date_format"><![CDATA[Short date format]]></string>
     <string name="_bx_events_option_searchable_fields"><![CDATA[Searchable fields]]></string>
+    <string name="_bx_events_option_public_subscribed_me"><![CDATA[Public list of interested members]]></string>
 
 	<string name="_bx_events_form_profile"><![CDATA[Events]]></string>
 	<string name="_bx_events_form_profile_display_add"><![CDATA[Add Event]]></string>
@@ -98,8 +99,8 @@
 	<string name="_bx_events_page_title_browse_connections_mutual"><![CDATA[{0} and {1} mutual connections]]></string>
 	<string name="_bx_events_page_title_sys_profile_friends"><![CDATA[Friends]]></string>
 	<string name="_bx_events_page_title_profile_friends"><![CDATA[Friends]]></string>
-	<string name="_bx_events_page_title_sys_group_fans"><![CDATA[Members]]></string>
-	<string name="_bx_events_page_title_group_fans"><![CDATA[Members]]></string>
+	<string name="_bx_events_page_title_sys_group_fans"><![CDATA[Guests]]></string>
+	<string name="_bx_events_page_title_group_fans"><![CDATA[Guests]]></string>
 	<string name="_bx_events_page_title_sys_profile_comments"><![CDATA[Comments]]></string>
     <string name="_bx_events_page_title_profile_comments"><![CDATA[Comments]]></string>
 	<string name="_bx_events_page_title_sys_profile_info"><![CDATA[Event Info]]></string>
@@ -124,33 +125,36 @@
     <string name="_bx_events_page_block_title_entries_actions"><![CDATA[Events actions]]></string>
     <string name="_bx_events_page_block_title_sys_entries_of_author"><![CDATA[Events of author]]></string>
     <string name="_bx_events_page_block_title_entries_of_author"><![CDATA[Events by {display_name}]]></string>
-	<string name="_bx_events_page_block_title_favorites_of_author"><![CDATA[Favorite Events]]></string>
+    <string name="_bx_events_page_block_title_favorites_of_author"><![CDATA[Favorite Events]]></string>
     <string name="_bx_events_page_block_title_sys_favorites_of_author"><![CDATA[Favorite Events]]></string>
-	<string name="_bx_events_page_block_title_sys_joined_entries"><![CDATA[Joined Events]]></string>
-	<string name="_bx_events_page_block_title_joined_entries"><![CDATA[Joined Events]]></string>
-	<string name="_bx_events_page_block_title_create_profile"><![CDATA[Create Event]]></string>
-	<string name="_bx_events_page_block_title_edit_profile"><![CDATA[Edit Event]]></string>
-	<string name="_bx_events_page_block_title_edit_profile_cover"><![CDATA[Edit Cover]]></string>
-	<string name="_bx_events_page_block_title_delete_profile"><![CDATA[Delete Event]]></string>
-	<string name="_bx_events_page_block_title_profile_info_link"><![CDATA[About <a href="{profile_link}">{display_name}</a>]]></string>
-	<string name="_bx_events_page_block_title_profile_info"><![CDATA[Info]]></string>
-	<string name="_bx_events_page_block_title_system_profile_info"><![CDATA[Info]]></string>
-	<string name="_bx_events_page_block_title_profile_description"><![CDATA[Description]]></string>
-	<string name="_bx_events_page_block_title_profile_friends_link"><![CDATA[Friends of <a href="{profile_link}">{display_name}</a>]]></string>
-	<string name="_bx_events_page_block_title_profile_friends"><![CDATA[Friends]]></string>
-	<string name="_bx_events_page_block_title_system_profile_friends"><![CDATA[Friends]]></string>
-	<string name="_bx_events_page_block_title_admins"><![CDATA[Administrators]]></string>
-	<string name="_bx_events_page_block_title_fans_link"><![CDATA[Members of <a href="{profile_link}">{display_name}</a>]]></string>
-    <string name="_bx_events_page_block_title_fans"><![CDATA[Members]]></string>
-	<string name="_bx_events_page_block_title_system_fans"><![CDATA[Members]]></string>
-	<string name="_bx_events_page_block_title_profile_comments"><![CDATA[Comments]]></string>
+    <string name="_bx_events_page_block_title_sys_joined_entries"><![CDATA[Joined Events]]></string>
+    <string name="_bx_events_page_block_title_joined_entries"><![CDATA[Joined Events]]></string>
+    <string name="_bx_events_page_block_title_create_profile"><![CDATA[Create Event]]></string>
+    <string name="_bx_events_page_block_title_edit_profile"><![CDATA[Edit Event]]></string>
+    <string name="_bx_events_page_block_title_edit_profile_cover"><![CDATA[Edit Cover]]></string>
+    <string name="_bx_events_page_block_title_delete_profile"><![CDATA[Delete Event]]></string>
+    <string name="_bx_events_page_block_title_profile_info_link"><![CDATA[About <a href="{profile_link}">{display_name}</a>]]></string>
+    <string name="_bx_events_page_block_title_profile_info"><![CDATA[Info]]></string>
+    <string name="_bx_events_page_block_title_system_profile_info"><![CDATA[Info]]></string>
+    <string name="_bx_events_page_block_title_profile_description"><![CDATA[Description]]></string>
+    <string name="_bx_events_page_block_title_profile_friends_link"><![CDATA[Friends of <a href="{profile_link}">{display_name}</a>]]></string>
+    <string name="_bx_events_page_block_title_profile_friends"><![CDATA[Friends]]></string>
+    <string name="_bx_events_page_block_title_system_profile_friends"><![CDATA[Friends]]></string>
+    <string name="_bx_events_page_block_title_admins"><![CDATA[Administrators]]></string>
+    <string name="_bx_events_page_block_title_fans_link"><![CDATA[Going to <a href="{profile_link}">{display_name}</a>]]></string>
+    <string name="_bx_events_page_block_title_fans"><![CDATA[Going]]></string>
+    <string name="_bx_events_page_block_title_system_fans"><![CDATA[Going]]></string>
+    <string name="_bx_events_page_block_title_subscribers_link"><![CDATA[Interested in <a href="{profile_link}">{display_name}</a>]]></string>
+    <string name="_bx_events_page_block_title_subscribers"><![CDATA[Interested]]></string>
+    <string name="_bx_events_page_block_title_system_subscribers"><![CDATA[Interested]]></string>
+    <string name="_bx_events_page_block_title_profile_comments"><![CDATA[Comments]]></string>
     <string name="_bx_events_page_block_title_profile_comments_link"><![CDATA[Comments to <a href="{entry_link}">{title}</a>]]></string>
-	<string name="_bx_events_page_block_title_profile_actions"><![CDATA[Actions]]></string>
-	<string name="_bx_events_page_block_title_featured_profiles"><![CDATA[Featured Events]]></string>
-	<string name="_bx_events_page_block_title_latest_profiles"><![CDATA[New Events]]></string>
-	<string name="_bx_events_page_block_title_system_manage"><![CDATA[Manage Own Events]]></string>
-	<string name="_bx_events_page_block_title_system_manage_administration"><![CDATA[Manage All Events]]></string>
-	<string name="_bx_events_page_block_title_manage"><![CDATA[Manage Events]]></string>
+    <string name="_bx_events_page_block_title_profile_actions"><![CDATA[Actions]]></string>
+    <string name="_bx_events_page_block_title_featured_profiles"><![CDATA[Featured Events]]></string>
+    <string name="_bx_events_page_block_title_latest_profiles"><![CDATA[New Events]]></string>
+    <string name="_bx_events_page_block_title_system_manage"><![CDATA[Manage Own Events]]></string>
+    <string name="_bx_events_page_block_title_system_manage_administration"><![CDATA[Manage All Events]]></string>
+    <string name="_bx_events_page_block_title_manage"><![CDATA[Manage Events]]></string>
     <string name="_bx_events_page_block_title_top_profiles"><![CDATA[Top Events]]></string>
     <string name="_bx_events_page_block_title_past_profiles"><![CDATA[Past Events]]></string>
     <string name="_bx_events_page_block_title_entry_all_actions"><![CDATA[All Actions]]></string>
@@ -202,8 +206,8 @@
     <string name="_bx_events_menu_item_title_view_profile_friends"><![CDATA[Friends]]></string>
     <string name="_bx_events_menu_item_title_system_view_joined_groups"><![CDATA[Events]]></string>
     <string name="_bx_events_menu_item_title_view_joined_groups"><![CDATA[Events]]></string>
-    <string name="_bx_events_menu_item_title_system_view_fans"><![CDATA[Members]]></string>
-    <string name="_bx_events_menu_item_title_view_fans"><![CDATA[Members]]></string>
+    <string name="_bx_events_menu_item_title_system_view_fans"><![CDATA[Guests]]></string>
+    <string name="_bx_events_menu_item_title_view_fans"><![CDATA[Guests]]></string>
     <string name="_bx_events_menu_item_title_system_view_profile_comments"><![CDATA[Comments]]></string>
     <string name="_bx_events_menu_item_title_view_profile_comments"><![CDATA[Comments]]></string>
     <string name="_bx_events_menu_item_title_system_view_profile_info"><![CDATA[Info]]></string>

modules/boonex/events/install/sql/enable.sql

@@ -18,7 +18,8 @@ INSERT INTO `sys_options` (`name`, `value`, `category_id`, `caption`, `type`, `e
 ('bx_events_per_page_browse_recommended', '10', @iCategId, '_sys_option_per_page_browse_recommended', 'digit', '', '', '', 16),
 ('bx_events_time_format', 'H:i', @iCategId, '_bx_events_option_time_format', 'digit', '', '', '', 20),
 ('bx_events_short_date_format', 'j M y', @iCategId, '_bx_events_option_short_date_format', 'digit', '', '', '', 22),
-('bx_events_searchable_fields', 'event_name,event_desc', @iCategId, '_bx_events_option_searchable_fields', 'list', 'a:2:{s:6:"module";s:9:"bx_events";s:6:"method";s:21:"get_searchable_fields";}', '', '', 30);
+('bx_events_searchable_fields', 'event_name,event_desc', @iCategId, '_bx_events_option_searchable_fields', 'list', 'a:2:{s:6:"module";s:9:"bx_events";s:6:"method";s:21:"get_searchable_fields";}', '', '', 30),
+('bx_events_public_subscribed_me', 'on', @iCategId, '_bx_events_option_public_subscribed_me', 'checkbox', '', '', '', 40);
 
 -- PAGES
 
@@ -104,7 +105,8 @@ INSERT INTO `sys_objects_page`(`object`, `uri`, `title_system`, `title`, `module
 ('bx_events_fans', 'event-fans', '_bx_events_page_title_sys_group_fans', '_bx_events_page_title_group_fans', 'bx_events', 5, 2147483647, 1, 'page.php?i=event-fans', '', '', '', 0, 1, 0, 'BxEventsPageEntry', 'modules/boonex/events/classes/BxEventsPageEntry.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_events_fans', 1, 'bx_events', '_bx_events_page_block_title_system_fans', '_bx_events_page_block_title_fans_link', 11, 2147483647, 'service', 'a:2:{s:6:"module";s:9:"bx_events";s:6:"method";s:10:"fans_table";}', 0, 0, 1, 1);
+('bx_events_fans', 1, 'bx_events', '_bx_events_page_block_title_system_fans', '_bx_events_page_block_title_fans_link', 11, 2147483647, 'service', 'a:2:{s:6:"module";s:9:"bx_events";s:6:"method";s:10:"fans_table";}', 0, 0, 1, 1),
+('bx_events_fans', 1, 'bx_events', '_bx_events_page_block_title_system_subscribers', '_bx_events_page_block_title_subscribers_link', 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, 0, 1, 2);
 
 -- PAGE: view entry comments
 

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

@@ -10,6 +10,7 @@
     <string name="_bx_events_option_time_format"><![CDATA[Формат времени]]></string>
     <string name="_bx_events_option_short_date_format"><![CDATA[Короткий формат даты]]></string>
     <string name="_bx_events_option_searchable_fields"><![CDATA[Поля для поиска]]></string>
+    <string name="_bx_events_option_public_subscribed_me"><![CDATA[Открытый список заинтересованных пользователей]]></string>
 
 	<string name="_bx_events_form_profile"><![CDATA[События]]></string>
 	<string name="_bx_events_form_profile_display_add"><![CDATA[Добавление события]]></string>
@@ -98,8 +99,8 @@
 	<string name="_bx_events_page_title_browse_connections_mutual"><![CDATA[{0} и {1} обоюдных связей]]></string>
 	<string name="_bx_events_page_title_sys_profile_friends"><![CDATA[Друзья]]></string>
 	<string name="_bx_events_page_title_profile_friends"><![CDATA[Друзья]]></string>
-	<string name="_bx_events_page_title_sys_group_fans"><![CDATA[Участники]]></string>
-	<string name="_bx_events_page_title_group_fans"><![CDATA[Участники]]></string>
+	<string name="_bx_events_page_title_sys_group_fans"><![CDATA[Гости]]></string>
+	<string name="_bx_events_page_title_group_fans"><![CDATA[Гости]]></string>
 	<string name="_bx_events_page_title_sys_profile_comments"><![CDATA[Комментарии]]></string>
     <string name="_bx_events_page_title_profile_comments"><![CDATA[Комментарии]]></string>
 	<string name="_bx_events_page_title_sys_profile_info"><![CDATA[Инфо события]]></string>
@@ -124,33 +125,36 @@
     <string name="_bx_events_page_block_title_entries_actions"><![CDATA[События - Действия]]></string>
     <string name="_bx_events_page_block_title_sys_entries_of_author"><![CDATA[События автора]]></string>
     <string name="_bx_events_page_block_title_entries_of_author"><![CDATA[{display_name} - События]]></string>
-	<string name="_bx_events_page_block_title_favorites_of_author"><![CDATA[Избранные события]]></string>   
+    <string name="_bx_events_page_block_title_favorites_of_author"><![CDATA[Избранные события]]></string>   
     <string name="_bx_events_page_block_title_sys_favorites_of_author"><![CDATA[Избранные события]]></string>
-	<string name="_bx_events_page_block_title_sys_joined_entries"><![CDATA[Участие в событиях]]></string>
-	<string name="_bx_events_page_block_title_joined_entries"><![CDATA[Участие в событиях]]></string>
-	<string name="_bx_events_page_block_title_create_profile"><![CDATA[Создать событие]]></string>
-	<string name="_bx_events_page_block_title_edit_profile"><![CDATA[Редактировать событие]]></string>
-	<string name="_bx_events_page_block_title_edit_profile_cover"><![CDATA[Редактировать обложку]]></string>
-	<string name="_bx_events_page_block_title_delete_profile"><![CDATA[Удалить событие]]></string>
-	<string name="_bx_events_page_block_title_profile_info_link"><![CDATA["<a href="{profile_link}">{display_name}</a>" - инфо]]></string>
-	<string name="_bx_events_page_block_title_profile_info"><![CDATA[Инфо]]></string>
-	<string name="_bx_events_page_block_title_system_profile_info"><![CDATA[Инфо]]></string>
-	<string name="_bx_events_page_block_title_profile_description"><![CDATA[Описание]]></string>
-	<string name="_bx_events_page_block_title_profile_friends_link"><![CDATA[<a href="{profile_link}">{display_name}</a> - друзья]]></string>
-	<string name="_bx_events_page_block_title_profile_friends"><![CDATA[Друзья]]></string>
-	<string name="_bx_events_page_block_title_system_profile_friends"><![CDATA[Друзья]]></string>
-	<string name="_bx_events_page_block_title_admins"><![CDATA[Администраторы]]></string>
-	<string name="_bx_events_page_block_title_fans_link"><![CDATA[Участники группы: <a href="{profile_link}">{display_name}</a>]]></string>
-    <string name="_bx_events_page_block_title_fans"><![CDATA[Участники]]></string>
-	<string name="_bx_events_page_block_title_system_fans"><![CDATA[Участники]]></string>
-	<string name="_bx_events_page_block_title_profile_comments"><![CDATA[Комментарии]]></string>
+    <string name="_bx_events_page_block_title_sys_joined_entries"><![CDATA[Участие в событиях]]></string>
+    <string name="_bx_events_page_block_title_joined_entries"><![CDATA[Участие в событиях]]></string>
+    <string name="_bx_events_page_block_title_create_profile"><![CDATA[Создать событие]]></string>
+    <string name="_bx_events_page_block_title_edit_profile"><![CDATA[Редактировать событие]]></string>
+    <string name="_bx_events_page_block_title_edit_profile_cover"><![CDATA[Редактировать обложку]]></string>
+    <string name="_bx_events_page_block_title_delete_profile"><![CDATA[Удалить событие]]></string>
+    <string name="_bx_events_page_block_title_profile_info_link"><![CDATA["<a href="{profile_link}">{display_name}</a>" - инфо]]></string>
+    <string name="_bx_events_page_block_title_profile_info"><![CDATA[Инфо]]></string>
+    <string name="_bx_events_page_block_title_system_profile_info"><![CDATA[Инфо]]></string>
+    <string name="_bx_events_page_block_title_profile_description"><![CDATA[Описание]]></string>
+    <string name="_bx_events_page_block_title_profile_friends_link"><![CDATA[<a href="{profile_link}">{display_name}</a> - друзья]]></string>
+    <string name="_bx_events_page_block_title_profile_friends"><![CDATA[Друзья]]></string>
+    <string name="_bx_events_page_block_title_system_profile_friends"><![CDATA[Друзья]]></string>
+    <string name="_bx_events_page_block_title_admins"><![CDATA[Администраторы]]></string>
+    <string name="_bx_events_page_block_title_fans_link"><![CDATA[Придут на <a href="{profile_link}">{display_name}</a>]]></string>
+    <string name="_bx_events_page_block_title_fans"><![CDATA[Придут]]></string>
+    <string name="_bx_events_page_block_title_system_fans"><![CDATA[Придут]]></string>
+    <string name="_bx_events_page_block_title_subscribers_link"><![CDATA[Заинтересованы в <a href="{profile_link}">{display_name}</a>]]></string>
+    <string name="_bx_events_page_block_title_subscribers"><![CDATA[Заинтересованы]]></string>
+    <string name="_bx_events_page_block_title_system_subscribers"><![CDATA[Заинтересованы]]></string>
+    <string name="_bx_events_page_block_title_profile_comments"><![CDATA[Комментарии]]></string>
     <string name="_bx_events_page_block_title_profile_comments_link"><![CDATA[Комментарии к <a href="{entry_link}">{title}</a>]]></string>
-	<string name="_bx_events_page_block_title_profile_actions"><![CDATA[Действия]]></string>
-	<string name="_bx_events_page_block_title_featured_profiles"><![CDATA[Продвинутые события]]></string>
-	<string name="_bx_events_page_block_title_latest_profiles"><![CDATA[Новые события]]></string>
-	<string name="_bx_events_page_block_title_system_manage"><![CDATA[Управление своими событиями]]></string>
-	<string name="_bx_events_page_block_title_system_manage_administration"><![CDATA[Управление всеми событиями]]></string>
-	<string name="_bx_events_page_block_title_manage"><![CDATA[Управление]]></string>
+    <string name="_bx_events_page_block_title_profile_actions"><![CDATA[Действия]]></string>
+    <string name="_bx_events_page_block_title_featured_profiles"><![CDATA[Продвинутые события]]></string>
+    <string name="_bx_events_page_block_title_latest_profiles"><![CDATA[Новые события]]></string>
+    <string name="_bx_events_page_block_title_system_manage"><![CDATA[Управление своими событиями]]></string>
+    <string name="_bx_events_page_block_title_system_manage_administration"><![CDATA[Управление всеми событиями]]></string>
+    <string name="_bx_events_page_block_title_manage"><![CDATA[Управление]]></string>
     <string name="_bx_events_page_block_title_top_profiles"><![CDATA[Популярные события]]></string>
     <string name="_bx_events_page_block_title_past_profiles"><![CDATA[Прошедшие события]]></string>
     <string name="_bx_events_page_block_title_entry_all_actions"><![CDATA[Все действия]]></string>
@@ -203,8 +207,8 @@
     <string name="_bx_events_menu_item_title_view_profile_friends"><![CDATA[Друзья]]></string>
     <string name="_bx_events_menu_item_title_system_view_joined_groups"><![CDATA[События]]></string>
     <string name="_bx_events_menu_item_title_view_joined_groups"><![CDATA[События]]></string>
-    <string name="_bx_events_menu_item_title_system_view_fans"><![CDATA[Участники]]></string>
-    <string name="_bx_events_menu_item_title_view_fans"><![CDATA[Участники]]></string>
+    <string name="_bx_events_menu_item_title_system_view_fans"><![CDATA[Гости]]></string>
+    <string name="_bx_events_menu_item_title_view_fans"><![CDATA[Гости]]></string>
     <string name="_bx_events_menu_item_title_system_view_profile_comments"><![CDATA[Комментарии]]></string>
     <string name="_bx_events_menu_item_title_view_profile_comments"><![CDATA[Комментарии]]></string>
     <string name="_bx_events_menu_item_title_system_view_profile_info"><![CDATA[Инфо]]></string>