#3515 - fix

inc/js/classes/BxDolConnection.js

@@ -8,7 +8,7 @@
 
 function BxDolConnection(options)
 {
-    this._sObjName = undefined == options.sObjName ? 'oView' : options.sObjName; // javascript object name, to run current object instance from onTimer
+    this._sObjName = undefined == options.sObjName ? 'oConnection' : options.sObjName; // javascript object name, to run current object instance from onTimer
     this._sSystem = options.sSystem; // current comment system
     this._iObjId = options.iObjId; // this object id comments
     this._sContentType = options.sContentType; 

modules/base/groups/classes/BxBaseModGroupsMenuViewMeta.php

@@ -19,41 +19,6 @@ class BxBaseModGroupsMenuViewMeta extends BxBaseModProfileMenuViewMeta
         parent::__construct($aObject, $oTemplate);
     }
 
-    /*protected function _getMenuItemMembers($aItem)
-    {
-        $CNF = &$this->_oModule->_oConfig->CNF;
-
-        if(!$this->_bContentPublic || !$this->_oContentProfile || empty($CNF['OBJECT_CONNECTIONS']))
-            return false;
-
-        $oConnection = BxDolConnection::getObjectInstance($CNF['OBJECT_CONNECTIONS']);
-        if(!$oConnection)
-            return false;
-
-        $iMembers = $oConnection->getConnectedInitiatorsCount($this->_oContentProfile->id(), true);
-        if(!$iMembers)
-            return false;
-
-        return $this->getUnitMetaItemText(_t(!empty($aItem['title']) ? $aItem['title'] : '_sys_menu_item_title_sm_members', $iMembers));
-    }
-
-    protected function _getMenuItemSubscribers($aItem)
-    {
-        $CNF = &$this->_oModule->_oConfig->CNF;
-
-        if(!$this->_bContentPublic || !$this->_oContentProfile)
-            return false;
-
-        $oConnection = BxDolConnection::getObjectInstance('sys_profiles_subscriptions');
-        if(!$oConnection)
-            return false;
-
-        $iSubscribers = $oConnection->getConnectedInitiatorsCount($this->_oContentProfile->id());
-        if(!$iSubscribers)
-            return false;
-
-        return $this->getUnitMetaItemText(_t(!empty($aItem['title']) ? $aItem['title'] : '_sys_menu_item_title_sm_subscribers', $iSubscribers));
-    }*/
     protected function _getMenuItemMembers($aItem)
     {
         $CNF = &$this->_oModule->_oConfig->CNF;

template/scripts/BxBaseConnection.php

@@ -28,7 +28,7 @@ class BxBaseConnection extends BxDolConnection
     
     public function actionGetConnected ($iStart = 0, $iPerPage = 0)
     {
-        $sContentType = bx_get('content_type');
+        $sContentType = bx_process_input(bx_get('content_type'));
         $iProfileId = (int)bx_get('id');
         $bIsMutual = (bool)bx_get('mutual');
         return $this->_getConnected ($sContentType, $iProfileId, $bIsMutual, $iStart, $iPerPage);
@@ -36,7 +36,7 @@ class BxBaseConnection extends BxDolConnection
     
     public function actionGetUsers ($iStart = 0, $iPerPage = 0)
     {
-        $sContentType = bx_get('content_type');
+        $sContentType = bx_process_input(bx_get('content_type'));
         $iProfileId = (int)bx_get('id');
         $bIsMutual = (bool)bx_get('mutual');
         $iStart = (int)bx_get('start');
@@ -175,11 +175,7 @@ class BxBaseConnection extends BxDolConnection
     }
     
     public function _getConnected ($sContentType, $iProfileId, $bIsMutual, $iStart = 0, $iPerPage = 0)
-    {
-        $sContentType = bx_get('content_type');
-        $iProfileId = (int)bx_get('id');
-        $bIsMutual = (bool)bx_get('mutual');
-        
+    {   
         $aUsers = $this->getConnectionsAsArray($sContentType, $iProfileId, null, $bIsMutual);
         
         $oPaginate = new BxTemplPaginate(array(
@@ -190,14 +186,13 @@ class BxBaseConnection extends BxDolConnection
         $oPaginate->setNumFromDataArray($aUsers);
 
         foreach($aUsers as $iProfile) {
-            list($sUserName, $sUserUrl, $sUserIcon, $sUserUnit, $sUserUnitWoInfo) = $this->_getAuthorInfo($iProfile);
-
+            $oProfile = BxDolProfile::getInstanceMagic($iProfile);
             $aTmplUsers[] = array(
                 'style_prefix' => $this->_sStylePrefix,
-                'user_unit' => $sUserUnitWoInfo,
-                'user_url' => $sUserUrl,
-            	'user_title' => bx_html_attribute($sUserName),
-            	'user_name' => $sUserName
+                'user_unit' => $oProfile->getUnit(0, array('template' => 'unit_wo_info')),
+                'user_url' => $oProfile->getUrl(),
+            	'user_title' => bx_html_attribute($oProfile->getDisplayName()),
+            	'user_name' => $oProfile->getDisplayName()
             );
         }
         
@@ -223,16 +218,4 @@ class BxBaseConnection extends BxDolConnection
             $oProfile->getUnit(0, array('template' => 'unit_wo_info'))
         );
     }
-
-    protected function _getAuthorObject($iAuthorId = 0)
-    {
-    	if($iAuthorId == 0)
-    		return BxDolProfileUndefined::getInstance();
-
-        $oProfile = BxDolProfile::getInstance($iAuthorId);
-        if(!$oProfile)
-			$oProfile = BxDolProfileUndefined::getInstance();
-
-        return $oProfile;
-    }
 }