#4543 - Invitations: (API)

modules/boonex/invites/classes/BxInvTemplate.php

@@ -65,10 +65,6 @@ class BxInvTemplate extends BxBaseModGeneralTemplate
         $mInvitesRemain = $this->_oConfig->getCountPerUser();
         if($mInvitesRemain === true)
             $mInvitesRemain = _t('_bx_invites_txt_unlimited');
-
-        if(bx_is_api()){
-            return [bx_api_get_block('invite', ['remain' => $mInvitesRemain, 'request_url' => 'bx_invites/get_link/'])];
-        }
         
         $sUrl = bx_absolute_url(BxDolPermalinks::getInstance()->permalink($this->_oConfig->CNF['URL_INVITE']));
 
@@ -77,12 +73,19 @@ class BxInvTemplate extends BxBaseModGeneralTemplate
 
             list($sPageLink, $aPageParams) = bx_get_base_url_inline();
             $sRedirectValue = bx_append_url_params($sPageLink, $aPageParams);
+            if(bx_is_api()){
+                $sRedirectValue = $aPageParams['params'][0];
+            }
 
             $oSession = BxDolSession::getInstance();
             if($oSession->isValue($sRedirectCode))
                 $oSession->unsetValue($sRedirectCode);
             $oSession->setValue($sRedirectCode, $sRedirectValue);
         }
+        
+        if(bx_is_api()){
+            return [bx_api_get_block('invite', ['remain' => $mInvitesRemain, 'request_url' => 'bx_invites/get_link/'])];
+        }
 
         $this->getCssJs();
         return $this->parseHtmlByName('block_invite.html', [

template/scripts/BxBaseServiceAccount.php

@@ -68,7 +68,7 @@ class BxBaseServiceAccount extends BxDol
                 ])];
             else if($mixedResult === true){
                 $sRedirectUrl = BxDolForm::getSubmittedValue('relocate','post');
-                if(trim($sRedirectUrl) == ''){
+                if(empty($sRedirectUrl)){
                     $RedirectUrl = '/';
                 }
                 else{