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

inc/classes/BxDolDb.php

@@ -1327,6 +1327,9 @@ BxDolDb::getInstance();
 
 function getParam($sParamName, $bUseCache = true)
 {
+    if (bx_is_api())
+        return true;
+    
     $oObj = BxDolDb::getInstance();
     if ($oObj === null)
         return false;

inc/classes/BxDolSearch.php

@@ -545,7 +545,7 @@ class BxDolSearchResult implements iBxDolReplaceable
             'module' => $sModule,
             'unit' => 'general-' . $sUnitType . '-' . $sUnit,
             'request_url' => !empty($this->aCurrent['api_request_url']) ? $this->aCurrent['api_request_url'] : '/api.php?r=' . $sModule . '/browse/&params[]=',
-            'data' => $this->decodeData($this->getSearchData()),
+            'data' =>  defined('BX_API_PAGE') ? [] : $this->decodeData($this->getSearchData()),
             'params' => [
                 'per_page' => $this->aCurrent['paginate']['perPage'],
                 'start' => $this->aCurrent['paginate']['start'],

inc/profiles.inc.php

@@ -167,6 +167,8 @@ function bx_logout($bNotify = true)
  */
 function check_logged()
 {
+    bx_alert('account', 'logged_start', 0);
+
     $aAccTypes = array(
        BX_DOL_ROLE_ADMIN => 'admin',
        BX_DOL_ROLE_MEMBER => 'member'

modules/boonex/notifications/classes/BxNtfsModule.php

@@ -231,7 +231,7 @@ class BxNtfsModule extends BxBaseModNotificationsModule
         if(bx_is_api()) {
             $aParams['start_from_item'] = true;
 
-            $aContent = $this->_oTemplate->getPosts($aParams);
+            $aContent = defined('BX_API_PAGE') ? [] : $this->_oTemplate->getPosts($aParams);
             if(!empty($aContent) && is_array($aContent)) {
                 $iContent = count($aContent);
                 if($iContent > $aParams['per_page'])

modules/boonex/timeline/classes/BxTimelineTemplate.php

@@ -363,6 +363,8 @@ class BxTimelineTemplate extends BxBaseModNotificationsTemplate
         $oModule = $this->getModule();
 
         if (bx_is_api()){
+            if (defined('BX_API_PAGE'))
+                return [];
             $oMenuActions = BxDolMenu::getObjectInstance($this->_oConfig->getObject('menu_item_actions_all'));
             if(!$oMenuActions)
                 $oMenuActions = BxDolMenu::getObjectInstance($this->_oConfig->getObject('menu_item_actions'));

template/scripts/BxBasePage.php

@@ -400,6 +400,7 @@ class BxBasePage extends BxDolPage
      */
     public function getPageAPI ($aBlocks = [])
     {
+        define('BX_API_PAGE', true);
         $query_string  = '';
 
         if (isset(bx_get('params')[2]) && bx_get('params')[2] != ''){

template/scripts/BxBaseServiceLogin.php

@@ -179,9 +179,8 @@ class BxBaseServiceLogin extends BxDol
                 $oAccount = BxDolAccount::getInstance(trim($oForm->getCleanValue('ID')));
                 bx_login($oAccount->id(), ($oForm->getCleanValue('rememberMe') ? true : false));
                 return [
-                    bx_api_get_block('redirect', ['uri' => '/posts-home', 'timeout' => 1000]),
+                    bx_api_get_block('redirect', ['uri' => '/']),
                     bx_api_get_block('login', ['session' => BxDolSession::getInstance()->getId()], ['id' => 2]),
-                    bx_api_get_msg('Login Success 👍! Redirecting...', ['id' => 3]),
                 ];
             } 
             else {