mirror/php-monstra
1
0
Fork 0
mirror of https://github.com/monstra-cms/monstra.git synced 2025-08-05 12:48:00 +02:00
Code Issues Releases Wiki Activity

Merge pull request #43 from over9k/master

Browse Source 
Updated the method to get the server protocol
This commit is contained in:
Sergey Romaneko
2012-10-22 11:41:56 -07:00
parent bcc0a5c420 4a92b95ffb
commit 05b1af83de
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
monstra/helpers/url.php
View File

@@ -93,7 +93,8 @@
* @return string
*/
public static function find($url) {
$pos = strpos($url, 'http://');
$https = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == strtolower('on')) ? 'https://' : 'http://';
$pos = strpos($url, $https);
if ($pos === false) { $url_output = Option::get('siteurl') . $url; } else { $url_output = $url; }
return $url_output;
}
@@ -109,7 +110,7 @@
* @return string
*/
public static function base() {
return 'http://' . rtrim(rtrim($_SERVER['HTTP_HOST'], '\\/') . dirname($_SERVER['PHP_SELF']), '\\/');
$https = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == strtolower('on')) ? 'https://' : 'http://';
return $https . rtrim(rtrim($_SERVER['HTTP_HOST'], '\\/') . dirname($_SERVER['PHP_SELF']), '\\/');
}
}