Use function to get the public URL

Author: bramley

README.md

@@ -16,9 +16,9 @@ That page is accessed by including a placeholder, [ARCHIVE] or [ARCHIVEURL], in
 
 ### Dependencies ###
 
-Requires phplist release 3.3.0 or later and php version 5.5 or later.
+Requires phplist release 3.3.0 or later and php version 7 or later.
 
-This plugin requires the Common Plugin v3.10.7 or later to be installed, and will not work without that.
+This plugin requires the Common Plugin v3.29.0 or later to be installed, and will not work without that.
 phplist now includes Common Plugin so you should only need to enable it on the Manage Plugins page.
 
 Requires the XSL extension to be included in php. You can verify this through phpinfo.
@@ -27,17 +27,6 @@ Requires the XSL extension to be included in php. You can verify this through ph
 Install on the Plugins page (menu Config > Manage Plugins) using the package URL `https://github.com/bramley/phplist-plugin-viewbrowser/archive/master.zip`.
 Then click the button to enable the plugin.
 
-### Install manually ###
-Download the plugin zip file from <https://github.com/bramley/phplist-plugin-viewbrowser/archive/master.zip>
-
-Expand the zip file, then copy the contents of the plugins directory to your phplist plugins directory.
-This should contain
-
-* the file ViewBrowserPlugin.php
-* the directory ViewBrowserPlugin
-
-Then click the button to enable the plugin.
-
 ## Usage ##
 
 For guidance on using the plugin see the plugin's page within the phplist documentation site <https://resources.phplist.com/plugin/viewinbrowser>

plugins/ViewBrowserPlugin.php

@@ -23,6 +23,8 @@
 /**
  * Registers the plugin with phplist.
  */
+use function phpList\plugin\Common\publicBaseUrl;
+
 class ViewBrowserPlugin extends phplistPlugin
 {
     const VERSION_FILE = 'version.txt';
@@ -170,11 +172,11 @@ public function dependencyCheck()
         return array(
             'phpList version 3.3.0 or later' => version_compare(VERSION, '3.3') >= 0,
             'XSL extension installed' => extension_loaded('xsl'),
-            'Common Plugin v3.10.7 or later installed' => (
+            'Common Plugin v3.29.0 or later installed' => (
                 phpListPlugin::isEnabled('CommonPlugin')
-                && version_compare($plugins['CommonPlugin']->version, '3.10.7') >= 0
+                && version_compare($plugins['CommonPlugin']->version, '3.29.0') >= 0
             ),
-            'PHP version 5.5 or greater' => version_compare(PHP_VERSION, '5.5') > 0,
+            'PHP version 7 or greater' => version_compare(PHP_VERSION, '7') > 0,
         );
     }
 
@@ -257,12 +259,10 @@ public function __construct()
 
     public function activate()
     {
-        global $public_scheme, $pageroot;
-
         parent::activate();
         $this->linkText = getConfig('viewbrowser_link');
         $this->archiveLinkText = getConfig('viewbrowser_archive_link');
-        $this->rootUrl = sprintf('%s://%s%s/', $public_scheme, getConfig('website'), $pageroot);
+        $this->rootUrl = publicBaseUrl() . '/';
     }
 
     /**

plugins/ViewBrowserPlugin/ArchiveCreator.php

@@ -28,6 +28,8 @@
 use phpList\plugin\Common\Populator;
 use phpList\plugin\Common\View;
 
+use function phpList\plugin\Common\publicBaseUrl;
+
 /**
  * Class to create an archive page.
  */
@@ -54,16 +56,14 @@ private function urlPattern()
      */
     private function archiveItems($uid, $campaigns)
     {
-        global $pageroot;
-
         foreach ($campaigns as $c) {
             $params = ['pi' => $_GET['pi'], 'p' => 'view', 'm' => $c['messageid']];
 
             if ($uid) {
                 $params['uid'] = $uid;
             }
             $query = http_build_query($params, '', '&');
-            $url = sprintf('%s/?%s', $pageroot, $query);
+            $url = sprintf('%s/?%s', publicBaseUrl(), $query);
             $link = new PageLink($url, $c['subject'], ['target' => '_blank']);
 
             yield [

plugins/ViewBrowserPlugin/ContentCreator.php

@@ -25,6 +25,8 @@
 use Iterator;
 use phpList\plugin\Common;
 
+use function phpList\plugin\Common\publicBaseUrl;
+
 /**
  * Class to create the content of a campaign email.
  */
@@ -279,12 +281,10 @@ public function __construct(
         Common\DAO\Attribute $daoAttr,
         $clickTrack
     ) {
-        global $public_scheme, $pageroot;
-
         $this->dao = $dao;
         $this->daoAttr = $daoAttr;
         $this->clickTrack = $clickTrack;
-        $this->rootUrl = sprintf('%s://%s%s/', $public_scheme, getConfig('website'), $pageroot);
+        $this->rootUrl = publicBaseUrl() . '/';
     }
 
     /**