badmanners/shimmie2
badmanners/shimmie2
Archived
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change generated links to be aware of HTTPS.

Browse source
This commit is contained in:
jgen 2015-02-02 00:13:05 -08:00
parent 99be9c2fdb
commit 8e3fc1da9f
2 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
core/util.inc.php
View file

@ -402,10 +402,18 @@ function modify_url($url, $changes) {
* @return string
*/
function make_http(/*string*/ $link) {
if(strpos($link, "ttp://") > 0) return $link;
if(strlen($link) > 0 && $link[0] != '/') $link = get_base_href().'/'.$link;
$link = "http://".$_SERVER["HTTP_HOST"].$link;
if(strpos($link, "ttp://") > 0) {
return $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
*

5
ext/qr_code/theme.php
View file

@ -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));
}
}