1
0
Alex Trofimov 4 жил өмнө
parent
commit
2a7bef24fc
51 өөрчлөгдсөн 89 нэмэгдсэн , 90 устгасан
  1. 4 4
      modules/boonex/albums/classes/BxAlbumsModule.php
  2. 1 1
      modules/boonex/albums/classes/BxAlbumsPageMedia.php
  3. 1 1
      modules/boonex/albums/classes/BxAlbumsSearchResultMedia.php
  4. 3 3
      modules/boonex/albums/classes/BxAlbumsTemplate.php
  5. 2 2
      modules/boonex/antispam/classes/BxAntispamModule.php
  6. 3 3
      modules/boonex/antispam/classes/BxAntispamStudioPage.php
  7. 1 1
      modules/boonex/api/classes/BxApiModule.php
  8. 2 2
      modules/boonex/artificer/classes/BxArtificerModule.php
  9. 3 3
      modules/boonex/artificer/data/template/system/scripts/BxTemplPageHome.php
  10. 1 1
      modules/boonex/attendant/classes/BxAttendantModule.php
  11. 1 1
      modules/boonex/channels/classes/BxCnlModule.php
  12. 1 1
      modules/boonex/classes/classes/BxClssModule.php
  13. 1 1
      modules/boonex/contact/classes/BxContactModule.php
  14. 1 1
      modules/boonex/convos/classes/BxCnvFormsEntryHelper.php
  15. 2 2
      modules/boonex/convos/classes/BxCnvGrid.php
  16. 5 5
      modules/boonex/convos/classes/BxCnvTemplate.php
  17. 2 2
      modules/boonex/credits/classes/BxCreditsConfig.php
  18. 3 3
      modules/boonex/credits/classes/BxCreditsModule.php
  19. 1 1
      modules/boonex/developer/classes/BxDevBuilderPage.php
  20. 4 4
      modules/boonex/donations/classes/BxDonationsModule.php
  21. 1 1
      modules/boonex/events/classes/BxEventsDb.php
  22. 1 1
      modules/boonex/events/classes/BxEventsModule.php
  23. 1 1
      modules/boonex/forum/classes/BxForumGrid.php
  24. 1 1
      modules/boonex/forum/classes/BxForumTemplate.php
  25. 1 1
      modules/boonex/help_tours/classes/BxHelpToursGridItems.php
  26. 1 1
      modules/boonex/help_tours/classes/BxHelpToursGridTours.php
  27. 2 2
      modules/boonex/invites/classes/BxInvGridInvites.php
  28. 1 1
      modules/boonex/invites/classes/BxInvModule.php
  29. 1 1
      modules/boonex/invites/classes/BxInvStudioPage.php
  30. 5 5
      modules/boonex/invites/classes/BxInvTemplate.php
  31. 1 1
      modules/boonex/market/classes/BxMarketGridLicensesAdministration.php
  32. 5 5
      modules/boonex/market/classes/BxMarketModule.php
  33. 1 1
      modules/boonex/market/classes/BxMarketTemplate.php
  34. 3 3
      modules/boonex/massmailer/classes/BxMassMailerGridCampaigns.php
  35. 1 1
      modules/boonex/massmailer/classes/BxMassMailerTemplate.php
  36. 1 1
      modules/boonex/notifications/classes/BxNtfsConfig.php
  37. 1 1
      modules/boonex/notifications/classes/BxNtfsModule.php
  38. 1 1
      modules/boonex/payment/classes/BxPaymentDetails.php
  39. 1 1
      modules/boonex/quoteofday/classes/BxQuoteOfDayStudioPage.php
  40. 1 1
      modules/boonex/reviews/classes/BxReviewsTemplate.php
  41. 1 1
      modules/boonex/shopify/classes/BxShopifyModule.php
  42. 1 1
      modules/boonex/snipcart/classes/BxSnipcartConfig.php
  43. 1 1
      modules/boonex/snipcart/classes/BxSnipcartModule.php
  44. 1 1
      modules/boonex/stream/classes/BxStrmGridRecordings.php
  45. 1 1
      modules/boonex/stream/classes/BxStrmModule.php
  46. 1 1
      modules/boonex/stream/classes/BxStrmTemplate.php
  47. 1 1
      modules/boonex/tasks/classes/BxTasksDb.php
  48. 1 1
      modules/boonex/tasks/classes/BxTasksModule.php
  49. 6 7
      modules/boonex/timeline/classes/BxTimelineConfig.php
  50. 1 1
      modules/boonex/timeline/classes/BxTimelineModule.php
  51. 1 1
      modules/boonex/timeline/classes/BxTimelineTemplate.php

+ 4 - 4
modules/boonex/albums/classes/BxAlbumsModule.php

@@ -239,7 +239,7 @@ class BxAlbumsModule extends BxBaseModTextModule
         return parent::serviceEntityAllActions (array($iMediaId, $aMediaInfo), array_merge(array(
             'object_menu' => $CNF['OBJECT_MENU_ACTIONS_VIEW_MEDIA_ALL'],
             'object_transcoder' => $CNF['OBJECT_IMAGES_TRANSCODER_BIG'],
-            'entry_url' => BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=' . $CNF['URI_VIEW_MEDIA'] . '&id=' . $iMediaId),
+            'entry_url' => bx_absolute_url(BxDolPermalinks::getInstance()->permalink('page.php?i=' . $CNF['URI_VIEW_MEDIA'] . '&id=' . $iMediaId)),
             'entry_title' => $aMediaInfo['title'],
             'entry_thumb' => $aMediaInfo['file_id']
         ), $aParams));
@@ -548,7 +548,7 @@ class BxAlbumsModule extends BxBaseModTextModule
             'sample' => isset($CNF['T']['txt_sample_single_with_article']) ? $CNF['T']['txt_sample_single_with_article'] : $CNF['T']['txt_sample_single'],
             'sample_wo_article' => $CNF['T']['txt_sample_single'],
     	    'sample_action' => $CNF['T']['txt_sample_action_changed'],
-            'url' => BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=' . $CNF['URI_VIEW_ENTRY'] . '&id=' . $iContentId),
+            'url' => bx_absolute_url(BxDolPermalinks::getInstance()->permalink('page.php?i=' . $CNF['URI_VIEW_ENTRY'] . '&id=' . $iContentId)),
             'content' => $this->_getContentForTimelineMedia($aEvent, $aContentInfo, $aBrowseParams), //a string to display or array to parse default template before displaying.
             'date' => $aContentInfo[$CNF['FIELD_ADDED']],
             'views' => $aViews,
@@ -774,7 +774,7 @@ class BxAlbumsModule extends BxBaseModTextModule
         $oUploader = BxDolUploader::getObjectInstance($CNF['OBJECT_UPLOADERS'][0], $CNF['OBJECT_STORAGE'], '');
         $oUploader->deleteGhost($aMediaInfo['file_id'], bx_get_logged_profile_id());
         
-        echoJson(['redirect' => BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=' . $CNF['URI_VIEW_ENTRY'] . '&id=' . $aMediaInfo['content_id'])]);
+        echoJson(['redirect' => bx_absolute_url(BxDolPermalinks::getInstance()->permalink('page.php?i=' . $CNF['URI_VIEW_ENTRY'] . '&id=' . $aMediaInfo['content_id']))]);
     }
 
     public function actionMoveMedia($iMediaId)
@@ -978,7 +978,7 @@ class BxAlbumsModule extends BxBaseModTextModule
     {
     	$CNF = &$this->_oConfig->CNF;
 
-        $sUrl = BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=' . $CNF['URI_VIEW_ENTRY'] . '&id=' . $aContentInfo[$CNF['FIELD_ID']]);
+        $sUrl = bx_absolute_url(BxDolPermalinks::getInstance()->permalink('page.php?i=' . $CNF['URI_VIEW_ENTRY'] . '&id=' . $aContentInfo[$CNF['FIELD_ID']]));
         $sTitle = isset($CNF['FIELD_TITLE']) && isset($aContentInfo[$CNF['FIELD_TITLE']]) ? $aContentInfo[$CNF['FIELD_TITLE']] : (isset($CNF['FIELD_TEXT']) && isset($aContentInfo[$CNF['FIELD_TEXT']]) ? strmaxtextlen($aContentInfo[$CNF['FIELD_TEXT']], 20, '...') : '');
 
         $oStorage = BxDolStorage::getObjectInstance($CNF['OBJECT_STORAGE']);

+ 1 - 1
modules/boonex/albums/classes/BxAlbumsPageMedia.php

@@ -43,7 +43,7 @@ class BxAlbumsPageMedia extends BxTemplPage
             ));
 
             $sTitle = isset($this->_aAlbumInfo[$CNF['FIELD_TITLE']]) ? $this->_aAlbumInfo[$CNF['FIELD_TITLE']] : strmaxtextlen($this->_aAlbumInfo[$CNF['FIELD_TEXT']], 20, '...');
