Ticket #1523 - Core and Modules' changes.

modules/base/general/classes/BxBaseModGeneralMenuSnippetMeta.php

@@ -9,9 +9,9 @@
  * @{
  */
 
-class BxBaseModGeneralMenuSnippetMeta extends BxTemplMenuCustom
+class BxBaseModGeneralMenuSnippetMeta extends BxTemplMenuUnitMeta
 {
-	protected $_bShowZeros;
+    protected $_bShowZeros;
 
     protected $_sModule;
     protected $_oModule;
@@ -21,11 +21,14 @@ class BxBaseModGeneralMenuSnippetMeta extends BxTemplMenuCustom
 
     public function __construct($aObject, $oTemplate = false)
     {
+        $this->_oModule = BxDolModule::getInstance($this->_sModule);
+        if(empty($oTemplate))
+            $oTemplate = $this->_oModule->_oTemplate;
+
         parent::__construct($aObject, $oTemplate);
 
+        $this->_sStylePrefix = 'bx-base-general-unit-meta';
         $this->_bShowZeros = false;
-
-        $this->_oModule = BxDolModule::getInstance($this->_sModule);
     }
 
     public function getCode()
@@ -51,7 +54,7 @@ class BxBaseModGeneralMenuSnippetMeta extends BxTemplMenuCustom
 
         $oProfile = BxDolProfile::getInstanceMagic($this->_aContentInfo[$CNF['FIELD_AUTHOR']]);
 
-        return $this->_oTemplate->getUnitMetaItemLink($oProfile->getDisplayName(), array(
+        return $this->getUnitMetaItemLink($oProfile->getDisplayName(), array(
             'href' => $oProfile->getUrl(),
             'class' => 'bx-base-text-unit-author'
         ));
@@ -61,7 +64,7 @@ class BxBaseModGeneralMenuSnippetMeta extends BxTemplMenuCustom
     {
         $CNF = &$this->_oModule->_oConfig->CNF;
 
-        return $this->_oTemplate->getUnitMetaItemText(bx_time_js($this->_aContentInfo[$CNF['FIELD_ADDED']], BX_FORMAT_DATE));
+        return $this->getUnitMetaItemText(bx_time_js($this->_aContentInfo[$CNF['FIELD_ADDED']], BX_FORMAT_DATE));
     }
 
     protected function _getMenuItemCategory($aItem)
@@ -76,7 +79,7 @@ class BxBaseModGeneralMenuSnippetMeta extends BxTemplMenuCustom
             return false;
 
         $sTitle = $oCategory->getCategoryTitle($this->_aContentInfo[$CNF['FIELD_CATEGORY']]);
-        return $this->_oTemplate->getUnitMetaItemCustom($oCategory->getCategoryLink($sTitle, $this->_aContentInfo[$CNF['FIELD_CATEGORY']]));
+        return $this->getUnitMetaItemCustom($oCategory->getCategoryLink($sTitle, $this->_aContentInfo[$CNF['FIELD_CATEGORY']]));
     }
 
     protected function _getMenuItemTags($aItem)
@@ -90,7 +93,7 @@ class BxBaseModGeneralMenuSnippetMeta extends BxTemplMenuCustom
         if(!$oMetatags || !$oMetatags->keywordsIsEnabled())
             return false;
 
-        return $this->_oTemplate->getUnitMetaItemCustom($oMetatags->getKeywordsList($this->_aContentInfo[$CNF['FIELD_ID']], 3));
+        return $this->getUnitMetaItemCustom($oMetatags->getKeywordsList($this->_aContentInfo[$CNF['FIELD_ID']], 3));
     }
 
     protected function _getMenuItemViews($aItem)
@@ -100,7 +103,7 @@ class BxBaseModGeneralMenuSnippetMeta extends BxTemplMenuCustom
         if(empty($CNF['FIELD_VIEWS']) || (empty($this->_aContentInfo[$CNF['FIELD_VIEWS']]) && !$this->_bShowZeros))
             return false;
 
-        return $this->_oTemplate->getUnitMetaItemText(_t('_view_n_views', $this->_aContentInfo[$CNF['FIELD_VIEWS']]));
+        return $this->getUnitMetaItemText(_t('_view_n_views', $this->_aContentInfo[$CNF['FIELD_VIEWS']]));
     }
 
     protected function _getMenuItemRating($aItem)
@@ -114,7 +117,7 @@ class BxBaseModGeneralMenuSnippetMeta extends BxTemplMenuCustom
         if(!$oVotes)
             return false;
 
-        return $this->_oTemplate->getUnitMetaItemCustom($oVotes->getElementInline(array('show_counter' => true)));
+        return $this->getUnitMetaItemCustom($oVotes->getElementInline(array('show_counter' => true)));
     }
 
     protected function _getMenuItemComments($aItem)
