Merge branch 'develop'

Author: silentworks

README.md

@@ -89,6 +89,7 @@ These helpers are listed below.
 - urlFor
 - siteUrl
 - baseUrl
+- currentUrl
 
 #### urlFor
 
@@ -154,6 +155,21 @@ Inside your Smarty template you would write:
 
     {baseUrl}
 
+
+#### currentUrl
+
+__Twig__
+
+Inside your Twig template you would write:
+
+    {{ currentUrl() }}
+
+__Smarty__
+
+Inside your Smarty template you would write:
+
+    {currentUrl}
+
 ## Authors
 
 [Josh Lockhart](https://github.com/codeguy)

SmartyPlugins/function.currentUrl.php

@@ -0,0 +1,31 @@
+<?php
+/*
+ * Smarty plugin
+ * -------------------------------------------------------------
+ * File:     function.currentUrl.php
+ * Type:     function
+ * Name:     currentUrl
+ * Purpose:  outputs url for a function with the defined name method
+ * version   0.1.3
+ * package   SlimViews
+ * -------------------------------------------------------------
+ */
+function smarty_function_currentUrl($params, $template)
+{
+    $appName = isset($params['appname']) ? $params['appname'] : 'default';
+    $withQueryString = isset($params['queryString']) ? $params['queryString'] : true;
+
+    $app = \Slim\Slim::getInstance($appName);
+    $req = $app->request();
+    $uri = $req->getUrl() . $req->getPath();
+
+    if ($withQueryString) {
+        $env = $app->environment();
+
+        if ($env['QUERY_STRING']) {
+            $uri .= '?' . $env['QUERY_STRING'];
+        }
+    }
+
+    return $uri;
+}