Ticket #3307

modules/base/groups/classes/BxBaseModGroupsTemplate.php

@@ -33,10 +33,10 @@ class BxBaseModGroupsTemplate extends BxBaseModProfileTemplate
         $this->_sUnitClassShowCase .= ' bx-base-groups-unit-with-cover bx-base-groups-unit-showcase';
     }
 
-    function unitVars ($aData, $isCheckPrivateContent = true, $sTemplateName = 'unit.html')
+    function unitVars ($aData, $isCheckPrivateContent = true, $mixedTemplate = false, $aParams = array())
     {
-        $aVars = parent::unitVars ($aData, $isCheckPrivateContent, $sTemplateName);
-        
+        $aVars = parent::unitVars ($aData, $isCheckPrivateContent, $mixedTemplate, $aParams);
+
         $CNF = &$this->_oConfig->CNF;
 
         $oProfile = BxDolProfile::getInstance($aData[$CNF['FIELD_AUTHOR']]);

modules/base/profile/classes/BxBaseModProfileTemplate.php

@@ -47,9 +47,12 @@ class BxBaseModProfileTemplate extends BxBaseModGeneralTemplate
     /**
      * Get profile unit
      */
-    function unit ($aData, $isCheckPrivateContent = true, $mixedTemplate = false)
+    function unit ($aData, $isCheckPrivateContent = true, $mixedTemplate = false, $aParams = array())
     {
         list($sTemplate) = is_array($mixedTemplate) ? $mixedTemplate : array($mixedTemplate);
+
+        if(!empty($aParams['template_name']))
+            $sTemplate = $aParams['template_name'];
         if(empty($sTemplate))
             $sTemplate = $this->_sUnitDefault;
         
@@ -66,22 +69,38 @@ class BxBaseModProfileTemplate extends BxBaseModGeneralTemplate
                 $sTemplate = $sTemplatePrivate;
             }
         }
-        
-        $aVars = $this->unitVars($aData, $isCheckPrivateContent, $mixedTemplate);
+
+        $aVars = $this->unitVars($aData, $isCheckPrivateContent, $mixedTemplate, $aParams);
+        bx_alert($oModule->getName(), 'unit', 0, 0, array(
+            'data' => $aData,
+            'check_private_content' => $isCheckPrivateContent,
+            'template' => $mixedTemplate,
+            'params' => $aParams,
+            'tmpl_name' => &$sTemplate,
+            'tmpl_vars' => &$aVars
+        ));
  
         return $this->parseHtmlByName($sTemplate, $aVars);
     }
 
-    function unitVars ($aData, $isCheckPrivateContent = true, $mixedTemplate = false)
+    function unitVars ($aData, $isCheckPrivateContent = true, $mixedTemplate = false, $aParams = array())
     {
         $CNF = &$this->_oConfig->CNF;
 
         list($sTemplate, $sTemplateSize, $aTemplateVars) = is_array($mixedTemplate) ? $mixedTemplate : array($mixedTemplate, false, array());
 
+        if(!empty($aParams['template_name']))
+            $sTemplate = $aParams['template_name'];
         if(empty($sTemplate))
             $sTemplate = $this->_sUnitDefault;
+
+        if(!empty($aParams['template_size']))
+            $sTemplateSize = $aParams['template_size'];
         if(empty($sTemplateSize))
             $sTemplateSize = $this->_getUnitSize($aData, $sTemplate);
+
+        if(!empty($aParams['template_vars']) && is_array($aParams['template_vars']))
+            $aTemplateVars = $aParams['template_vars'];
         if(empty($aTemplateVars) || !is_array($aTemplateVars))
             $aTemplateVars = array();
 

modules/base/text/classes/BxBaseModTextTemplate.php

@@ -37,11 +37,26 @@ class BxBaseModTextTemplate extends BxBaseModGeneralTemplate
 
     function unit ($aData, $isCheckPrivateContent = true, $sTemplateName = 'unit.html', $aParams = array())
     {
+        if(!empty($aParams['template_name']))
+            $sTemplateName = $aParams['template_name'];
+        else 
+            $aParams['template_name'] = $sTemplateName;
+
     	$sResult = $this->checkPrivacy ($aData, $isCheckPrivateContent, $this->getModule(), $sTemplateName);
     	if($sResult)
-            return $sResult;
-        $aParams['template_name'] = $sTemplateName;
-		return $this->parseHtmlByName($sTemplateName, $this->getUnit($aData, $aParams));
+            return $sResult;            
+
+        $aTemplateVars = $this->getUnit($aData, $aParams);
+        bx_alert($this->getModule()->getName(), 'unit', 0, 0, array(
+            'data' => $aData,
+            'check_private_content' => $isCheckPrivateContent,
+            'template' => $sTemplateName,
+            'params' => $aParams,
+            'tmpl_name' => &$sTemplateName,
+            'tmpl_vars' => &$aTemplateVars
+        ));
+
+        return $this->parseHtmlByName($sTemplateName, $aTemplateVars);
     }
 
     function entryAttachments ($aData, $aParams = array())

modules/boonex/events/classes/BxEventsTemplate.php

@@ -20,9 +20,9 @@ class BxEventsTemplate extends BxBaseModGroupsTemplate
         parent::__construct($oConfig, $oDb);
     }
 
-    function unitVars ($aData, $isCheckPrivateContent = true, $sTemplateName = 'unit.html')
+    function unitVars ($aData, $isCheckPrivateContent = true, $mixedTemplate = false, $aParams = array())
     {
-        $aVars = parent::unitVars ($aData, $isCheckPrivateContent, $sTemplateName);
+        $aVars = parent::unitVars ($aData, $isCheckPrivateContent, $mixedTemplate, $aParams);
 
         $CNF = &$this->_oConfig->CNF;