consistent urls

lekoala · Aug 19, 2021 · dcf84bd · dcf84bd
1 parent 8fad8b3
commit dcf84bd
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/src/Models/EmailTemplate.php b/src/Models/EmailTemplate.php
@@ -20,6 +20,7 @@
 use SilverStripe\Forms\DropdownField;
 use SilverStripe\Security\Permission;
 use SilverStripe\SiteConfig\SiteConfig;
+use SilverStripe\Admin\AdminRootController;
 use LeKoala\EmailTemplates\Email\BetterEmail;
 use LeKoala\EmailTemplates\Helpers\FluentHelper;
 use LeKoala\EmailTemplates\Admin\EmailTemplatesAdmin;
@@ -313,13 +314,14 @@ protected function previewTab()
         // Preview iframe
         $sanitisedModel =  str_replace('\\', '-', EmailTemplate::class);
         $adminSegment = EmailTemplatesAdmin::config()->url_segment;
-        $iframeSrc = Director::baseURL() . 'admin/' . $adminSegment . '/' . $sanitisedModel . '/PreviewEmail/?id=' . $this->ID;
+        $adminBaseSegment = AdminRootController::config()->url_base;
+        $iframeSrc = Director::baseURL() . $adminBaseSegment . '/' . $adminSegment . '/' . $sanitisedModel . '/PreviewEmail/?id=' . $this->ID;
         $iframe = new LiteralField('iframe', '<iframe src="' . $iframeSrc . '" style="width:800px;background:#fff;border:1px solid #ccc;min-height:500px;vertical-align:top"></iframe>');
         $tab->push($iframe);
 
         $env = Environment::getEnv('SS_SEND_ALL_EMAILS_TO');
         if ($env || Director::isDev()) {
-            $sendTestLink = Director::baseURL() . 'admin/' . $adminSegment . '/' . $sanitisedModel . '/SendTestEmailTemplate/?id=' . $this->ID . '&to=' . urlencode($env);
+            $sendTestLink = Director::baseURL() . $adminBaseSegment . '/' . $adminSegment . '/' . $sanitisedModel . '/SendTestEmailTemplate/?id=' . $this->ID . '&to=' . urlencode($env);
             $sendTest = new LiteralField("send_test", "<hr/><a href='$sendTestLink'>Send test email</a>");
             $tab->push($sendTest);
         }

diff --git a/src/Models/Emailing.php b/src/Models/Emailing.php
@@ -3,13 +3,16 @@
 namespace LeKoala\EmailTemplates\Models;
 
 use Exception;
+use Swift_Validate;
 use SilverStripe\ORM\DB;
 use SilverStripe\Forms\Tab;
 use SilverStripe\i18n\i18n;
 use SilverStripe\ORM\DataList;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\Forms\TextField;
 use SilverStripe\Security\Member;
+use SilverStripe\Control\Director;
+use SilverStripe\Forms\FormAction;
 use SilverStripe\Core\Config\Config;
 use SilverStripe\Forms\LiteralField;
 use SilverStripe\Control\Email\Email;
@@ -18,12 +21,12 @@
 use SilverStripe\Forms\TextareaField;
 use SilverStripe\Security\Permission;
 use SilverStripe\SiteConfig\SiteConfig;
+use SilverStripe\Admin\AdminRootController;
 use LeKoala\EmailTemplates\Email\BetterEmail;
+use LeKoala\EmailTemplates\Helpers\EmailUtils;
 use LeKoala\EmailTemplates\Helpers\FluentHelper;
+use SilverStripe\CMS\Controllers\RootURLController;
 use LeKoala\EmailTemplates\Admin\EmailTemplatesAdmin;
-use LeKoala\EmailTemplates\Helpers\EmailUtils;
-use SilverStripe\Forms\FormAction;
-use Swift_Validate;
 
 /**
  * Send emails to a group of members
@@ -246,7 +249,8 @@ protected function previewTab()
         // Preview iframe
         $sanitisedModel =  str_replace('\\', '-', Emailing::class);
         $adminSegment = EmailTemplatesAdmin::config()->url_segment;
-        $iframeSrc = '/admin/' . $adminSegment . '/' . $sanitisedModel . '/PreviewEmailing/?id=' . $this->ID;
+        $adminBaseSegment = AdminRootController::config()->url_base;
+        $iframeSrc = Director::baseURL() . $adminBaseSegment . '/' . $adminSegment . '/' . $sanitisedModel . '/PreviewEmailing/?id=' . $this->ID;
         $iframe = new LiteralField('iframe', '<iframe src="' . $iframeSrc . '" style="width:800px;background:#fff;border:1px solid #ccc;min-height:500px;vertical-align:top"></iframe>');
         $tab->push($iframe);