-            $sUrl = BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=' . $CNF['URI_VIEW_ENTRY'] . '&id=' . $this->_aAlbumInfo[$CNF['FIELD_ID']]);
+            $sUrl = bx_absolute_url(BxDolPermalinks::getInstance()->permalink('page.php?i=' . $CNF['URI_VIEW_ENTRY'] . '&id=' . $this->_aAlbumInfo[$CNF['FIELD_ID']]));
 
             // select view entry submenu
             $oMenuSubmenu = BxDolMenu::getObjectInstance('sys_site_submenu');

+ 1 - 1
modules/boonex/albums/classes/BxAlbumsSearchResultMedia.php

@@ -253,7 +253,7 @@ class BxAlbumsSearchResultMedia extends BxBaseModTextSearchResult
 
     function getRssUnitLink (&$a)
     {
-        return BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=' . $this->oModule->_oConfig->CNF['URI_VIEW_MEDIA'] . '&id=' . $a['id']);
+        return bx_absolute_url(BxDolPermalinks::getInstance()->permalink('page.php?i=' . $this->oModule->_oConfig->CNF['URI_VIEW_MEDIA'] . '&id=' . $a['id']));
     }
 
     protected function _updateCurrentForOrderByGhosts()

+ 3 - 3
modules/boonex/albums/classes/BxAlbumsTemplate.php

@@ -38,7 +38,7 @@ class BxAlbumsTemplate extends BxBaseModTextTemplate
             return $s;
 
         // get entry url        
-        $sUrl = BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=' . $CNF['URI_VIEW_ENTRY'] . '&id=' . $aData[$CNF['FIELD_ID']]);
+        $sUrl = bx_absolute_url(BxDolPermalinks::getInstance()->permalink('page.php?i=' . $CNF['URI_VIEW_ENTRY'] . '&id=' . $aData[$CNF['FIELD_ID']]));
 
         $oProfile = BxDolProfile::getInstance($aData[$CNF['FIELD_AUTHOR']]);
         if (!$oProfile) 
@@ -197,7 +197,7 @@ class BxAlbumsTemplate extends BxBaseModTextTemplate
         if (!($aAlbumInfo = $oModule->_oDb->getContentInfoById($aMediaInfo['content_id'])))
             return '';        
 
-        $sUrlAlbum = BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=' . $CNF['URI_VIEW_ENTRY'] . '&id=' . $aAlbumInfo[$CNF['FIELD_ID']]);
+        $sUrlAlbum = bx_absolute_url(BxDolPermalinks::getInstance()->permalink('page.php?i=' . $CNF['URI_VIEW_ENTRY'] . '&id=' . $aAlbumInfo[$CNF['FIELD_ID']]));
 
         $iProfileId = $aAlbumInfo[$CNF['FIELD_AUTHOR']];
         $oProfile = BxDolProfile::getInstance($iProfileId);
@@ -331,7 +331,7 @@ class BxAlbumsTemplate extends BxBaseModTextTemplate
 
     public function getViewMediaUrl($CNF, $iMediaId, $sContext = '')
     {
-        return BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=' . $CNF['URI_VIEW_MEDIA'] . '&id=' . $iMediaId . (!empty($sContext) ? '&context=' . $sContext : ''));
+        return bx_absolute_url(BxDolPermalinks::getInstance()->permalink('page.php?i=' . $CNF['URI_VIEW_MEDIA'] . '&id=' . $iMediaId . (!empty($sContext) ? '&context=' . $sContext : '')));
     }
 
     public function getNextPrevMedia($aMediaInfo, $isNext, $sContext, $aParamsSearchResult = array())

+ 2 - 2
modules/boonex/antispam/classes/BxAntispamModule.php