@@ -128,7 +131,7 @@ class BxBaseModGeneralMenuSnippetMeta extends BxTemplMenuCustom
         if(!$oComments || !$oComments->isEnabled())
             return false;
 
-        return $this->_oTemplate->getUnitMetaItemLink(_t('_cmt_txt_n_comments', $this->_aContentInfo[$CNF['FIELD_COMMENTS']]), array(
+        return $this->getUnitMetaItemLink(_t('_cmt_txt_n_comments', $this->_aContentInfo[$CNF['FIELD_COMMENTS']]), array(
             'href' => $oComments->getListUrl()
         ));
     }
@@ -150,15 +153,15 @@ class BxBaseModGeneralMenuSnippetMeta extends BxTemplMenuCustom
             return $sResult;
         
         if(!empty($aItem['link']))
-            $sResult = $this->_oTemplate->getUnitMetaItemLink($aItem['title'], array(
+            $sResult = $this->getUnitMetaItemLink($aItem['title'], array(
                 'href' => $aItem['link']
             ));
         else if(!empty($aItem['onclick']))
-            $sResult = $this->_oTemplate->getUnitMetaItemButtonSmall($aItem['title'], array(
+            $sResult = $this->getUnitMetaItemButtonSmall($aItem['title'], array(
             	'onclick' => $aItem['onclick']
             ));
         else 
-            $sResult = $this->_oTemplate->getUnitMetaItemText($aItem['title']);
+            $sResult = $this->getUnitMetaItemText($aItem['title']);
         
         return $sResult;
     }

modules/base/general/classes/BxBaseModGeneralTemplate.php

@@ -60,31 +60,6 @@ class BxBaseModGeneralTemplate extends BxDolModuleTemplate
         return ($mixedWrap === true || (is_array($mixedWrap) && isset($mixedWrap['wrap']) && $mixedWrap['wrap'] === true)) ? $this->_wrapInTagJsCode($sContent) : $sContent;
     }
 
-    public function getUnitMetaItemLink($sContent, $aAttrs = array())
-    {
-        return $this->getUnitMetaItem('a', $sContent, $aAttrs);
-    }
-
-    public function getUnitMetaItemText($sContent, $aAttrs = array())
-    {
-        return $this->getUnitMetaItem('span', $sContent, $aAttrs);
-    }
-
-    public function getUnitMetaItemButton($sContent, $aAttrs = array())
-    {
-        return $this->getUnitMetaItem('button', $sContent, $aAttrs);
-    }
-
-    public function getUnitMetaItemButtonSmall($sContent, $aAttrs = array())
-    {
-        return $this->getUnitMetaItem('sbutton', $sContent, $aAttrs);
-    }
-
-    public function getUnitMetaItemCustom($sContent)
-    {
-        return $this->getUnitMetaItem('custom', $sContent);
-    }
-
     public function getProfileLink($mixedProfile)
     {
     	if(!is_array($mixedProfile))
@@ -220,47 +195,7 @@ class BxBaseModGeneralTemplate extends BxDolModuleTemplate
         ));
     }
 
-    protected function getUnitMetaItem($sName, $sContent, $aAttrs = array(), $sTemplate = 'unit_meta_item.html')
-    {
-        if(empty($sContent))
-            return '';
-
-        if(!is_array($aAttrs))
-            $aAttrs = array();
-
-        $aTags = array('span', 'a', 'button', 'sbutton', 'custom');
-
-        $sTmplVarsClass = ''; 
-        if(!empty($aAttrs['class'])) {
-            $sTmplVarsClass = $aAttrs['class'];
-            unset($aAttrs['class']);
-        }
-
-        $aTmplVarsAttrs = array();
-        foreach($aAttrs as $sKey => $sValue)
-            $aTmplVarsAttrs[] = array('key' => $sKey, 'value' => bx_html_attribute($sValue));
-
-        $aTmplVars = array();
-        foreach($aTags as $sTag) {
-            $aTmplVarsTag = array();
-            $bTmplVarsTag = $sTag == $sName;
-            if($bTmplVarsTag)
-                $aTmplVarsTag = array(
-                    'class' => $sTmplVarsClass,
-                    'content' => $sContent,
-                    'bx_repeat:attrs' => $aTmplVarsAttrs
-                );
-
-            $aTmplVars['bx_if:' . $sTag] = array(
-            	'condition' => $bTmplVarsTag,
-                'content' => $aTmplVarsTag
-            );
-        }
-
-        return $this->parseHtmlByName($sTemplate, $aTmplVars);
-    }
-
-	protected function getAttachments ($sStorage, $aData, $aParams = array())
+    protected function getAttachments ($sStorage, $aData, $aParams = array())
     {
         $CNF = &$this->getModule()->_oConfig->CNF;
 

modules/base/general/template/unit_meta_item.html

@@ -1,5 +1 @@
-<bx_if:span><span class="bx-base-general-unit-meta-div bx-def-font-grayed">&#183;&nbsp;</span><span class="bx-base-general-unit-meta-item"><span class="bx-def-font-grayed __class__" <bx_repeat:attrs>__key__="__value__"</bx_repeat:attrs>>__content__</span></span></bx_if:span>
-<bx_if:a><span class="bx-base-general-unit-meta-div bx-def-font-grayed">&#183;&nbsp;</span><span class="bx-base-general-unit-meta-item"><a class="__class__" <bx_repeat:attrs>__key__="__value__"</bx_repeat:attrs>>__content__</a></span></bx_if:a>
-<bx_if:button><span class="bx-base-general-unit-meta-div bx-def-font-grayed">&#183;&nbsp;</span><span class="bx-base-general-unit-meta-item"><a class="bx-btn __class__" <bx_repeat:attrs>__key__="__value__"</bx_repeat:attrs>>__content__</a></span></bx_if:button>
-<bx_if:sbutton><span class="bx-base-general-unit-meta-div bx-def-font-grayed">&#183;&nbsp;</span><span class="bx-base-general-unit-meta-item"><a class="bx-btn bx-btn-small __class__" <bx_repeat:attrs>__key__="__value__"</bx_repeat:attrs>>__content__</a></span></bx_if:sbutton>
-<bx_if:custom><span class="bx-base-general-unit-meta-div bx-def-font-grayed">&#183;&nbsp;</span><span class="bx-base-general-unit-meta-item">__content__</span></bx_if:custom>
+<bx_include_base:../../../../template/unit_meta_item.html />

modules/base/groups/classes/BxBaseModGroupsMenuSnippetMeta.php

@@ -53,7 +53,7 @@ class BxBaseModGroupsMenuSnippetMeta extends BxBaseModProfileMenuSnippetMeta
         if(!$iFriends)
             return false;
 
-        return $this->_oTemplate->getUnitMetaItemText(_t('_sys_menu_item_title_sm_members', $iFriends));
+        return $this->getUnitMetaItemText(_t('_sys_menu_item_title_sm_members', $iFriends));
     }
 
     protected function _getMenuItemConnectionsTitle($sAction, &$oConnection)
@@ -110,7 +110,7 @@ class BxBaseModGroupsMenuSnippetMeta extends BxBaseModProfileMenuSnippetMeta
         if (!($sLocation = $oMeta->locationsString($this->_iContentId, false, $bCountryOnly ? array('country_only' => 1) : array('country_city_only' => 1))))
             return false;
 
-        return $this->_oTemplate->getUnitMetaItemText($sLocation);
+        return $this->getUnitMetaItemText($sLocation);
     }
 }
 

