diff --git a/monstra/helpers/url.php b/monstra/helpers/url.php index 8e3581b..277ff5a 100644 --- a/monstra/helpers/url.php +++ b/monstra/helpers/url.php @@ -93,7 +93,7 @@ * @return string */ public static function find($url) { - $https = (isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') ? 'https://' : 'http://'; + $https = (isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') ? 'https://' : 'http://'; $pos = strpos($url, $https); if ($pos === false) { $url_output = Option::get('siteurl') . $url; } else { $url_output = $url; } return $url_output; @@ -110,7 +110,22 @@ * @return string */ public static function base() { - $https = (isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') ? 'https://' : 'http://'; + $https = (isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') ? 'https://' : 'http://'; return $https . rtrim(rtrim($_SERVER['HTTP_HOST'], '\\/') . dirname($_SERVER['PHP_SELF']), '\\/'); } - } \ No newline at end of file + + + /** + * Gets current URL + * + * + * echo Url::current(); + * + * + * @return string + */ + public static function current() { + return (!empty($_SERVER['HTTPS'])) ? "https://".$_SERVER['SERVER_NAME'].$_SERVER['REQUEST_URI'] : "http://".$_SERVER['SERVER_NAME'].$_SERVER['REQUEST_URI']; + } + + }