pull/135 - fetch powered image from https when required

Author: michield

public_html/lists/admin/defaultconfig.php

@@ -671,7 +671,7 @@
     } else {
         $v = VERSION;
     }
-    $PoweredBy = '<p align="left"><a href="http://www.phplist.com"><img src="http://powered.phplist.com/images/' . $v . '/power-phplist.png" width="88" height="31" title="powered by phplist" alt="powered by phplist" border="0" /></a></p>';
+    $PoweredBy = '<p align="left"><a href="http://www.phplist.com"><img src="'.PHPLIST_POWEREDBY_URLROOT.'/' . $v . '/power-phplist.png" width="88" height="31" title="powered by phplist" alt="powered by phplist" border="0" /></a></p>';
 } else {
     $PoweredBy = '<center><a href="http://www.phplist.com"><img src="images/power-phplist.png" width="88" height="31" title="powered by phplist" alt="powered by phplist" border="0" /></a></center>';
 }

public_html/lists/admin/init.php

@@ -602,7 +602,11 @@
     define('AWS_POSTURL', 'https://email.us-east-1.amazonaws.com/');
 }
 if (!defined('PHPLIST_POWEREDBY_URLROOT')) {
-    define('PHPLIST_POWEREDBY_URLROOT', 'http://powered.phplist.com/images');
+    if ($GLOBALS['public_scheme'] == 'https') {
+        define('PHPLIST_POWEREDBY_URLROOT', 'https://d3u7tsw7cvar0t.cloudfront.net/images');
+    } else {
+        define('PHPLIST_POWEREDBY_URLROOT', 'http://powered.phplist.com/images');
+    }
 }
 
 if (!isset($allowed_referrers) || !is_array($allowed_referrers)) {

public_html/lists/admin/lib.php

@@ -630,7 +630,7 @@ function cleanEmail($value)
 }
 
 if (TEST && REGISTER) {
-    $pixel = '<img src="http://powered.phplist.com/images/pixel.gif" width="1" height="1" />';
+    $pixel = '<img src="'.PHPLIST_POWEREDBY_URLROOT.'/pixel.gif" width="1" height="1" />';
 }
 
 function timeDiff($time1, $time2)