TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into loops

Browse Source 
Conflicts:
	core/lib/Thelia/Core/Template/Loop/Category.php
	core/lib/Thelia/Core/Template/Loop/FeatureValue.php
	core/lib/Thelia/Core/Template/Loop/Folder.php
	core/lib/Thelia/Core/Template/Loop/Product.php
	core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
	install/faker.php
This commit is contained in:
Etienne Roudeix
2013-08-21 09:19:56 +02:00
parent 6a14bef3de a0b82879f5
commit 86b11096ba
3275 changed files with 929970 additions and 274940 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
core/lib/Thelia/Tools/URL.php Normal file → Executable file
View File

@@ -27,73 +27,78 @@ use Thelia\Model\ConfigQuery;
class URL
{
public static function getIndexPage() {
return ConfigQuery::read('base_url', '/') . "index_dev.php"; // FIXME !
}
const PATH_TO_FILE = true;
const WITH_INDEX_PAGE = false;
/**
* Returns the Absolute URL for a given path relative to web root. By default,
* the index.php (or index_dev.php) script name is added to the URL, use
* $path_only = true to get a path without the index script.
public static function getIndexPage()
{
return ConfigQuery::read('base_url', '/') . "index_dev.php"; // FIXME !
}
/**
* Returns the Absolute URL for a given path relative to web root. By default,
* the index.php (or index_dev.php) script name is added to the URL, use
* $path_only = true to get a path without the index script.
*
* @param string $path the relative path
* @param array $parameters An array of parameters
* @param boolean $path_only if true, getIndexPage() will not be added
* @param string $path the relative path
* @param array $parameters An array of parameters
* @param boolean $path_only if true (PATH_TO_FILE), getIndexPage() will not be added
*
* @return string The generated URL
*/
public static function absoluteUrl($path, array $parameters = array(), $path_only = false)
public static function absoluteUrl($path, array $parameters = null, $path_only = self::WITH_INDEX_PAGE)
{
// Already absolute ?
if (substr($path, 0, 4) != 'http') {
// Already absolute ?
if (substr($path, 0, 4) != 'http') {
$root = $path_only ? ConfigQuery::read('base_url', '/') : self::getIndexPage();
$root = $path_only == self::PATH_TO_FILE ? ConfigQuery::read('base_url', '/') : self::getIndexPage();
$base = $root . '/' . ltrim($path, '/');
}
else
$base = $path;
$base = rtrim($root, '/') . '/' . ltrim($path, '/');
} else
$base = $path;
$queryString = '';
foreach($parameters as $name => $value) {
$queryString .= sprintf("%s=%s&", urlencode($name), urlencode($value));
}
$queryString = '';
$sepChar = strstr($base, '?') === false ? '?' : '&';
if (! is_null($parameters)) {
foreach ($parameters as $name => $value) {
$queryString .= sprintf("%s=%s&", urlencode($name), urlencode($value));
}
}
if ('' !== $queryString = rtrim($queryString, "&")) $queryString = $sepChar . $queryString;
$sepChar = strstr($base, '?') === false ? '?' : '&';
return $base . $queryString;
if ('' !== $queryString = rtrim($queryString, "&")) $queryString = $sepChar . $queryString;
return $base . $queryString;
}
/**
* Returns the Absolute URL to a administration view
*
* @param string $viewName the view name (e.g. login for login.html)
* @param mixed $parameters An array of parameters
* @param string $viewName the view name (e.g. login for login.html)
* @param mixed $parameters An array of parameters
*
* @return string The generated URL
*/
public static function adminViewUrl($viewName, array $parameters = array()) {
public static function adminViewUrl($viewName, array $parameters = array())
{
$path = sprintf("%s/admin/%s", self::getIndexPage(), $viewName); // FIXME ! view= should not be required, check routing parameters
$path = sprintf("%s/admin/%s", self::getIndexPage(), $viewName); // FIXME ! view= should not be required, check routing parameters
return self::absoluteUrl($path, $parameters);
return self::absoluteUrl($path, $parameters);
}
/**
* Returns the Absolute URL to a view
/**
* Returns the Absolute URL to a view
*
* @param string $viewName the view name (e.g. login for login.html)
* @param mixed $parameters An array of parameters
* @param string $viewName the view name (e.g. login for login.html)
* @param mixed $parameters An array of parameters
*
* @return string The generated URL
*/
public static function viewUrl($viewName, array $parameters = array()) {
public static function viewUrl($viewName, array $parameters = array())
{
$path = sprintf("%s?view=%s", self::getIndexPage(), $viewName);
$path = sprintf("%s?view=%s", self::getIndexPage(), $viewName);
return self::absoluteUrl($path, $parameters);
return self::absoluteUrl($path, $parameters);
}
}