aliens/SemanticScuttle
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Part of bug #3463481: Add HTTP protocol to self URL in feed

Browse source
This commit is contained in:
Christian Weiske 2012-01-20 14:52:36 +01:00
parent 79d1e2de10
commit 728d642563
2 changed files with 26 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/SemanticScuttle/functions.php
View file

@ -118,6 +118,31 @@ function createURL($page = '', $ending = '') {
return ROOT . $page; return ROOT . $page;
} }
} }
/**
* Adds the protocol to the URL if it's missing.
* If the current URL is served via HTTPS, https will be used as protocol.
*
* Useful to fix ROOT urls of SemanticScuttle when it's needed, e.g.
* in the bookmarklet or the feed.
*
* @param string $url Url with or without the protocol ("//example.org/foo")
*
* @return string URL with a HTTP protocol
*/
function addProtocolToUrl($url)
{
if (substr($url, 0, 2) != '//') {
return $url;
}
if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS']) {
$protocol = 'https:';
} else {
$protocol = 'http:';
}
return $protocol . $url;
}
/** /**
* Creates a "vote for/against this bookmark" URL. * Creates a "vote for/against this bookmark" URL.
* Also runs htmlspecialchars() on them to prevent XSS. * Also runs htmlspecialchars() on them to prevent XSS.

2
www/rss.php
View file

@ -124,7 +124,7 @@ if ($cat) {
} }
$tplVars['feedtitle'] = filter($GLOBALS['sitename'] . (isset($pagetitle) ? $pagetitle : '')); $tplVars['feedtitle'] = filter($GLOBALS['sitename'] . (isset($pagetitle) ? $pagetitle : ''));
$tplVars['feedlink'] = ROOT; $tplVars['feedlink'] = addProtocolToUrl(ROOT);
$tplVars['feeddescription'] = sprintf(T_('Recent bookmarks posted to %s'), $GLOBALS['sitename']); $tplVars['feeddescription'] = sprintf(T_('Recent bookmarks posted to %s'), $GLOBALS['sitename']);
$bookmarks = $bookmarkservice->getBookmarks( $bookmarks = $bookmarkservice->getBookmarks(