From b5040aca5357b948cb91bf78d4e721ea45e1448c Mon Sep 17 00:00:00 2001
From: Sergey Romanenko <awilum@msn.com>
Date: Thu, 27 Dec 2012 14:07:05 +0200
Subject: [PATCH] Url Helper: New current() method - added.

---
 monstra/helpers/url.php | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

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
+         * 
+         *  <code>
+         *      echo Url::current();         
+         *  </code>
+         *
+         * @return string   
+         */
+        public static function current() {
+            return (!empty($_SERVER['HTTPS'])) ? "https://".$_SERVER['SERVER_NAME'].$_SERVER['REQUEST_URI'] : "http://".$_SERVER['SERVER_NAME'].$_SERVER['REQUEST_URI'];
+        }
+	    
+	}