@@ -271,8 +271,8 @@ class BxAntispamModule extends BxDolModule
         if ('on' == $this->_oConfig->getAntispamOption('toxicity_report') && $sModule) {
             $oModule = BxDolModule::getInstance($sModule);
             $CNF = &$oModule->_oConfig->CNF;
-            $sContentUrl = isset($CNF['URI_VIEW_ENTRY']) ? BX_DOL_URL_ROOT.BxDolPermalinks::getInstance()->permalink('page.php?i=' . $CNF['URI_VIEW_ENTRY'] . '&id=' . $iContentId) : false;
-            $sManageContentUrl = isset($CNF['URL_MANAGE_ADMINISTRATION']) ? BX_DOL_URL_ROOT.BxDolPermalinks::getInstance()->permalink('page.php?i=' . $CNF['URL_MANAGE_ADMINISTRATION']) : false;
+            $sContentUrl = isset($CNF['URI_VIEW_ENTRY']) ? bx_absolute_url(BxDolPermalinks::getInstance()->permalink('page.php?i=' . $CNF['URI_VIEW_ENTRY'] . '&id=' . $iContentId)) : false;
+            $sManageContentUrl = isset($CNF['URL_MANAGE_ADMINISTRATION']) ? bx_absolute_url(BxDolPermalinks::getInstance()->permalink('page.php?i=' . $CNF['URL_MANAGE_ADMINISTRATION'])) : false;
 
             $oProfile = BxDolProfile::getInstance();
             if (!$oProfile) return;

+ 3 - 3
modules/boonex/antispam/classes/BxAntispamStudioPage.php

@@ -21,9 +21,9 @@ class BxAntispamStudioPage extends BxTemplStudioModule
 
         $this->aMenuItems = array(
             'settings' => array('name' => 'settings', 'icon' => 'cogs', 'title' => '_adm_lmi_cpt_settings'),
-            'ip_table' => array('name' => 'ip_table', 'icon' => 'align-justify', 'title' => '_bx_antispam_ip_table', 'link' => BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=antispam-ip-table')),
-            'dnsbl_list' => array('name' => 'dnsbl_list', 'icon' => 'align-justify', 'title' => '_bx_antispam_dnsbl_list', 'link' => BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=antispam-dnsbl-list')),
-            'block_log' => array('name' => 'block_log', 'icon' => 'far clock', 'title' => '_bx_antispam_block_log', 'link' => BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=antispam-block-log')),
+            'ip_table' => array('name' => 'ip_table', 'icon' => 'align-justify', 'title' => '_bx_antispam_ip_table', 'link' => bx_absolute_url(BxDolPermalinks::getInstance()->permalink('page.php?i=antispam-ip-table'))),
+            'dnsbl_list' => array('name' => 'dnsbl_list', 'icon' => 'align-justify', 'title' => '_bx_antispam_dnsbl_list', 'link' => bx_absolute_url(BxDolPermalinks::getInstance()->permalink('page.php?i=antispam-dnsbl-list'))),
+            'block_log' => array('name' => 'block_log', 'icon' => 'far clock', 'title' => '_bx_antispam_block_log', 'link' => bx_absolute_url(BxDolPermalinks::getInstance()->permalink('page.php?i=antispam-block-log'))),
             'help' => array('name' => 'help', 'icon' => 'question', 'title' => '_bx_antispam_help'),
         );
     }

+ 1 - 1
modules/boonex/api/classes/BxApiModule.php

@@ -381,7 +381,7 @@ class BxApiModule extends BxDolModule
 		
 		$oKey = BxDolKey::getInstance();
 		$aPlus['key'] = $oKey->getNewKey(array('email' => $sEmail));
-		$aPlus['forgot_password_url'] = BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=forgot-password', array('key' => $aPlus['key']));
+		$aPlus['forgot_password_url'] = bx_absolute_url(BxDolPermalinks::getInstance()->permalink('page.php?i=forgot-password', array('key' => $aPlus['key'])));
         $aTemplate = BxDolEmailTemplates::getInstance() -> parseTemplate('t_Forgot', $aPlus, $iAccountId);
         if ($aTemplate && sendMail($sEmail, $aTemplate['Subject'], $aTemplate['Body'], 0, $aPlus, BX_EMAIL_SYSTEM)){
             return array('code' => 200);

+ 2 - 2
modules/boonex/artificer/classes/BxArtificerModule.php

@@ -84,8 +84,8 @@ class BxArtificerModule extends BxBaseModTemplateModule
 
             case 'login_agreement':
                 $oPermalink = BxDolPermalinks::getInstance();
-                $sLinkTerms = BX_DOL_URL_ROOT . $oPermalink->permalink('page.php?i=terms');
-                $sLinkPrivacy = BX_DOL_URL_ROOT . $oPermalink->permalink('page.php?i=privacy');
+                $sLinkTerms = bx_absolute_url($oPermalink->permalink('page.php?i=terms'));
+                $sLinkPrivacy = bx_absolute_url($oPermalink->permalink('page.php?i=privacy'));
 
                 $sResult = _t('_bx_artificer_txt_splash_login_agreement', $sLinkTerms, $sLinkPrivacy);
                 break;

+ 3 - 3
modules/boonex/artificer/data/template/system/scripts/BxTemplPageHome.php

@@ -24,9 +24,9 @@ class BxTemplPageHome extends BxBasePageHome
 
         BxDolCover::getInstance()->set(array(
             'class' => 'bx-cover-homepage',
-            'title' => _t('_sys_txt_homepage_cover', BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=create-account')),
-            'link_join' => BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=create-account'),
-            'link_login' => BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=login'),
+            'title' => _t('_sys_txt_homepage_cover', bx_absolute_url(BxDolPermalinks::getInstance()->permalink('page.php?i=create-account'))),
+            'link_join' => bx_absolute_url(BxDolPermalinks::getInstance()->permalink('page.php?i=create-account')),
+            'link_login' => bx_absolute_url(BxDolPermalinks::getInstance()->permalink('page.php?i=login')),
             'bx_if:empty_cover_class' => array (
                 'condition' => !$bTmplVarsCover,
                 'content' => array(),

+ 1 - 1
modules/boonex/attendant/classes/BxAttendantModule.php

@@ -41,7 +41,7 @@ class BxAttendantModule extends BxDolModule
        
         if ($sFirstPage){
             if (getParam('bx_attendant_redirect_to_entered_page') == 'on'){
-                echo json_encode(['redirect' => BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink($sFirstPage)]);  
+                echo json_encode(['redirect' => bx_absolute_url(BxDolPermalinks::getInstance()->permalink($sFirstPage))]);
                 exit();
             }
             else{

+ 1 - 1
modules/boonex/channels/classes/BxCnlModule.php

@@ -549,7 +549,7 @@ class BxCnlModule extends BxBaseModGroupsModule
             if (isset($aContentInfo[$CNF['FIELD_NAME']]))
                 array_push($aVars, array(
                     'title' => $aContentInfo[$CNF['FIELD_NAME']],
-                    'link' => BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=' . $CNF['URI_VIEW_ENTRY'] . '&id=' . $iContentId),
+                    'link' => bx_absolute_url(BxDolPermalinks::getInstance()->permalink('page.php?i=' . $CNF['URI_VIEW_ENTRY'] . '&id=' . $iContentId)),
                     'followers' => $oConnection -> getConnectedInitiatorsCount($iProfileId),
                     'id' => $iProfileId,
                     'icon' => $oProfile -> getThumb()

+ 1 - 1
modules/boonex/classes/classes/BxClssModule.php

@@ -405,7 +405,7 @@ class BxClssModule extends BxBaseModTextModule
                 'condition' => $bAdmin,
                 'content' => array(
                     'context_profile_id' => $iContextProfileId,
-                    'new_class_url' => BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=create-class&profile_id=' . $oContextProfile->id()),
+                    'new_class_url' => bx_absolute_url(BxDolPermalinks::getInstance()->permalink('page.php?i=create-class&profile_id=' . $oContextProfile->id())),
                 ),
             ),
         ));

+ 1 - 1
modules/boonex/contact/classes/BxContactModule.php

@@ -150,7 +150,7 @@ class BxContactModule extends BxDolModule
         //if (true !== $this->isAllowedContact())
         //    return false;
 
-        return BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=contact');
+        return bx_absolute_url(BxDolPermalinks::getInstance()->permalink('page.php?i=contact'));
     }
 
     /*

+ 1 - 1
modules/boonex/convos/classes/BxCnvFormsEntryHelper.php

@@ -55,7 +55,7 @@ class BxCnvFormsEntryHelper extends BxBaseModTextFormsEntryHelper
                 'SenderDisplayName' => $oProfile->getDisplayName(),
                 'SenderUrl' => $oProfile->getUrl(),
                 'Message' => $aContentInfo[$CNF['FIELD_TEXT']],
-                'PageUrl' => BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=' . $CNF['URI_VIEW_ENTRY'] . '&id=' . $aContentInfo[$CNF['FIELD_ID']]),
+                'PageUrl' => bx_absolute_url(BxDolPermalinks::getInstance()->permalink('page.php?i=' . $CNF['URI_VIEW_ENTRY'] . '&id=' . $aContentInfo[$CNF['FIELD_ID']])),
                 'PageTitle' => strmaxtextlen($aContentInfo[$CNF['FIELD_TEXT']], 100),
             ), BX_EMAIL_NOTIFY);
         }

+ 2 - 2
modules/boonex/convos/classes/BxCnvGrid.php

@@ -95,7 +95,7 @@ class BxCnvGrid extends BxBaseModGeneralGridAdministration
     {
         $CNF = &$this->_oModule->_oConfig->CNF;
 
-        $sUrl = BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=' . $CNF['URI_ADD_ENTRY']);
+        $sUrl = bx_absolute_url(BxDolPermalinks::getInstance()->permalink('page.php?i=' . $CNF['URI_ADD_ENTRY']));
 
         header('Location:' . $sUrl);
     }
@@ -104,7 +104,7 @@ class BxCnvGrid extends BxBaseModGeneralGridAdministration
     {
         $CNF = &$this->_oModule->_oConfig->CNF;
 
-        $sUrl = BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=' . $CNF['URI_ADD_ENTRY']);
+        $sUrl = bx_absolute_url(BxDolPermalinks::getInstance()->permalink('page.php?i=' . $CNF['URI_ADD_ENTRY']));
 
         $a['attr']['onclick'] = "document.location='$sUrl'";
         unset($a['attr']['bx_grid_action_independent']);

+ 5 - 5
modules/boonex/convos/classes/BxCnvTemplate.php

@@ -159,7 +159,7 @@ class BxCnvTemplate extends BxBaseModTextTemplate
         $oModule = BxDolModule::getInstance($this->MODULE);
 
         $aVars = array(
-            'see_all_url' => BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink($oModule->_oConfig->CNF['URL_HOME']),
+            'see_all_url' => bx_absolute_url(BxDolPermalinks::getInstance()->permalink($oModule->_oConfig->CNF['URL_HOME'])),
             'bx_repeat:messages' => array(),
         );
         foreach ($a as $r) {
@@ -177,7 +177,7 @@ class BxCnvTemplate extends BxBaseModTextTemplate
 
             $aVars['bx_repeat:messages'][] = array (
                 'id' => $r['id'],
-                'url' => BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=' . $oModule->_oConfig->CNF['URI_VIEW_ENTRY'] . '&id=' . $r['id']),
+                'url' => bx_absolute_url(BxDolPermalinks::getInstance()->permalink('page.php?i=' . $oModule->_oConfig->CNF['URI_VIEW_ENTRY'] . '&id=' . $r['id'])),
                 'text' => $sText ? $sText : $oProfileAuthor->getDisplayName(),
                 'cmt_text' => $sTextCmt,
                 'unread_messages' => $r['unread_messages'],
@@ -216,7 +216,7 @@ class BxCnvTemplate extends BxBaseModTextTemplate
             $r['unread_messages'] = $r['comments'] - $r['read_comments'];
 
         $aVars = array (
-            'url' => BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=' . $oModule->_oConfig->CNF['URI_VIEW_ENTRY'] . '&id=' . $r['id']),
+            'url' => bx_absolute_url(BxDolPermalinks::getInstance()->permalink('page.php?i=' . $oModule->_oConfig->CNF['URI_VIEW_ENTRY'] . '&id=' . $r['id'])),
             'text' => $sText ? $sText : _t('_Empty'),
             'cmt_text' => $sTextCmt,
             'last_reply_time_and_replier' => _t('_bx_cnv_x_date_by_x_replier', bx_time_js($r['last_reply_timestamp'], BX_FORMAT_DATE), $oProfileLast->getDisplayName()),
@@ -248,10 +248,10 @@ class BxCnvTemplate extends BxBaseModTextTemplate
         $iFolder = $this->_oDb->getConversationFolder($aContentInfo[$CNF['FIELD_ID']], bx_get_logged_profile_id());
 
     	$aTmplVarsItems = array(array(
-        	'url' => BX_DOL_URL_ROOT . $oPermalink->permalink($CNF['URL_FOLDER'] . $iFolder),
+        	'url' => bx_absolute_url($oPermalink->permalink($CNF['URL_FOLDER'] . $iFolder)),
         	'title' => _t($CNF['T']['txt_folder_' . $iFolder])
         ), array(
-        	'url' => BX_DOL_URL_ROOT . $oPermalink->permalink('page.php?i=' . $CNF['URI_VIEW_ENTRY'] . '&id=' . $aContentInfo[$CNF['FIELD_ID']]),
+        	'url' => bx_absolute_url($oPermalink->permalink('page.php?i=' . $CNF['URI_VIEW_ENTRY'] . '&id=' . $aContentInfo[$CNF['FIELD_ID']])),
         	'title' => $sText ? $sText : $oAuthor->getDisplayName(),
         ));
 

+ 2 - 2
modules/boonex/credits/classes/BxCreditsConfig.php

@@ -228,12 +228,12 @@ class BxCreditsConfig extends BxBaseModGeneralConfig
 
     public function getCheckoutUrl()
     {
-        return BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink($this->CNF['URL_CHECKOUT']);
+        return bx_absolute_url(BxDolPermalinks::getInstance()->permalink($this->CNF['URL_CHECKOUT']));
     }
 
     public function getBundleUrl($aBundle)
     {
-        return BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink($this->CNF['URL_HOME']);
+        return bx_absolute_url(BxDolPermalinks::getInstance()->permalink($this->CNF['URL_HOME']));
     }
 
     public function getBundleName($sName)

+ 3 - 3
modules/boonex/credits/classes/BxCreditsModule.php

@@ -372,8 +372,8 @@ class BxCreditsModule extends BxBaseModGeneralModule
         $oPermalink = BxDolPermalinks::getInstance();
 
         $aResult = $this->_aModule;
-        $aResult['url_browse_order_common'] = BX_DOL_URL_ROOT . $oPermalink->permalink($CNF['URL_ORDERS_COMMON'], array('filter' => '{order}'));
-        $aResult['url_browse_order_administration'] = BX_DOL_URL_ROOT . $oPermalink->permalink($CNF['URL_ORDERS_ADMINISTRATION'], array('filter' => '{order}'));
+        $aResult['url_browse_order_common'] = bx_absolute_url($oPermalink->permalink($CNF['URL_ORDERS_COMMON'], array('filter' => '{order}')));
+        $aResult['url_browse_order_administration'] = bx_absolute_url($oPermalink->permalink($CNF['URL_ORDERS_ADMINISTRATION'], array('filter' => '{order}')));
 
         return $aResult;
     }
@@ -901,7 +901,7 @@ class BxCreditsModule extends BxBaseModGeneralModule
             'amount' => $fAmount,
             'rate' => $fRate,
             'message' => $sMessage,
-            'confirm_url' => BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink($CNF['URL_HISTORY_ADMINISTRATION'])
+            'confirm_url' => bx_absolute_url(BxDolPermalinks::getInstance()->permalink($CNF['URL_HISTORY_ADMINISTRATION']))
         ];
         $aTemplate = BxDolEmailTemplates::getInstance()->parseTemplate($CNF['ETEMPLATE_WITHDRAW_REQUESTED'], $aTemplateVars);
         if(!$aTemplate)

+ 1 - 1
modules/boonex/developer/classes/BxDevBuilderPage.php

@@ -459,7 +459,7 @@ class BxDevBuilderPage extends BxTemplStudioBuilderPage
 
         return array(
             'js_object' => $sJsObject,
-            'url_view' => BX_DOL_URL_ROOT . $oPermalinks->permalink($this->aPageRebuild['url']),
+            'url_view' => bx_absolute_url($oPermalinks->permalink($this->aPageRebuild['url'])),
             'action_page_export' => $this->sActionPageExport,
             'action_page_edit' => $this->sActionPageEdit,
             'action_block_create' => $this->sActionBlockCreate,

+ 4 - 4
modules/boonex/donations/classes/BxDonationsModule.php

@@ -129,8 +129,8 @@ class BxDonationsModule extends BxBaseModGeneralModule
         $oPermalink = BxDolPermalinks::getInstance();
 
         $aResult = $this->_aModule;
-        $aResult['url_browse_order_common'] = BX_DOL_URL_ROOT . $oPermalink->permalink($CNF['URL_LIST'], array('filter' => '{order}'));
-        $aResult['url_browse_order_administration'] = BX_DOL_URL_ROOT . $oPermalink->permalink($CNF['URL_LIST_ALL'], array('filter' => '{order}'));
+        $aResult['url_browse_order_common'] = bx_absolute_url($oPermalink->permalink($CNF['URL_LIST'], array('filter' => '{order}')));
+        $aResult['url_browse_order_administration'] = bx_absolute_url($oPermalink->permalink($CNF['URL_LIST_ALL'], array('filter' => '{order}')));
 
         return $aResult;
     }
@@ -156,7 +156,7 @@ class BxDonationsModule extends BxBaseModGeneralModule
             'name' => $aItem[$CNF['FIELD_NAME']],
             'title' => _t($this->_oConfig->isShowTitle() && !empty($aItem[$CNF['FIELD_TITLE']]) ? $aItem[$CNF['FIELD_TITLE']] : '_bx_donations_txt_cart_item_title'),
             'description' => _t('_bx_donations_txt_cart_item_description', getParam('site_title')),
-            'url' => BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink($CNF['URL_MAKE']),
+            'url' => bx_absolute_url(BxDolPermalinks::getInstance()->permalink($CNF['URL_MAKE'])),
             'price_single' => $aItem[$CNF['FIELD_AMOUNT']],
             'price_recurring' => $aItem[$CNF['FIELD_AMOUNT']],
             'period_recurring' => $aItem[$CNF['FIELD_PERIOD']],
@@ -187,7 +187,7 @@ class BxDonationsModule extends BxBaseModGeneralModule
                 'name' => $aItem[$CNF['FIELD_NAME']],
                 'title' => _t($bShowTitle && !empty($aItem[$CNF['FIELD_TITLE']]) ? $aItem[$CNF['FIELD_TITLE']] : '_bx_donations_txt_cart_item_title'),
                 'description' => _t('_bx_donations_txt_cart_item_description', getParam('site_title')),
-                'url' => BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink($CNF['URL_MAKE']),
+                'url' => bx_absolute_url(BxDolPermalinks::getInstance()->permalink($CNF['URL_MAKE'])),
                 'price_single' => $aItem[$CNF['FIELD_AMOUNT']],
                 'price_recurring' => $aItem[$CNF['FIELD_AMOUNT']],
                 'period_recurring' => $aItem[$CNF['FIELD_PERIOD']],

+ 1 - 1
modules/boonex/events/classes/BxEventsDb.php

@@ -168,7 +168,7 @@ class BxEventsDb extends BxBaseModGroupsDb
                 $a[$k]['end'] = $oEnd ? $oEnd->format('c') : 0;
                 $a[$k]['start_utc'] = $oDateStart ? $oDateStart->getTimestamp() : 0;
                 $a[$k]['end_utc'] = $oDateEnd ? $oDateEnd->getTimestamp() : 0;
-                $a[$k]['url'] = BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=' . $this->_oConfig->CNF['URI_VIEW_ENTRY'] . '&id=' . $r['id']);
+                $a[$k]['url'] = bx_absolute_url(BxDolPermalinks::getInstance()->permalink('page.php?i=' . $this->_oConfig->CNF['URI_VIEW_ENTRY'] . '&id=' . $r['id']));
                 if(($oEvent = BxDolProfile::getInstanceByContentAndType($r['id'], $sModule)) !== false)
                     $a[$k]['extendedProps'] = [
                         'class' => 'bx-events-calendar-unit',

+ 1 - 1
modules/boonex/events/classes/BxEventsModule.php

@@ -555,7 +555,7 @@ class BxEventsModule extends BxBaseModGroupsModule implements iBxDolCalendarServ
         foreach ($aParticipants as $iProfileId) {
 
             $b = sendMailTemplate($CNF['EMAIL_REMINDER'], 0, $iProfileId, array(
-                'EntryUrl' => BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=' . $CNF['URI_VIEW_ENTRY'] . '&id=' . $aContentInfo[$CNF['FIELD_ID']]),
+                'EntryUrl' => bx_absolute_url(BxDolPermalinks::getInstance()->permalink('page.php?i=' . $CNF['URI_VIEW_ENTRY'] . '&id=' . $aContentInfo[$CNF['FIELD_ID']])),
                 'EntryTitle' => $aContentInfo['title'],
                 'EntryBegin' => $sEntryBegin,
                 'EntryBeginShort' => $sEntryBeginShort,

+ 1 - 1
modules/boonex/forum/classes/BxForumGrid.php

@@ -167,7 +167,7 @@ class BxForumGrid extends BxTemplGrid
         if($this->_oModule->checkAllowedAdd() !== CHECK_ACTION_RESULT_ALLOWED)
             return '';
 
-        $sUrl = BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=' . $this->_oModule->_oConfig->CNF['URI_ADD_ENTRY']);
+        $sUrl = bx_absolute_url(BxDolPermalinks::getInstance()->permalink('page.php?i=' . $this->_oModule->_oConfig->CNF['URI_ADD_ENTRY']));
 
         unset($a['attr']['bx_grid_action_independent']);
         $a['attr'] = array_merge($a['attr'], array(

+ 1 - 1
modules/boonex/forum/classes/BxForumTemplate.php

@@ -189,7 +189,7 @@ class BxForumTemplate extends BxBaseModTextTemplate
                 'condition' => (int)$aRow[$CNF['FIELD_LOCK']] == 1,
                 'content' => array()
             ),
-            'url' => BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=' . $CNF['URI_VIEW_ENTRY'] . '&id=' . $aRow[$CNF['FIELD_ID']]),
+            'url' => bx_absolute_url(BxDolPermalinks::getInstance()->permalink('page.php?i=' . $CNF['URI_VIEW_ENTRY'] . '&id=' . $aRow[$CNF['FIELD_ID']])),
             'title' => $sTitle ? $sTitle : _t('_Empty'),
             'participants' => $sParticipants,
             'badges' => $this->_oModule->serviceGetBadges($aRow[$CNF['FIELD_ID']]),

+ 1 - 1
modules/boonex/help_tours/classes/BxHelpToursGridItems.php

@@ -293,7 +293,7 @@ class BxHelpToursGridItems extends BxTemplGrid
         if (!$sUrl) return '';
         $sUrl = trim($sUrl, '/');
 
-        $a['attr']['href'] = BX_DOL_URL_ROOT.bx_append_url_params(BxDolPermalinks::getInstance()->permalink($sUrl), ['help_tour_preview' => $this->_iTourId, 'help_tour_item' => $aRow['id']]);
+        $a['attr']['href'] = bx_absolute_url(bx_append_url_params(BxDolPermalinks::getInstance()->permalink($sUrl), ['help_tour_preview' => $this->_iTourId, 'help_tour_item' => $aRow['id']]));
         $a['attr']['target'] = '_blank';
 
         $sButton = $this->_getActionDefault($sType, $sKey, $a, $isSmall, $isDisabled, $aRow);

+ 1 - 1
modules/boonex/help_tours/classes/BxHelpToursGridTours.php

@@ -43,7 +43,7 @@ class BxHelpToursGridTours extends BxTemplGrid
         if (!$sUrl) return '';
         $sUrl = trim($sUrl, '/');
 
-        $a['attr']['href'] = BX_DOL_URL_ROOT.bx_append_url_params(BxDolPermalinks::getInstance()->permalink($sUrl), ['help_tour_preview' => $aRow['id']]);
+        $a['attr']['href'] = bx_absolute_url(bx_append_url_params(BxDolPermalinks::getInstance()->permalink($sUrl), ['help_tour_preview' => $aRow['id']]));
         $a['attr']['target'] = '_blank';
 
         $sButton = $this->_getActionDefault($sType, $sKey, $a, $isSmall, $isDisabled, $aRow);

+ 2 - 2
modules/boonex/invites/classes/BxInvGridInvites.php

@@ -219,7 +219,7 @@ class BxInvGridInvites extends BxTemplGrid
         $aRequest = $this->_oModule->_oDb->getRequests(array('type' => 'by_id', 'value' => $aRow['request_id']));
         if ($aRequest || true){
             $CNF = &$this->_oModule->_oConfig->CNF;
-            $sLink = BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink($CNF['URL_REQUESTS']);
+            $sLink = bx_absolute_url(BxDolPermalinks::getInstance()->permalink($CNF['URL_REQUESTS']));
             $sLink = bx_append_url_params($sLink, array('filter' => $aRequest['email']));
             $sAddon = $this->_oTemplate->parseHtmlByName('account_link.html', array(
                     'href' => $sLink,
@@ -271,7 +271,7 @@ class BxInvGridInvites extends BxTemplGrid
 
 		$sLink = $oModuleAccounts->_oConfig->CNF['URL_MANAGE_ADMINISTRATION'];
 
-		$sLink = BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink($sLink);
+		$sLink = bx_absolute_url(BxDolPermalinks::getInstance()->permalink($sLink));
 		
 		if(!empty($sFilter))
 			$sLink = bx_append_url_params($sLink, array('filter' => $sFilter));

+ 1 - 1
modules/boonex/invites/classes/BxInvModule.php

@@ -551,7 +551,7 @@ class BxInvModule extends BxDolModule
     {
         $sKeyCode = $this->_oConfig->getKeyCode();
 
-        $sJoinUrl = BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=create-account');
+        $sJoinUrl = bx_absolute_url(BxDolPermalinks::getInstance()->permalink('page.php?i=create-account'));
         return bx_append_url_params($sJoinUrl, array($sKeyCode => $sKey));
     }
     

+ 1 - 1
modules/boonex/invites/classes/BxInvStudioPage.php

@@ -19,7 +19,7 @@ class BxInvStudioPage extends BxTemplStudioModule
 
         $this->aMenuItems = array(
             array('name' => 'settings', 'icon' => 'cogs', 'title' => '_adm_lmi_cpt_settings'),
-            array('name' => 'manage', 'icon' => 'edit', 'title' => '_bx_invites_menu_item_title_requests', 'link' => BX_DOL_URL_ROOT . $oPermalink->permalink('page.php?i=invites-requests')),
+            array('name' => 'manage', 'icon' => 'edit', 'title' => '_bx_invites_menu_item_title_requests', 'link' => bx_absolute_url($oPermalink->permalink('page.php?i=invites-requests'))),
         );
     }
 }

+ 5 - 5
modules/boonex/invites/classes/BxInvTemplate.php

@@ -66,7 +66,7 @@ class BxInvTemplate extends BxBaseModGeneralTemplate
 		if ($mInvitesRemain === true)
 			$mInvitesRemain = _t('_bx_invites_txt_unlimited');
            
-        $sUrl = BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink($this->_oConfig->CNF['URL_INVITE']);
+        $sUrl = bx_absolute_url(BxDolPermalinks::getInstance()->permalink($this->_oConfig->CNF['URL_INVITE']));
 
         $this->getCssJs();
         return $this->parseHtmlByName('block_invite.html', array(
@@ -80,7 +80,7 @@ class BxInvTemplate extends BxBaseModGeneralTemplate
 
     public function getBlockRequest()
     {
-        $sUrl = BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink($this->_oConfig->CNF['URL_REQUEST']);
+        $sUrl = bx_absolute_url(BxDolPermalinks::getInstance()->permalink($this->_oConfig->CNF['URL_REQUEST']));
 
         $this->getCssJs();
         return $this->parseHtmlByName('block_request.html', array(
@@ -109,7 +109,7 @@ class BxInvTemplate extends BxBaseModGeneralTemplate
         $oPermalink = BxDolPermalinks::getInstance();
 
         $oForm = BxDolForm::getObjectInstance($this->_oConfig->getObject('form_request'), $this->_oConfig->getObject('form_display_request_send'));
-        $oForm->aFormAttrs['action'] = BX_DOL_URL_ROOT . $oPermalink->permalink($CNF['URL_REQUEST']);
+        $oForm->aFormAttrs['action'] = bx_absolute_url($oPermalink->permalink($CNF['URL_REQUEST']));
 
         $sFormId = $oForm->getId();
         $sEval = $sJsObject . '.onRequestFormSubmit(oData)';
@@ -136,7 +136,7 @@ class BxInvTemplate extends BxBaseModGeneralTemplate
         $oAccountQuery = BxDolAccountQuery::getInstance();
         $iAccount = $oAccountQuery->getIdByEmail($sEmail);
         if ($iAccount > 0)
-            return array('content' => MsgBox(_t('_bx_invites_err_already_registed', BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=forgot-password'))), 'content_id' => $sFormId, 'eval' => $sEval);
+            return array('content' => MsgBox(_t('_bx_invites_err_already_registed', bx_absolute_url(BxDolPermalinks::getInstance()->permalink('page.php?i=forgot-password')))), 'content_id' => $sFormId, 'eval' => $sEval);
         $iCountByEmail = $this->_oDb->getRequests(array('type' => 'count_by_email', 'value' => $sEmail));
         if ($iCountByEmail > 0)
             return array('content' => MsgBox(_t('_bx_invites_err_already_send')), 'content_id' => $sFormId, 'eval' => $sEval);
@@ -148,7 +148,7 @@ class BxInvTemplate extends BxBaseModGeneralTemplate
         $this->getModule()->onRequest($iId);
         $sRequestsEmail = $this->_oConfig->getRequestsEmail();
         if(!empty($sRequestsEmail)) {
-            $sManageUrl = BX_DOL_URL_ROOT . $oPermalink->permalink($CNF['URL_REQUESTS']);
+            $sManageUrl = bx_absolute_url($oPermalink->permalink($CNF['URL_REQUESTS']));
 
             $aMessage = BxDolEmailTemplates::getInstance()->parseTemplate('bx_invites_request_form_message', array(
                 'sender_name' => bx_process_output($oForm->getCleanValue('name')),

+ 1 - 1
modules/boonex/market/classes/BxMarketGridLicensesAdministration.php

@@ -62,7 +62,7 @@ class BxMarketGridLicensesAdministration extends BxTemplGrid
     {
     	$CNF = &$this->_oModule->_oConfig->CNF;
 
-        $sUrl = BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink($CNF['URL_VIEW_ENTRY'] . $aRow['product_id']);
+        $sUrl = bx_absolute_url(BxDolPermalinks::getInstance()->permalink($CNF['URL_VIEW_ENTRY'] . $aRow['product_id']));
 
         $mixedValue = $this->_oTemplate->parseHtmlByName('product_link.html', array(
             'href' => $sUrl,

+ 5 - 5
modules/boonex/market/classes/BxMarketModule.php

@@ -759,8 +759,8 @@ class BxMarketModule extends BxBaseModTextModule
         $oPermalink = BxDolPermalinks::getInstance();
 
         $aResult = $this->_aModule;
-        $aResult['url_browse_order_common'] = BX_DOL_URL_ROOT . $oPermalink->permalink($CNF['URL_LICENSES_COMMON'], array('filter' => '{order}'));
-        $aResult['url_browse_order_administration'] = BX_DOL_URL_ROOT . $oPermalink->permalink($CNF['URL_LICENSES_ADMINISTRATION'], array('filter' => '{order}'));
+        $aResult['url_browse_order_common'] = bx_absolute_url($oPermalink->permalink($CNF['URL_LICENSES_COMMON'], array('filter' => '{order}')));
+        $aResult['url_browse_order_administration'] = bx_absolute_url($oPermalink->permalink($CNF['URL_LICENSES_ADMINISTRATION'], array('filter' => '{order}')));
 
         return $aResult;
     }
@@ -804,7 +804,7 @@ class BxMarketModule extends BxBaseModTextModule
             'name' => $aItem[$CNF['FIELD_NAME']],
             'title' => $aItem[$CNF['FIELD_TITLE']],
             'description' => $aItem[$CNF['FIELD_TEXT']],
-            'url' => BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=view-product&id=' . $aItem[$CNF['FIELD_ID']]),
+            'url' => bx_absolute_url(BxDolPermalinks::getInstance()->permalink('page.php?i=view-product&id=' . $aItem[$CNF['FIELD_ID']])),
             'price_single' => $aItem[$CNF['FIELD_PRICE_SINGLE']],
             'price_recurring' => $aItem[$CNF['FIELD_PRICE_RECURRING']],
             'period_recurring' => 1,
@@ -849,7 +849,7 @@ class BxMarketModule extends BxBaseModTextModule
                 'name' => $aItem[$CNF['FIELD_NAME']],
                 'title' => $aItem[$CNF['FIELD_TITLE']],
                 'description' => $aItem[$CNF['FIELD_TEXT']],
-                'url' => BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=view-product&id=' . $aItem[$CNF['FIELD_ID']]),
+                'url' => bx_absolute_url(BxDolPermalinks::getInstance()->permalink('page.php?i=view-product&id=' . $aItem[$CNF['FIELD_ID']])),
                 'price_single' => $aItem[$CNF['FIELD_PRICE_SINGLE']],
                 'price_recurring' => $aItem[$CNF['FIELD_PRICE_RECURRING']],
                 'period_recurring' => 1,
@@ -1106,7 +1106,7 @@ class BxMarketModule extends BxBaseModTextModule
         sendMailTemplate($CNF['ETEMPLATE_PURCHASED'], 0, $iClientId, array(
             'client_name' => $oClient->getDisplayName(),
             'product_name' => $aProduct[$CNF['FIELD_TITLE']],
-            'product_url' => BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=view-product&id=' . $aProduct[$CNF['FIELD_ID']]),
+            'product_url' => bx_absolute_url(BxDolPermalinks::getInstance()->permalink('page.php?i=view-product&id=' . $aProduct[$CNF['FIELD_ID']])),
             'vendor_url' => $sSellerUrl,
             'vendor_name' => $sSellerName,
             'license' => $sLicense,

+ 1 - 1
modules/boonex/market/classes/BxMarketTemplate.php

@@ -202,7 +202,7 @@ class BxMarketTemplate extends BxBaseModTextTemplate
         }
 
         //--- Main Info
-        $sUrl = BX_DOL_URL_ROOT . $oPermalinks->permalink('page.php?i=' . $CNF['URI_VIEW_ENTRY'] . '&id=' . $aData[$CNF['FIELD_ID']]);
+        $sUrl = bx_absolute_url($oPermalinks->permalink('page.php?i=' . $CNF['URI_VIEW_ENTRY'] . '&id=' . $aData[$CNF['FIELD_ID']]));
         $sLinkMore = ' <a title="' . bx_html_attribute(_t('_sys_read_more', $aData[$CNF['FIELD_TITLE']])) . '" href="' . $sUrl . '"><i class="sys-icon ellipsis-h"></i></a>';
         $sSummary = strmaxtextlen($aData[$CNF['FIELD_TEXT']], (int)getParam($CNF['PARAM_CHARS_SUMMARY']), $sLinkMore);
         $sSummaryPlain = BxTemplFunctions::getInstance()->getStringWithLimitedLength(strip_tags($sSummary), (int)getParam($CNF['PARAM_CHARS_SUMMARY_PLAIN']));

+ 3 - 3
modules/boonex/massmailer/classes/BxMassMailerGridCampaigns.php

@@ -152,7 +152,7 @@ class BxMassMailerGridCampaigns extends BxTemplGrid
     protected function _getActionAdd ($sType, $sKey, $a, $isSmall = false, $isDisabled = false, $aRow = array())
     {
         $CNF = &$this->_oModule->_oConfig->CNF;
-        $sUrl = BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=' . $CNF['URI_ADD_CAMPAIGN']);
+        $sUrl = bx_absolute_url(BxDolPermalinks::getInstance()->permalink('page.php?i=' . $CNF['URI_ADD_CAMPAIGN']));
 
         unset($a['attr']['bx_grid_action_independent']);
         $a['attr'] = array_merge($a['attr'], array(
@@ -169,7 +169,7 @@ class BxMassMailerGridCampaigns extends BxTemplGrid
 
         $CNF = &$this->_oModule->_oConfig->CNF;
 
-        $sUrl = BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=' . $CNF['URI_EDIT_CAMPAIGN'] . '&id=' . $aRow[$CNF['FIELD_ID']]);
+        $sUrl = bx_absolute_url(BxDolPermalinks::getInstance()->permalink('page.php?i=' . $CNF['URI_EDIT_CAMPAIGN'] . '&id=' . $aRow[$CNF['FIELD_ID']]));
 
         $a['attr'] = array_merge($a['attr'], array(
             "onclick" => "window.open('" . $sUrl . "','_self');"
@@ -185,7 +185,7 @@ class BxMassMailerGridCampaigns extends BxTemplGrid
         
         $CNF = &$this->_oModule->_oConfig->CNF;
         
-        $sUrl = BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=' . $CNF['URI_VIEW_CAMPAIGN'] . '&id=' . $aRow[$CNF['FIELD_ID']]);
+        $sUrl = bx_absolute_url(BxDolPermalinks::getInstance()->permalink('page.php?i=' . $CNF['URI_VIEW_CAMPAIGN'] . '&id=' . $aRow[$CNF['FIELD_ID']]));
 
         unset($a['attr']['bx_grid_action_independent']);
         $a['attr'] = array_merge($a['attr'], array(

+ 1 - 1
modules/boonex/massmailer/classes/BxMassMailerTemplate.php

@@ -160,7 +160,7 @@ class BxMassMailerTemplate extends BxBaseModGeneralTemplate
         ));
 
         return $this->parseHtmlByName('breadcrumb.html', array(
-            'url_home' => BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink($CNF['URL_MANAGE_CAMPAIGNS']),
+            'url_home' => bx_absolute_url(BxDolPermalinks::getInstance()->permalink($CNF['URL_MANAGE_CAMPAIGNS'])),
             'icon_home' => $CNF['ICON'],
             'bx_repeat:items' => $aTmplVarsItems
         ));

+ 1 - 1
modules/boonex/notifications/classes/BxNtfsConfig.php

@@ -198,7 +198,7 @@ class BxNtfsConfig extends BxBaseModNotificationsConfig
      */
     public function getViewUrl()
     {
-        return BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=notifications-view');
+        return bx_absolute_url(BxDolPermalinks::getInstance()->permalink('page.php?i=notifications-view'));
     }
 
     public function getContentModule(&$aEvent)

+ 1 - 1
modules/boonex/notifications/classes/BxNtfsModule.php

@@ -425,7 +425,7 @@ class BxNtfsModule extends BxBaseModNotificationsModule
 
         $oSubmenuSystem->setObjectSubmenu($CNF['OBJECT_MENU_SUBMENU'], array (
             'title' => _t('_bx_ntfs'),
-            'link' => BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink($CNF['URL_HOME']),
+            'link' => bx_absolute_url(BxDolPermalinks::getInstance()->permalink($CNF['URL_HOME'])),
             'icon' => '',
         ));
 

+ 1 - 1
modules/boonex/payment/classes/BxPaymentDetails.php

@@ -71,7 +71,7 @@ class BxPaymentDetails extends BxBaseModPaymentDetails
                     $this->_oModule->_oDb->updateOption($iProfileId, $aOption['id'], bx_process_input($sValue));
                 }
 
-                header('Location: ' . BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=payment-details'));
+                header('Location: ' . bx_absolute_url(BxDolPermalinks::getInstance()->permalink('page.php?i=payment-details')));
                 return;
             }
             else

+ 1 - 1
modules/boonex/quoteofday/classes/BxQuoteOfDayStudioPage.php

@@ -17,7 +17,7 @@ class BxQuoteOfDayStudioPage extends BxTemplStudioModule
     {
         parent::__construct($sModule, $mixedPageName, $sPage);
 
-        $this->aMenuItems[BX_DOL_STUDIO_MOD_TYPE_QUOTES] = array('name' => BX_DOL_STUDIO_MOD_TYPE_QUOTES , 'icon' => 'bars', 'title' => '_bx_quoteofday_lmi_cpt_quotes', 'link' => BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=quoteofday-manage'));
+        $this->aMenuItems[BX_DOL_STUDIO_MOD_TYPE_QUOTES] = array('name' => BX_DOL_STUDIO_MOD_TYPE_QUOTES , 'icon' => 'bars', 'title' => '_bx_quoteofday_lmi_cpt_quotes', 'link' => bx_absolute_url(BxDolPermalinks::getInstance()->permalink('page.php?i=quoteofday-manage')));
     }
 }
 

+ 1 - 1
modules/boonex/reviews/classes/BxReviewsTemplate.php

@@ -190,7 +190,7 @@ class BxReviewsTemplate extends BxBaseModTextTemplate
     public function browseReviewedContent() {
         $CNF = &$this->_oConfig->CNF;
 
-        $sPageUrl = BX_DOL_URL_ROOT.BxDolPermalinks::getInstance()->permalink('page.php?i='.bx_get('i'));
+        $sPageUrl = bx_absolute_url(BxDolPermalinks::getInstance()->permalink('page.php?i='.bx_get('i')));
 
         $sOrderBy = bx_get('order_by');
         if ($sOrderBy != 'avg_rating' && $sOrderBy != 'reviews_num') $sOrderBy = 'avg_rating';

+ 1 - 1
modules/boonex/shopify/classes/BxShopifyModule.php

@@ -157,7 +157,7 @@ class BxShopifyModule extends BxBaseModTextModule
 
     	$aSettings = $this->_oDb->getSettings(array('type' => 'author', 'author' => $this->_iProfileId));
         if(empty($aSettings) || !is_array($aSettings))
-    		return MsgBox(_t('_bx_shopify_err_not_configured', BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink($CNF['URL_SETTINGS'])));
+    		return MsgBox(_t('_bx_shopify_err_not_configured', bx_absolute_url(BxDolPermalinks::getInstance()->permalink($CNF['URL_SETTINGS']))));
 
     	return parent::serviceEntityCreate($sDisplay);
     }

+ 1 - 1
modules/boonex/snipcart/classes/BxSnipcartConfig.php

@@ -176,7 +176,7 @@ class BxSnipcartConfig extends BxBaseModTextConfig
 
     public function getViewUrl($iContentId)
     {
-        return BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=' . $this->CNF['URI_VIEW_ENTRY'] . '&id=' . $iContentId);
+        return bx_absolute_url(BxDolPermalinks::getInstance()->permalink('page.php?i=' . $this->CNF['URI_VIEW_ENTRY'] . '&id=' . $iContentId));
     }
 
     public function getApiKey($aSettings)

+ 1 - 1
modules/boonex/snipcart/classes/BxSnipcartModule.php

@@ -117,7 +117,7 @@ class BxSnipcartModule extends BxBaseModTextModule
 
     	$aSettings = $this->_oDb->getSettings(array('type' => 'author', 'author' => $this->_iProfileId));
         if(empty($aSettings) || !is_array($aSettings))
-    		return MsgBox(_t('_bx_snipcart_err_not_configured', BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink($CNF['URL_SETTINGS'])));
+    		return MsgBox(_t('_bx_snipcart_err_not_configured', bx_absolute_url(BxDolPermalinks::getInstance()->permalink($CNF['URL_SETTINGS']))));
 
     	return parent::serviceEntityCreate($sDisplay);
     }

+ 1 - 1
modules/boonex/stream/classes/BxStrmGridRecordings.php

@@ -158,7 +158,7 @@ class BxStrmGridRecordings extends BxTemplGrid
             return false;
         }
 
-        return BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=' . $oModule->_oConfig->CNF['URI_ADD_ENTRY']);
+        return bx_absolute_url(BxDolPermalinks::getInstance()->permalink('page.php?i=' . $oModule->_oConfig->CNF['URI_ADD_ENTRY']));
     }
 
     protected function _actionWithStorage($iFileId)

+ 1 - 1
modules/boonex/stream/classes/BxStrmModule.php

@@ -192,7 +192,7 @@ class BxStrmModule extends BxBaseModTextModule
 
         if ($this->getStreamEngine()->isSreamFromBrowser()) {
             $sUrl = 'page.php?i=broadcast-stream&id=' . (int)$iContentId;
-            $sUrl = BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink($sUrl);
+            $sUrl = bx_absolute_url(BxDolPermalinks::getInstance()->permalink($sUrl));
             $aForm['inputs']['header_div'] = array (
                 'type' => 'custom',
                 'content' => _t('_bx_stream_manual_settings_or_stream_from_webcam'),

+ 1 - 1
modules/boonex/stream/classes/BxStrmTemplate.php

@@ -57,7 +57,7 @@ class BxStrmTemplate extends BxBaseModTextTemplate
         $CNF = &$this->getModule()->_oConfig->CNF;
 
         $sUrlViewStream = 'page.php?i=' . $CNF['URI_VIEW_ENTRY'] . '&id=' . (int)$aContentInfo['id'];
-        $sUrlViewStream = BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink($sUrlViewStream);
+        $sUrlViewStream = bx_absolute_url(BxDolPermalinks::getInstance()->permalink($sUrlViewStream));
         $sUrlEmbed = BX_DOL_URL_ROOT . $this->_oConfig->getBaseUri() . 'embed/' . (int)$aContentInfo['id'];
 
         $aForm = array(

+ 1 - 1
modules/boonex/tasks/classes/BxTasksDb.php

@@ -121,7 +121,7 @@ class BxTasksDb extends BxBaseModTextDb
                 $a[$k]['end'] = $oEnd ? $oEnd->format('c') : 0;
                 $a[$k]['start_utc'] = $oStart ? $oStart->getTimestamp() : 0;
                 $a[$k]['end_utc'] = $oEnd ? $oEnd->getTimestamp() : 0;
-                $a[$k]['url'] = BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=' . $this->_oConfig->CNF['URI_VIEW_ENTRY'] . '&id=' . $r['id']);
+                $a[$k]['url'] = bx_absolute_url(BxDolPermalinks::getInstance()->permalink('page.php?i=' . $this->_oConfig->CNF['URI_VIEW_ENTRY'] . '&id=' . $r['id']));
             }
 
             // merge with all other events

+ 1 - 1
modules/boonex/tasks/classes/BxTasksModule.php

@@ -555,7 +555,7 @@ class BxTasksModule extends BxBaseModTextModule implements iBxDolCalendarService
 					'due' => $aTask[$CNF['FIELD_DUEDATE']] > 0 ? bx_time_js($aTask[$CNF['FIELD_DUEDATE']]) : '',
 					'bx_repeat:members' => $aMembersVars,
 					'badges' => $this->serviceGetBadges($aTask[$CNF['FIELD_ID']], true),
-					'url' => BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=' . $CNF['URI_VIEW_ENTRY'] . '&id=' . $aTask[$CNF['FIELD_ID']]),
+					'url' => bx_absolute_url(BxDolPermalinks::getInstance()->permalink('page.php?i=' . $CNF['URI_VIEW_ENTRY'] . '&id=' . $aTask[$CNF['FIELD_ID']])),
 					'object' => $this->_oConfig->getJsObject('tasks'),
                     'bx_if:allow_manage' => array(
 				        'condition' => $bAllowManage,

+ 6 - 7
modules/boonex/timeline/classes/BxTimelineConfig.php

@@ -819,21 +819,20 @@ class BxTimelineConfig extends BxBaseModNotificationsConfig
 
     public function getViewUrl($iOwnerId, $bAbsolute = true)
     {
-        return ($bAbsolute ? BX_DOL_URL_ROOT : '') . BxDolPermalinks::getInstance()->permalink('page.php?i=' . $this->CNF['URI_VIEW_LIST'], [
-            'id' => $iOwnerId
-        ]);
+        $sUrl = BxDolPermalinks::getInstance()->permalink('page.php?i=' . $this->CNF['URI_VIEW_LIST'], ['id' => $iOwnerId]);
+        return $bAbsolute ? bx_absolute_url($sUrl) : $sUrl;
     }
 
     public function getHomeViewUrl($bAbsolute = true)
     {
-        return ($bAbsolute ? BX_DOL_URL_ROOT : '') . BxDolPermalinks::getInstance()->permalink($this->CNF['URL_HOME']);
+        $sUrl = BxDolPermalinks::getInstance()->permalink($this->CNF['URL_HOME']);
+        return $bAbsolute ? bx_absolute_url($sUrl) : $sUrl;
     }
 
     public function getItemViewUrl($aEvent, $bAbsolute = true)
     {
-        return ($bAbsolute ? BX_DOL_URL_ROOT : '') . BxDolPermalinks::getInstance()->permalink('page.php?i=' . $this->CNF['URI_VIEW_ENTRY'], [
-            'id' => $aEvent['id']
-        ]);
+        $sUrl = BxDolPermalinks::getInstance()->permalink('page.php?i=' . $this->CNF['URI_VIEW_ENTRY'], ['id' => $aEvent['id']]);
+        return $bAbsolute ? bx_absolute_url($sUrl) : $sUrl;
     }
 
     public function getLiveUpdateKey($aParams)

+ 1 - 1
modules/boonex/timeline/classes/BxTimelineModule.php

@@ -4955,7 +4955,7 @@ class BxTimelineModule extends BxBaseModNotificationsModule implements iBxDolCon
     	$CNF = &$this->_oConfig->CNF;
 
         $iId = (int)$aContentInfo[$CNF['FIELD_ID']];
-    	$sUrl = BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=' . $CNF['URI_VIEW_ENTRY'] . '&id=' . $iId);
+    	$sUrl = bx_absolute_url(BxDolPermalinks::getInstance()->permalink('page.php?i=' . $CNF['URI_VIEW_ENTRY'] . '&id=' . $iId));
 
         $sText = ''; 
         if(isset($aContentInfo['content'])){

+ 1 - 1
modules/boonex/timeline/classes/BxTimelineTemplate.php

@@ -462,7 +462,7 @@ class BxTimelineTemplate extends BxBaseModNotificationsTemplate
         if(isset($_SERVER['HTTP_REFERER']) && mb_stripos($_SERVER['HTTP_REFERER'], BX_DOL_URL_ROOT) === 0)
             $sReferrer = $_SERVER['HTTP_REFERER'];
         else 
-            $sReferrer = BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink($this->_oConfig->CNF['URL_HOME']);
+            $sReferrer = bx_absolute_url(BxDolPermalinks::getInstance()->permalink($this->_oConfig->CNF['URL_HOME']));
 
         $sJsObject = $this->_oConfig->getJsObjectView($aBrowseParams);
         return array('content' => $this->parseHtmlByName('block_item.html', array(