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

rewriting

Browse Source
This commit is contained in:
Etienne Roudeix
2013-09-03 16:51:41 +02:00
parent 2bc1dc0bec
commit 43ff0b7297
15 changed files with 406 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/lib/Thelia/Controller/BaseController.php
View File

@@ -36,6 +36,8 @@ use Thelia\Form\BaseForm;
use Thelia\Form\Exception\FormValidationException;
use Symfony\Component\EventDispatcher\Event;
use Thelia\Core\Event\DefaultActionEvent;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
*
@@ -200,4 +202,14 @@ class BaseController extends ContainerAware
if (null !== $url) $this->redirect($url);
}
/**
* Return a 404 error
*
* @return \Symfony\Component\HttpFoundation\Response
*/
protected function pageNotFound()
{
}
}

6
core/lib/Thelia/Controller/Front/DefaultController.php
View File

@@ -49,10 +49,10 @@ class DefaultController extends BaseFrontController
if(ConfigQuery::isRewritingEnable()) {
/* Does the query GET parameters match a rewritten URL ? */
$rewrittenUrl = URL::retrieveCurrent($request, true);
if($rewrittenUrl !== null) {
$rewrittenUrl = URL::init()->retrieveCurrent($request);
if($rewrittenUrl->rewrittenUrl !== null) {
/* 301 redirection to rewritten URL */
$this->redirect($rewrittenUrl, 301);
$this->redirect($rewrittenUrl->url, 301);
}
}

35
core/lib/Thelia/Controller/Front/UrlRewritingController.php
View File

@@ -22,13 +22,6 @@
/*************************************************************************************/
namespace Thelia\Controller\Front;
//use Propel\Runtime\Exception\PropelException;
//use Thelia\Form\Exception\FormValidationException;
//use Thelia\Core\Event\CartEvent;
//use Thelia\Core\Event\TheliaEvents;
//use Symfony\Component\HttpFoundation\Request;
//use Thelia\Form\CartAdd;
use Thelia\Core\HttpFoundation\Request;
use Thelia\Exception\UrlRewritingException;
use Thelia\Model\ConfigQuery;
@@ -36,36 +29,40 @@ use Thelia\Tools\URL;
class UrlRewritingController extends BaseFrontController
{
public function check(Request $request)
public function check(Request $request, $rewritten_url)
{
if(ConfigQuery::isRewritingEnable()) {
try {
$rewrittentUrlData = URL::resolveCurrent($request);
$rewrittenUrlData = URL::init()->resolve($rewritten_url);
} catch(UrlRewritingException $e) {
$code = $e->getCode();
switch($e->getCode()) {
case UrlRewritingException::URL_NOT_FOUND :
/* TODO : redirect 404 */
throw $e;
return $this->pageNotFound();
break;
default:
throw $e;
}
}
/* is the URL redirected ? */
if(null !== $rewrittenUrlData->redirectedToUrl) {
$this->redirect($rewrittenUrlData->redirectedToUrl, 301);
}
/* define GET arguments in request */
if(null !== $rewrittentUrlData->view) {
$request->query->set('view', $rewrittentUrlData->view);
if(null !== $rewrittentUrlData->viewId) {
$request->query->set($rewrittentUrlData->view . '_id', $rewrittentUrlData->viewId);
if(null !== $rewrittenUrlData->view) {
$request->query->set('view', $rewrittenUrlData->view);
if(null !== $rewrittenUrlData->viewId) {
$request->query->set($rewrittenUrlData->view . '_id', $rewrittenUrlData->viewId);
}
}
if(null !== $rewrittentUrlData->locale) {
$request->query->set('locale', $rewrittentUrlData->locale);
if(null !== $rewrittenUrlData->locale) {
$request->query->set('locale', $rewrittenUrlData->locale);
}
foreach($rewrittentUrlData->otherParameters as $parameter => $value) {
foreach($rewrittenUrlData->otherParameters as $parameter => $value) {
$request->query->set($parameter, $value);
}
}