Merge branch 'master' of https://github.com/unaio/una

modules/boonex/attendant/classes/BxAttendantModule.php

@@ -38,15 +38,14 @@ class BxAttendantModule extends BxDolModule
         
         $oSession = BxDolSession::getInstance();
         $sFirstPage = $oSession->getValue('sys_entrance_url');
-        $sFirstPage = 'page.php?i=view-group-profile&id=72';
        
         if ($sFirstPage){
-            if (getParam('bx_attendant_on_profile_after_action_url')){
+            if (getParam('bx_attendant_redirect_to_entered_page') == 'on'){
                 echo json_encode(['redirect' => BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink($sFirstPage)]);  
                 exit();
             }
             else{
-                if(getParam('bx_attendant_suggest_entered_page')){
+                if(getParam('bx_attendant_suggest_entered_page') == 'on'){
                     list($sPageLink, $aPageParams) = bx_get_base_url($sFirstPage);
                     if (isset($aPageParams['i']) && isset($aPageParams['id'])){
                         $oPage = BxDolPage::getObjectInstanceByURI($aPageParams['i']);

modules/boonex/attendant/classes/BxAttendantTemplate.php

@@ -33,8 +33,10 @@ class BxAttendantTemplate extends BxBaseModGeneralTemplate
                 BX_DIRECTORY_PATH_PLUGINS_PUBLIC . 'flickity/|flickity.css'
             ]
         );
+        if (isLogged())
+            return $this->getJsCode('main') . BxBaseFunctions::getInstance()->transBox($this->sContainerId, '', true, true);
         
-        return $this->getJsCode('main') . BxBaseFunctions::getInstance()->transBox($this->sContainerId, '', true, true);
+        return '';
     }
     
     public function popup($aModuleData, $bManual)