Change generated links to be aware of HTTPS.

core/util.inc.php

@@ -402,10 +402,18 @@ function modify_url($url, $changes) {
  * @return string
  */
 function make_http(/*string*/ $link) {
-	if(strpos($link, "ttp://") > 0) return $link;
+	if(strpos($link, "ttp://") > 0) {
-	if(strlen($link) > 0 && $link[0] != '/') $link = get_base_href().'/'.$link;
+		return $link;
-	$link = "http://".$_SERVER["HTTP_HOST"].$link;
+	}
+
+	if(strlen($link) > 0 && $link[0] != '/') {
+		$link = get_base_href() . '/' . $link;
+	}
+
+	$protocol = is_https_enabled() ? "https://" : "http://";
+	$link = $protocol . $_SERVER["HTTP_HOST"] . $link;
 	$link = str_replace("/./", "/", $link);
+
 	return $link;
 }
 
@@ -549,6 +557,15 @@ function captcha_check() {
 * Misc                                                                      *
 \* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
+/**
+ * Check if HTTPS is enabled for the server.
+ *
+ * @return bool True if HTTPS is enabled
+ */
+function is_https_enabled() {
+	return (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off');
+}
+
 /**
  * Get MIME type for file
  *

ext/qr_code/theme.php

@@ -5,8 +5,11 @@ class QRImageTheme extends Themelet {
 	 */
 	public function links_block($link) {
 		global $page;
+
+		$protocol = is_https_enabled() ? "https://" : "http://";
+
 		$page->add_block( new Block(
-			"QR Code","<img alt='QR Code' src='http://chart.apis.google.com/chart?chs=150x150&amp;cht=qr&amp;chl={$link}' />","left",50));
+			"QR Code","<img alt='QR Code' src='{$protocol}chart.apis.google.com/chart?chs=150x150&amp;cht=qr&amp;chl={$link}' />","left",50));
 	}
 }