modules/base/profile/classes/BxBaseModProfileMenuSnippetMeta.php

@@ -90,7 +90,7 @@ class BxBaseModProfileMenuSnippetMeta extends BxBaseModGeneralMenuSnippetMeta
         if(!$iFriends && !$this->_bShowZeros)
             return false;
 
-        return $this->_oTemplate->getUnitMetaItemText(_t('_sys_menu_item_title_sm_friends', $iFriends));
+        return $this->getUnitMetaItemText(_t('_sys_menu_item_title_sm_friends', $iFriends));
     }
 
     protected function _getMenuItemSubscribers($aItem)
@@ -108,7 +108,7 @@ class BxBaseModProfileMenuSnippetMeta extends BxBaseModGeneralMenuSnippetMeta
         if(!$iSubscribers && !$this->_bShowZeros)
             return false;
 
-        return $this->_oTemplate->getUnitMetaItemText(_t('_sys_menu_item_title_sm_subscribers', $iSubscribers));
+        return $this->getUnitMetaItemText(_t('_sys_menu_item_title_sm_subscribers', $iSubscribers));
     }
 
     protected function _getMenuItemConnection($sConnection, $sAction, &$aItem)
@@ -129,7 +129,7 @@ class BxBaseModProfileMenuSnippetMeta extends BxBaseModGeneralMenuSnippetMeta
         if(empty($sTitle))
             return false;
 
