Merge branch 'master' of https://github.com/boonex/dolphin

modules/boonex/convos/install/config.php

@@ -44,7 +44,8 @@ $aConfig = array(
      * Menu triggers.
      */
     'menu_triggers' => array(
-    	'trigger_profile_view_actions'
+        'trigger_profile_view_actions',
+        'trigger_group_view_actions',
     ),
 
     /**

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

@@ -55,6 +55,8 @@
     <string name="_bx_cnv_menu_set_title_folders_more"><![CDATA[More folders]]></string>
     <string name="_bx_cnv_menu_item_title_system_message"><![CDATA[Message]]></string>
     <string name="_bx_cnv_menu_item_title_message"><![CDATA[Message]]></string>
+    <string name="_bx_cnv_menu_item_title_system_message_group"><![CDATA[Group Message]]></string>
+    <string name="_bx_cnv_menu_item_title_message_group"><![CDATA[Group Message]]></string>
     <string name="_bx_cnv_menu_item_title_system_mark_unread_entry"><![CDATA[Mark as unread]]></string>
     <string name="_bx_cnv_menu_item_title_mark_unread_entry"><![CDATA[Mark as unread]]></string>
 

modules/boonex/convos/install/sql/enable.sql

@@ -104,7 +104,8 @@ INSERT INTO `sys_menu_items` (`set_name`, `module`, `name`, `title_system`, `tit
 -- MENU: add menu item to profiles modules actions menu (trigger* menu sets are processed separately upon modules enable/disable)
 
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES 
-('trigger_profile_view_actions', 'bx_convos', 'convos-compose', '_bx_cnv_menu_item_title_system_message', '_bx_cnv_menu_item_title_message', 'page.php?i=start-convo&profiles={profile_id}', '', '', 'envelope', '', 2147483646, 1, 0, 0);
+('trigger_profile_view_actions', 'bx_convos', 'convos-compose', '_bx_cnv_menu_item_title_system_message', '_bx_cnv_menu_item_title_message', 'page.php?i=start-convo&profiles={profile_id}', '', '', 'envelope', '', 2147483646, 1, 0, 0),
+('trigger_group_view_actions', 'bx_convos', 'convos-compose', '_bx_cnv_menu_item_title_system_message_group', '_bx_cnv_menu_item_title_message_group', 'page.php?i=start-convo&profiles={recipients}', '', '', 'envelope', '', 2147483646, 1, 0, 0);
 
 -- GRID
 

modules/boonex/groups/classes/BxGroupsConfig.php

@@ -25,6 +25,7 @@ class BxGroupsConfig extends BxBaseModProfileConfig
             'profile-subscribe-add' => 'checkAllowedSubscribeAdd',
             'profile-subscribe-remove' => 'checkAllowedSubscribeRemove',
             'profile-actions-more' => 'checkAllowedViewMoreMenu',
+            'convos-compose' => 'checkAllowedSubscribeAdd',
         );
 
         $this->CNF = array (
@@ -99,7 +100,7 @@ class BxGroupsConfig extends BxBaseModProfileConfig
             'OBJECT_CONNECTIONS' => 'bx_groups_fans',
 
             'TRIGGER_MENU_PROFILE_VIEW_SUBMENU' => 'trigger_group_view_submenu',
-            'TRIGGER_MENU_PROFILE_VIEW_ACTIONS' => '',
+            'TRIGGER_MENU_PROFILE_VIEW_ACTIONS' => 'trigger_group_view_actions',
         	'TRIGGER_PAGE_VIEW_ENTRY' => 'trigger_page_profile_view_entry',
 
             // menu items which visibility depends on custom visibility checking

modules/boonex/groups/classes/BxGroupsMenuView.php

@@ -23,7 +23,7 @@ class BxGroupsMenuView extends BxBaseModProfileMenuView
         if ($this->_oProfile && isLogged()) {
 
             $oConn = BxDolConnection::getObjectInstance($this->_oModule->_oConfig->CNF['OBJECT_CONNECTIONS']);
-            if ($oConn->isConnectedNotMutual(bx_get_logged_profile_id(), $this->_oProfile->id())) {
+            if ($oConn && $oConn->isConnectedNotMutual(bx_get_logged_profile_id(), $this->_oProfile->id())) {
                 $this->addMarkers(array(
                     'title_add_fan' => _t('_bx_groups_menu_item_title_become_fan_sent'),
                     'title_remove_fan' => _t('_bx_groups_menu_item_title_leave_group_cancel_request'),
@@ -35,6 +35,11 @@ class BxGroupsMenuView extends BxBaseModProfileMenuView
                 ));
             }
 
+            $CNF = $this->_oModule->_oConfig->CNF;
+            if ($oConn && $this->_oModule->isFan($this->_aContentInfo[$CNF['FIELD_ID']])) {
+                $a = $oConn->getConnectedInitiators($this->_oProfile->id());
+                $this->addMarkers(array('recipients' => implode(',', $a)));
+            }
         }
     }
 }

modules/boonex/groups/install/config.php

@@ -54,6 +54,7 @@ $aConfig = array(
     'menu_triggers' => array(
     	'trigger_profile_view_submenu',
     	'trigger_group_view_submenu',
+        'trigger_group_view_actions',
     ),
 
     /**

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

@@ -55,6 +55,8 @@
     <string name="_bx_cnv_menu_set_title_folders_more"><![CDATA[Папки - дополнительно]]></string>
     <string name="_bx_cnv_menu_item_title_system_message"><![CDATA[Сообщение]]></string>
     <string name="_bx_cnv_menu_item_title_message"><![CDATA[Сообщение]]></string>
+    <string name="_bx_cnv_menu_item_title_system_message_group"><![CDATA[Групповое сообщение]]></string>
+    <string name="_bx_cnv_menu_item_title_message_group"><![CDATA[Групповое сообщение]]></string>
     <string name="_bx_cnv_menu_item_title_system_mark_unread_entry"><![CDATA[Отметить как непрочитанное]]></string>
     <string name="_bx_cnv_menu_item_title_mark_unread_entry"><![CDATA[Отметить как непрочитанное]]></string>