wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added function to make url absolute

Browse source
This commit is contained in:
Bart Visscher 2012-08-06 22:15:55 +02:00
parent 6d0390dcca
commit c4f1a1de5b
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/helper.php
View file

@ -120,8 +120,19 @@ class OC_Helper {
*/
public static function linkToAbsolute( $app, $file ) {
$urlLinkTo = self::linkTo( $app, $file );
$urlLinkTo = self::serverProtocol(). '://' . self::serverHost() . $urlLinkTo;
return $urlLinkTo;
return self::makeURLAbsolute($urlLinkTo);
}
/**
* @brief Makes an $url absolute
* @param $url the url
* @returns the absolute url
*
* Returns a absolute url to the given app and file.
*/
public static function makeURLAbsolute( $url )
{
return self::serverProtocol(). '://' . self::serverHost() . $url;
}
/**

4
lib/util.php
View file

@ -348,7 +348,7 @@ class OC_Util {
else {
$defaultpage = OC_Appconfig::getValue('core', 'defaultpage');
if ($defaultpage) {
$location = OC_Helper::serverProtocol().'://'.OC_Helper::serverHost().OC::$WEBROOT.'/'.$defaultpage;
$location = OC_Helper::makeURLAbsolute(OC::$WEBROOT.'/'.$defaultpage);
}
else {
$location = OC_Helper::linkToAbsolute( 'files', 'index.php' );
@ -476,7 +476,7 @@ class OC_Util {
@fclose($fp);
// accessing the file via http
$url = OC_Helper::serverProtocol(). '://' . OC_Helper::serverHost() . OC::$WEBROOT.'/data'.$filename;
$url = OC_Helper::makeURLAbsolute(OC::$WEBROOT.'/data'.$filename);
$fp = @fopen($url, 'r');
$content=@fread($fp, 2048);
@fclose($fp);