-        return $this->_oTemplate->getUnitMetaItemButtonSmall($sTitle, array(
+        return $this->getUnitMetaItemButtonSmall($sTitle, array(
         	'onclick' => "bx_conn_action(this, '" . $sConnection . "', '" . $sAction . "', '" . $iContentProfile . "')"
         ));
     }
@@ -192,7 +192,7 @@ class BxBaseModProfileMenuSnippetMeta extends BxBaseModGeneralMenuSnippetMeta
             return false;
 
         $aMembership = BxDolAcl::getInstance()->getMemberMembershipInfo($this->_oContentProfile->id());
-        return $aMembership ? $this->_oTemplate->getUnitMetaItemText(_t($aMembership['name'])) : false;
+        return $aMembership ? $this->getUnitMetaItemText(_t($aMembership['name'])) : false;
     }
 }
 

modules/boonex/decorous/data/template/system/scripts/BxTemplMenuUnitMeta.php

@@ -0,0 +1,21 @@
+<?php defined('BX_DOL') or die('hack attempt');
+/**
+ * Copyright (c) UNA, Inc - https://una.io
+ * MIT License - https://opensource.org/licenses/MIT
+ *
+ * @defgroup    UnaTemplate UNA Template Classes
+ * @{
+ */
+
+/**
+ * @see BxDolMenu
+ */
+class BxTemplMenuUnitMeta extends BxBaseMenuUnitMeta
+{
+    public function __construct ($aObject, $oTemplate = false)
+    {
+        parent::__construct ($aObject, $oTemplate);
+    }
+}
+
+/** @} */

modules/boonex/market/classes/BxMarketMenuSnippetMeta.php

@@ -26,7 +26,7 @@ class BxMarketMenuSnippetMeta extends BxBaseModTextMenuSnippetMeta
         if(!$oProfile) 
             $oProfile = BxDolProfileUndefined::getInstance();
 
-        return $this->_oTemplate->getUnitMetaItemText($oProfile->getDisplayName());
+        return $this->getUnitMetaItemText($oProfile->getDisplayName());
     }
 }
 

modules/boonex/ocean/data/template/system/scripts/BxTemplMenuUnitMeta.php

@@ -0,0 +1,21 @@
+<?php defined('BX_DOL') or die('hack attempt');
+/**
+ * Copyright (c) UNA, Inc - https://una.io
+ * MIT License - https://opensource.org/licenses/MIT
+ *
+ * @defgroup    UnaTemplate UNA Template Classes
+ * @{
+ */
+
+/**
+ * @see BxDolMenu
+ */
+class BxTemplMenuUnitMeta extends BxBaseMenuUnitMeta
+{
+    public function __construct ($aObject, $oTemplate = false)
+    {
+        parent::__construct ($aObject, $oTemplate);
+    }
+}
+
+/** @} */

modules/boonex/polls/classes/BxPollsMenuSnippetMeta.php

@@ -40,7 +40,7 @@ class BxPollsMenuSnippetMeta extends BxBaseModTextMenuSnippetMeta
             ),
         ));
 
-        return $this->_oTemplate->getUnitMetaItemCustom($sContent);
+        return $this->getUnitMetaItemCustom($sContent);
     }
 }
 

modules/boonex/protean/data/template/system/scripts/BxTemplMenuUnitMeta.php

@@ -0,0 +1,21 @@
+<?php defined('BX_DOL') or die('hack attempt');
+/**
+ * Copyright (c) UNA, Inc - https://una.io
+ * MIT License - https://opensource.org/licenses/MIT
+ *
+ * @defgroup    UnaTemplate UNA Template Classes
+ * @{
+ */
+
+/**
+ * @see BxDolMenu
+ */
+class BxTemplMenuUnitMeta extends BxBaseMenuUnitMeta
+{
+    public function __construct ($aObject, $oTemplate = false)
+    {
+        parent::__construct ($aObject, $oTemplate);
+    }
+}
+
+/** @} */

template/scripts/BxBaseMenuUnitMeta.php

