From: Evan Prodromou <evan@status.net>
Date: Thu, 14 Oct 2010 04:31:13 +0000 (-0400)
Subject: try and show an SSL image for the creative commons image
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=40c64388e6b0a768dcfa4aa003ba5114be070c2a;p=quix0rs-gnu-social.git

try and show an SSL image for the creative commons image
---

diff --git a/lib/action.php b/lib/action.php
index 008f29d03e..b05770b152 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -894,8 +894,26 @@ class Action extends HTMLOutputter // lawsuit
             case 'cc': // fall through
             default:
                 $this->elementStart('p');
+
+                $image    = common_config('license', 'image');
+                $sslimage = common_config('license', 'sslimage');
+
+                if (StatusNet::isHTTPS()) {
+                    if (!empty($sslimage)) {
+                        $url = $sslimage;
+                    } else if (preg_match('#^http://i.creativecommons.org/#', $image)) {
+                        // CC support HTTPS on their images
+                        $url = preg_replace('/^http/', 'https', $image);
+                    } else {
+                        // Better to show mixed content than no content
+                        $url = $image;
+                    }
+                } else {
+                    $url = $image;
+                }
+
                 $this->element('img', array('id' => 'license_cc',
-                                            'src' => common_config('license', 'image'),
+                                            'src' => $url,
                                             'alt' => common_config('license', 'title'),
                                             'width' => '80',
                                             'height' => '15'));