wpstudio/majestic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

No more relative urls by default, #16

Browse Source 
git-svn-id: svn+ssh://code.netmonsters.ru/svn/majestic/branches/evo@129 4cb57b5f-5bbd-dd11-951b-001d605cbbc5
This commit is contained in:
pzinovkin
2010-03-15 21:06:36 +00:00
parent 41bc23cfab
commit f9ef17a685
3 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Action.php
View File

@ -41,16 +41,10 @@ abstract class Action
* Redirect
*
* @param mixed $url
* @param mixed $relative Default to true
*/
protected function redirect($url = null, $relative = true)
protected function redirect($url = null)
{
$url = ($url) ? $url : Env::getRequestUri();
if ($relative) {
$url = FrontController::getInstance()->getBaseUrl() . $url;
}
header('Location: ' . $url);
header('Location: ' . (($url) ? $url : Env::getRequestUri()));
exit();
}

2
app/FrontController.php
View File

@ -100,7 +100,7 @@ class FrontController
public function execute()
{
try {
$request = Env::getRequestUri();
$request = Env::getRequestUri(true);
$route = $this->getRouter()->route($request);
if (!$route) {
throw new Error404Exception('Route for "' . $request . '" not found');

20
classes/Env.class.php
View File

@ -14,22 +14,24 @@
class Env
{
static protected $request = null;
static protected $request = array();
static protected $params = array();
static public function getRequestUri()
static public function getRequestUri($trim_base = false)
{
if (self::$request === null) {
if (!isset(self::$request[$trim_base])) {
// removes get params
list(self::$request, ) = explode('?', Env::Server('REQUEST_URI'));
// removes base url
$base = FrontController::getInstance()->getBaseUrl();
if (($length = strlen($base)) > 0 && strpos(self::$request, $base) === 0) {
self::$request = (string) substr(self::$request, $length);
list(self::$request[$trim_base], ) = explode('?', Env::Server('REQUEST_URI'));
if ($trim_base) {
// removes base url
$base = FrontController::getInstance()->getBaseUrl();
if (($length = strlen($base)) > 0 && strpos(self::$request[$trim_base], $base) === 0) {
self::$request[$trim_base] = (string) substr(self::$request[$trim_base], $length);
}
}
}
return self::$request;
return self::$request[$trim_base];
}
static public function Get($key = null, $default = null)