@@ -0,0 +1,92 @@
+<?php defined('BX_DOL') or die('hack attempt');
+/**
+ * Copyright (c) UNA, Inc - https://una.io
+ * MIT License - https://opensource.org/licenses/MIT
+ *
+ * @defgroup    UnaBaseView UNA Base Representation Classes
+ * @{
+ */
+
+/**
+ * Menu representation.
+ * @see BxDolMenu
+ */
+class BxBaseMenuUnitMeta extends BxTemplMenuCustom
+{
+    protected $_sStylePrefix;
+
+    public function __construct ($aObject, $oTemplate)
+    {
+        parent::__construct ($aObject, $oTemplate);
+
+        $this->_sStylePrefix = 'sys-meta';
+    }
+
+    public function getUnitMetaItemLink($sContent, $aAttrs = array())
+    {
+        return $this->getUnitMetaItem('a', $sContent, $aAttrs);
+    }
+
+    public function getUnitMetaItemText($sContent, $aAttrs = array())
+    {
+        return $this->getUnitMetaItem('span', $sContent, $aAttrs);
+    }
+
+    public function getUnitMetaItemButton($sContent, $aAttrs = array())
+    {
+        return $this->getUnitMetaItem('button', $sContent, $aAttrs);
+    }
+
+    public function getUnitMetaItemButtonSmall($sContent, $aAttrs = array())
+    {
+        return $this->getUnitMetaItem('sbutton', $sContent, $aAttrs);
+    }
+
+    public function getUnitMetaItemCustom($sContent)
+    {
+        return $this->getUnitMetaItem('custom', $sContent);
+    }
+
+    public function getUnitMetaItem($sName, $sContent, $aAttrs = array(), $sTemplate = 'unit_meta_item.html')
+    {
+        if(empty($sContent))
+            return '';
+
+        if(!is_array($aAttrs))
+            $aAttrs = array();
+
+        $aTags = array('span', 'a', 'button', 'sbutton', 'custom');
+
+        $sTmplVarsClass = ''; 
+        if(!empty($aAttrs['class'])) {
+            $sTmplVarsClass = $aAttrs['class'];
+            unset($aAttrs['class']);
+        }
+
+        $aTmplVarsAttrs = array();
+        foreach($aAttrs as $sKey => $sValue)
+            $aTmplVarsAttrs[] = array('key' => $sKey, 'value' => bx_html_attribute($sValue));
+
+        $aTmplVars = array();
+        foreach($aTags as $sTag) {
+            $aTmplVarsTag = array();
+            $bTmplVarsTag = $sTag == $sName;
+            if($bTmplVarsTag)
+                $aTmplVarsTag = array(
+                    'style_prefix' => $this->_sStylePrefix,
+                    'class' => $sTmplVarsClass,
+                    'content' => $sContent,
+                    'bx_repeat:attrs' => $aTmplVarsAttrs
+                );
+
+            $aTmplVars['bx_if:' . $sTag] = array(
+            	'condition' => $bTmplVarsTag,
+                'content' => $aTmplVarsTag
+            );
+        }
+
+        return $this->_oTemplate->parseHtmlByName($sTemplate, $aTmplVars);
+    }
+}
+
+/** @} */

template/unit_meta_item.html

@@ -0,0 +1,5 @@
+<bx_if:span><span class="__style_prefix__-div bx-def-font-grayed">&#183;&nbsp;</span><span class="__style_prefix__-item"><span class="bx-def-font-grayed __class__" <bx_repeat:attrs>__key__="__value__"</bx_repeat:attrs>>__content__</span></span></bx_if:span>
+<bx_if:a><span class="__style_prefix__-div bx-def-font-grayed">&#183;&nbsp;</span><span class="__style_prefix__-item"><a class="__class__" <bx_repeat:attrs>__key__="__value__"</bx_repeat:attrs>>__content__</a></span></bx_if:a>
+<bx_if:button><span class="__style_prefix__-div bx-def-font-grayed">&#183;&nbsp;</span><span class="__style_prefix__-item"><a class="bx-btn __class__" <bx_repeat:attrs>__key__="__value__"</bx_repeat:attrs>>__content__</a></span></bx_if:button>
+<bx_if:sbutton><span class="__style_prefix__-div bx-def-font-grayed">&#183;&nbsp;</span><span class="__style_prefix__-item"><a class="bx-btn bx-btn-small __class__" <bx_repeat:attrs>__key__="__value__"</bx_repeat:attrs>>__content__</a></span></bx_if:sbutton>
+<bx_if:custom><span class="__style_prefix__-div bx-def-font-grayed">&#183;&nbsp;</span><span class="__style_prefix__-item">__content__</span></bx_if:custom>