Ticket #4575 - Events: Enhancements.

modules/base/groups/classes/BxBaseModGroupsModule.php

@@ -590,14 +590,11 @@ class BxBaseModGroupsModule extends BxBaseModProfileModule
 	
     public function serviceFans ($iContentId = 0, $bAsArray = false)
     {
+        $CNF = &$this->_oConfig->CNF;
+
         if (!$iContentId)
             $iContentId = bx_process_input(bx_get('id'), BX_DATA_INT);
-        
-        if (!$iContentId && bx_get('profile_id')){
-            $oProfile = BxDolProfile::getInstance(bx_process_input(bx_get('profile_id')));
-            $iContentId = $oProfile->getContentId();
-        }
-        
+
         if (!$iContentId)
             return false;
 
@@ -610,21 +607,13 @@ class BxBaseModGroupsModule extends BxBaseModProfileModule
 
         if(!$bAsArray) {
             bx_import('BxDolConnection');
-            $mixedResult = $this->serviceBrowseConnectionsQuick ($oGroupProfile->id(), $this->_oConfig->CNF['OBJECT_CONNECTIONS'], BX_CONNECTIONS_CONTENT_TYPE_CONTENT, true);
+            $mixedResult = $this->serviceBrowseConnectionsQuick ($oGroupProfile->id(), $CNF['OBJECT_CONNECTIONS'], BX_CONNECTIONS_CONTENT_TYPE_CONTENT, true);
             if (!$mixedResult)
                 return MsgBox(_t('_sys_txt_empty'));
         }
         else
-            $mixedResult = BxDolConnection::getObjectInstance($this->_oConfig->CNF['OBJECT_CONNECTIONS'])->getConnectedContent($oGroupProfile->id(), true);
+            $mixedResult = BxDolConnection::getObjectInstance($CNF['OBJECT_CONNECTIONS'])->getConnectedContent($oGroupProfile->id(), true);
 
-        if(bx_is_api()) {
-            $CNF = &$this->_oConfig->CNF;
-            return bx_srv('system', 'browse_members', [
-                'profile_id' => $oGroupProfile->id(),
-                'connection' => $CNF['OBJECT_CONNECTIONS'],
-            ], 'TemplServiceProfiles');
-        }
-        
         return $mixedResult;
     }
     
@@ -793,6 +782,22 @@ class BxBaseModGroupsModule extends BxBaseModProfileModule
         return $sCode;
     }
 
+    public function serviceBrowseMembers ($iProfileId = 0, $aParams = [])
+    {
+        $CNF = &$this->_oConfig->CNF;
+
+        if(!$iProfileId)
+            $iProfileId = bx_process_input(bx_get('profile_id'), BX_DATA_INT);
+        if(!$iProfileId)
+            return '';
+
+        $oGroupProfile = BxDolProfile::getInstance($iProfileId);
+        if(!($oGroupProfile))
+            return '';
+
+        return bx_srv('system', 'browse_members', [$oGroupProfile->id(), $CNF['OBJECT_CONNECTIONS'], $aParams], 'TemplServiceProfiles');
+    }
+    
     public function serviceEntityPricing($iProfileId = 0)
     {
         $CNF = &$this->_oConfig->CNF;

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

@@ -184,12 +184,12 @@
     <string name="_bx_events_page_title_create_profile"><![CDATA[Create Event]]></string>
     <string name="_bx_events_page_title_sys_edit_profile"><![CDATA[Edit Event]]></string>
     <string name="_bx_events_page_title_edit_profile"><![CDATA[Edit Event]]></string>
-    <string name="_bx_events_page_title_manage"><![CDATA[Manage]]></string>
-    <string name="_bx_events_page_title_sys_manage"><![CDATA[Manage]]></string>
     <string name="_bx_events_page_title_sys_edit_profile_cover"><![CDATA[Edit Event Cover]]></string>
     <string name="_bx_events_page_title_edit_profile_cover"><![CDATA[Edit Cover]]></string>
     <string name="_bx_events_page_title_sys_edit_questionnaire"><![CDATA[Edit Questionnaire]]></string>
     <string name="_bx_events_page_title_edit_questionnaire"><![CDATA[Edit Questionnaire]]></string>
+    <string name="_bx_events_page_title_manage_profile"><![CDATA[Manage]]></string>
+    <string name="_bx_events_page_title_sys_manage_profile"><![CDATA[Manage Event]]></string>
     <string name="_bx_events_page_title_sys_delete_profile"><![CDATA[Delete Event]]></string>
     <string name="_bx_events_page_title_delete_profile"><![CDATA[Delete Event]]></string>
     <string name="_bx_events_page_title_sys_join_profile"><![CDATA[Join Course]]></string>
@@ -209,7 +209,7 @@
     <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[Guests]]></string>
