diff options
Diffstat (limited to 'h-source/Library/Url.php')
| -rwxr-xr-x | h-source/Library/Url.php | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/h-source/Library/Url.php b/h-source/Library/Url.php index 26ff3df..efb8e6e 100755 --- a/h-source/Library/Url.php +++ b/h-source/Library/Url.php @@ -2,7 +2,7 @@ // EasyGiant is a PHP framework for creating and managing dynamic content // -// Copyright (C) 2009 - 2014 Antonio Gallo (info@laboratoriolibero.com) +// Copyright (C) 2009 - 2011 Antonio Gallo // See COPYRIGHT.txt and LICENSE.txt. // // This file is part of EasyGiant @@ -26,35 +26,31 @@ class Url { //get the url starting from the root folder public static function getRoot($pathFromRootFolder = null) { - - $langUrl = isset(Params::$lang) ? "/".Params::$lang : null; - + $protocol = Params::$useHttps ? "https" : "http"; - - $url = MOD_REWRITE_MODULE === true ? "$protocol://" . DOMAIN_NAME . $langUrl . '/' . $pathFromRootFolder : "$protocol://" . DOMAIN_NAME . '/index.php/' . $langUrl . $pathFromRootFolder; + + $url = MOD_REWRITE_MODULE === true ? "$protocol://" . DOMAIN_NAME . '/' . $pathFromRootFolder : "$protocol://" . DOMAIN_NAME . '/index.php/' . $pathFromRootFolder; return $url; } - //create an url string (element1/element2/element4) from the values of the array $valuesArray considering only the elements indicated in the numeric string $numericString - //$forceRewrite: if true it always rewrite the status variables - public static function createUrl($variablesArray, $numericString = null, $forceRewrite = false) { + //create an url string (element1/element2/element4) from the values of the array $valuesArray considering only the elements indicated in the numeric string $numericString (in this case '1,2,4') + public static function createUrl($valuesArray,$numericString = null) { $elementsArray = explode(',',$numericString); - $valuesArray = array_values($variablesArray); - $keysArray = array_keys($variablesArray); + $valuesArray = array_values($valuesArray); $urlString = null; for ($i = 0; $i < count($valuesArray); $i++) { if (isset($numericString)) { if (isset($valuesArray[$i]) and in_array($i,$elementsArray)) { - $urlString .= (Params::$rewriteStatusVariables or $forceRewrite) ? "/".$valuesArray[$i] : "&".$keysArray[$i]."=".$valuesArray[$i]; + $urlString .= "/".$valuesArray[$i]; } } else { if (isset($valuesArray[$i])) { - $urlString .= (Params::$rewriteStatusVariables or $forceRewrite) ? "/".$valuesArray[$i] : "&".$keysArray[$i]."=".$valuesArray[$i]; + $urlString .= "/".$valuesArray[$i]; } } } - return (Params::$rewriteStatusVariables or $forceRewrite) ? $urlString : "?".ltrim($urlString,"&"); + return $urlString; } } |