james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

make_http function

Browse Source
This commit is contained in:
Shish 2009-07-24 08:08:29 +01:00
parent 52ba270e78
commit ecef1edb14
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/rss_images/main.php
View File

@ -54,7 +54,7 @@ class RSS_Images extends SimpleExtension {
$data = ""; $data = "";
foreach($images as $image) { foreach($images as $image) {
$link = make_link("post/view/{$image->id}"); $link = make_http(make_link("post/view/{$image->id}"));
$tags = $image->get_tag_list(); $tags = $image->get_tag_list();
$owner = $image->get_owner(); $owner = $image->get_owner();
$thumb_url = $image->get_thumb_link(); $thumb_url = $image->get_thumb_link();

4
contrib/simpletest/main.php
View File

@ -33,9 +33,7 @@ define('ADMIN_PASS', "demo");
*/ */
class SCoreWebTestCase extends WebTestCase { class SCoreWebTestCase extends WebTestCase {
protected function get_page($page) { protected function get_page($page) {
$url = "http://".$_SERVER["HTTP_HOST"].get_base_href().'/'.make_link($page); $raw = $this->get(make_http(make_link($url)));
$url = str_replace("/./", "/", $url);
$raw = $this->get($url);
$this->assertNoText("Exception:"); $this->assertNoText("Exception:");
$this->assertNoText("Error:"); $this->assertNoText("Error:");
$this->assertNoText("Warning:"); $this->assertNoText("Warning:");

13
core/util.inc.php
View File

@ -127,6 +127,19 @@ function make_link($page=null, $query=null) {
} }
} }
/**
* Turn a relative link into an absolute one, including hostname
*
* @retval string
*/
function make_http($link) {
if(strpos($link, "ttp://") > 0) return $link;
if($link[0] != '/') $link = get_base_href().'/'.$link;
$link = "http://".$_SERVER["HTTP_HOST"].$link;
$link = str_replace("/./", "/", $link);
return $link;
}
/** /**
* Make a link to a static file in the current theme's * Make a link to a static file in the current theme's
* directory * directory