Ticket #4746 - Setting location to privacy me only doesn't disable location blocks.

inc/classes/BxDolMetatags.php

@@ -245,6 +245,11 @@ class BxDolMetatags extends BxDolFactory implements iBxDolFactoryObject
         return $aValues;
     }
 
+    public function getModule()
+    {
+        return $this->_aObject['module'];
+    }
+
     /**
      * Add all available meta tags to the head section 
      * @return number of successfully added metas

modules/base/general/classes/BxBaseModGeneralModule.php

@@ -1320,22 +1320,36 @@ class BxBaseModGeneralModule extends BxDolModule
         return $this->_serviceBrowse ($sParamName, array_merge(array($sParamName => $sParamVal), $aParams), BX_DB_PADDING_DEF, $bEmptyMessage, $bAjaxPaginate);
     }
 
-    public function serviceFormsHelper ()
+    public function getFormsHelper ()
     {
-        bx_import('FormsEntryHelper', $this->_aModule);
-        $sClass = $this->_aModule['class_prefix'] . 'FormsEntryHelper';
+        $sClass = 'FormsEntryHelper';
+        $oObject = null;
+
+        bx_alert('system', 'get_forms_helper', 0, 0, [
+            'class' => &$sClass,
+            'object' => &$oObject
+        ]);
+
+        if($oObject !== null) 
+            return $oObject;
+
+        bx_import($sClass, $this->_aModule);
+        $sClass = $this->_aModule['class_prefix'] . $sClass;
         return new $sClass($this);
     }
 
+    public function serviceFormsHelper ()
+    {
+        return $this->getFormsHelper();
+    }
+
 	/**
      * Add entry using provided fields' values.
      * @return array with result: 'code' is 0 on success or non-zero on error, 'message' is error message in case of error, 'content' is content info array in case of success
      */
     public function serviceEntityAdd ($iProfile, $aValues, $sDisplay = false)
     {
-        bx_import('FormsEntryHelper', $this->_aModule);
-        $sClass = $this->_aModule['class_prefix'] . 'FormsEntryHelper';
-        $oFormsHelper = new $sClass($this);
+        $oFormsHelper = $this->getFormsHelper();
         return $oFormsHelper->addData($iProfile, $aValues, $sDisplay);
     }
 
@@ -1345,9 +1359,7 @@ class BxBaseModGeneralModule extends BxDolModule
      */    
     public function serviceRedirectAfterAdd($aContentInfo)
     {
-        bx_import('FormsEntryHelper', $this->_aModule);
-        $sClass = $this->_aModule['class_prefix'] . 'FormsEntryHelper';
-        $oFormsHelper = new $sClass($this);
+        $oFormsHelper = $this->getFormsHelper();
         $oFormsHelper->redirectAfterAdd($aContentInfo);
     }
 
@@ -1376,10 +1388,7 @@ class BxBaseModGeneralModule extends BxDolModule
         }
 
         $CNF = &$this->_oConfig->CNF;
-
-        bx_import('FormsEntryHelper', $this->_aModule);
-        $sClass = $this->_aModule['class_prefix'] . 'FormsEntryHelper';
-        $oFormsHelper = new $sClass($this);
+        $oFormsHelper = $this->getFormsHelper();
 
         $sParamsKey = 'ajax_mode';
         if(isset($aParams[$sParamsKey]) && (bool)$aParams[$sParamsKey] === true)
@@ -1493,9 +1502,7 @@ class BxBaseModGeneralModule extends BxDolModule
         if($bParamsArray && !empty($sParams['display']))
             $sDisplay = $sParams['display'];
 
-        bx_import('FormsEntryHelper', $this->_aModule);
-        $sClass = $this->_aModule['class_prefix'] . 'FormsEntryHelper';
-        $oFormsHelper = new $sClass($this);
+        $oFormsHelper = $this->getFormsHelper();
         if($bParamsArray && isset($sParams['dynamic_mode']))
             $oFormsHelper->setDynamicMode($sParams['dynamic_mode']);
 
@@ -1721,8 +1728,21 @@ class BxBaseModGeneralModule extends BxDolModule
      */
     public function serviceEntityLocation ($iContentId = 0)
     {
-        $iContentId = $this->_getContent($iContentId, false);
-        if($iContentId === false)
+        $CNF = &$this->_oConfig->CNF;
+
+        $mixedContent = $this->_getContent($iContentId);
+        if($mixedContent === false)
+            return false;
+
+        list($iContentId, $aContentInfo) = $mixedContent;
+
+        $oFormsHelper = $this->getFormsHelper();
+        $oFormView = $oFormsHelper->getObjectFormView();
+        if(!$oFormView)
+            return false;
+        
+        $oFormView->initChecker($aContentInfo);
+        if(empty($CNF['FIELD_LOCATION']) || !$oFormView->isInputVisible($CNF['FIELD_LOCATION']))
             return false;
 
         return $this->_oTemplate->entryLocation ($iContentId);
@@ -1781,9 +1801,7 @@ class BxBaseModGeneralModule extends BxDolModule
      */
     public function serviceDeleteEntity ($iContentId, $sFuncDelete = 'deleteData')
     {
-        bx_import('FormsEntryHelper', $this->_aModule);
-        $sClass = $this->_oConfig->getClassPrefix() . 'FormsEntryHelper';
-        $oFormsHelper = new $sClass($this);
+        $oFormsHelper = $this->getFormsHelper();
         return $oFormsHelper->$sFuncDelete($iContentId);
     }
 
@@ -3733,9 +3751,7 @@ class BxBaseModGeneralModule extends BxDolModule
         if($iContentId === false)
             return false;
 
-        bx_import('FormsEntryHelper', $this->_aModule);
-        $sClass = $this->_aModule['class_prefix'] . 'FormsEntryHelper';
-        $oFormsHelper = new $sClass($this);
+        $oFormsHelper = $this->getFormsHelper();
         return $oFormsHelper->$sFormMethod((int)$iContentId, $sDisplay, $sCheckFunction, $bErrorMsg);
     }
 

template/scripts/BxBaseServiceMetatags.php

@@ -79,7 +79,28 @@ class BxBaseServiceMetatags extends BxDol
      */
     public function serviceLocationsMap($sObject, $iId, $aParams = array())
     {
-        return BxDolMetatags::getObjectInstance($sObject)->getLocationsMap($iId, $aParams);
+        $oMetatags = BxDolMetatags::getObjectInstance($sObject);
+        if($oMetatags === false)
+            return false;
+
+        $sModule = $oMetatags->getModule();
+
+        $aContentInfo = bx_srv($sModule, 'get_info', [$iId, false]);
+        if(empty($aContentInfo) || !is_array($aContentInfo))
+            return false;
+
+        $oFormsHelper = bx_srv($sModule, 'forms_helper');
+        $oFormView = $oFormsHelper->getObjectFormView();
+        if(!$oFormView)
+            return false;
+
+        $CNF = &BxDolModule::getInstance($sModule)->_oConfig->CNF;
+
+        $oFormView->initChecker($aContentInfo);
+        if(empty($CNF['FIELD_LOCATION']) || !$oFormView->isInputVisible($CNF['FIELD_LOCATION']))
+            return false;
+
+        return $oMetatags->getLocationsMap($iId, $aParams);
     }
 
     /**