+    <string name="_bx_events_page_title_sys_group_fans"><![CDATA[Event 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>
@@ -283,11 +283,12 @@
     <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_fans_invites"><![CDATA[Invites]]></string>
-    <string name="_bx_events_page_block_title_system_invites"><![CDATA[Invites]]></string>
+    <string name="_bx_events_page_block_title_system_fans_manage"><![CDATA[Manage fans]]></string>
+    <string name="_bx_events_page_block_title_invites"><![CDATA[Invites]]></string>
+    <string name="_bx_events_page_block_title_system_invites_manage"><![CDATA[Manage invites]]></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_system_subscribers_manage"><![CDATA[Manage interested]]></string>
     <string name="_bx_events_page_block_title_profile_comments"><![CDATA[Comments]]></string>
     <string name="_bx_events_page_block_title_entry_reports"><![CDATA[Reports]]></string>
     <string name="_bx_events_page_block_title_profile_comments_link"><![CDATA[Comments to <a href="{entry_link}">{title}</a>]]></string>

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

@@ -136,17 +136,17 @@ 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:4:"fans";}', 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:3:{s:6:"module";s:9:"bx_events";s:6:"method";s:14:"browse_members";s:6:"params";a:2:{i:0;s:12:"{profile_id}";i:1;a:2:{s:13:"empty_message";b:1;s:13:"ajax_paginate";b:0;}}}', 0, 0, 1, 1);
 
 
 -- PAGE: event manage
 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_events_manage_item', 'event-manage', '_bx_events_page_title_sys_manage', '_bx_events_page_title_manage', 'bx_events', 5, 2147483647, 1, 'page.php?i=manage', '', '', '', 0, 1, 0, 'BxEventsPageEntry', 'modules/boonex/events/classes/BxEventsPageEntry.php');
+('bx_events_manage_item', 'event-manage', '_bx_events_page_title_sys_manage_profile', '_bx_events_page_title_manage_profile', 'bx_events', 5, 2147483647, 1, 'page.php?i=manage', '', '', '', 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_manage_item', 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_manage_item', 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),
-('bx_events_manage_item', 1, 'bx_events', '_bx_events_page_block_title_system_invites', '_bx_events_page_block_title_fans_invites', 11, 2147483647, 'service', 'a:2:{s:6:"module";s:9:"bx_events";s:6:"method";s:13:"invites_table";}', 0, 0, 1, 3);
+('bx_events_manage_item', 1, 'bx_events', '_bx_events_page_block_title_system_fans_manage', '_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_manage_item', 1, 'bx_events', '_bx_events_page_block_title_system_subscribers_manage', '_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),
+('bx_events_manage_item', 1, 'bx_events', '_bx_events_page_block_title_system_invites_manage', '_bx_events_page_block_title_invites', 11, 2147483647, 'service', 'a:2:{s:6:"module";s:9:"bx_events";s:6:"method";s:13:"invites_table";}', 0, 0, 1, 3);
 
 -- PAGE: view entry comments
 

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

@@ -151,6 +151,8 @@
     <string name="_bx_events_page_title_edit_profile_cover"><![CDATA[Редактировать обложку]]></string>
     <string name="_bx_events_page_title_sys_edit_questionnaire"><![CDATA[Редактировать анкету]]></string>
     <string name="_bx_events_page_title_edit_questionnaire"><![CDATA[Редактировать анкету]]></string>
+    <string name="_bx_events_page_title_manage_profile"><![CDATA[Управление]]></string>
+    <string name="_bx_events_page_title_sys_manage_profile"><![CDATA[Управление событием]]></string>
     <string name="_bx_events_page_title_sys_delete_profile"><![CDATA[Удалить событие]]></string>
     <string name="_bx_events_page_title_delete_profile"><![CDATA[Удалить событие]]></string>
     <string name="_bx_events_page_title_sys_view_profile_closed"><![CDATA[Просмотр закрытого события]]></string>
@@ -167,7 +169,7 @@
     <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_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>
@@ -228,11 +230,12 @@
     <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_fans_invites"><![CDATA[Приглашения]]></string>
-    <string name="_bx_events_page_block_title_system_invites"><![CDATA[Приглашения]]></string>
+    <string name="_bx_events_page_block_title_system_fans_manage"><![CDATA[Manage fans]]></string>
+    <string name="_bx_events_page_block_title_invites"><![CDATA[Приглашения]]></string>
+    <string name="_bx_events_page_block_title_system_invites_manage"><![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_system_subscribers_manage"><![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>
@@ -310,6 +313,8 @@
     <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_manage"><![CDATA[Управление]]></string>
+    <string name="_bx_events_menu_item_title_view_manage"><![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>

template/scripts/BxBaseProfileSearchResult.php

@@ -46,7 +46,7 @@ class BxBaseProfileSearchResult extends BxTemplSearchResult
         $aProfileModulesNames = array_map(function($item) {
             return $item['name'];
         }, $aProfileModules);
-        
+
         $this->aCurrent = [
             'name' => 'sys_search',
             'module_name' => 'system',
@@ -78,6 +78,8 @@ class BxBaseProfileSearchResult extends BxTemplSearchResult
         if(!empty($this->_aParams['per_page']))
             $this->aCurrent['paginate']['perPage'] = (int)$this->_aParams['per_page'];
 
+        $this->sBrowseUrl = '';
+
         switch ($sMode) {
             case 'friends':
                 $aParams = array_merge($aParams, [