Merge branch 'master' of github.com:thelia/thelia

Conflicts:
	core/lib/Thelia/Config/Resources/routing/front.xml

core/lib/Thelia/Controller/Front/BaseFrontController.php

@@ -26,4 +26,24 @@ use Thelia\Controller\BaseController;
 
 class BaseFrontController extends BaseController
 {
+    /**
+     * Return the route path defined for the givent route ID
+     *
+     * @param string $routeId a route ID, as defines in Config/Resources/routing/front.xml
+     *
+     * @see \Thelia\Controller\BaseController::getRouteFromRouter()
+     */
+    protected function getRoute($routeId) {
+        return $this->getRouteFromRouter('router.front', $routeId);
+    }
+
+    /**
+     * Redirect to à route ID related URL
+     *
+     * @param unknown $routeId the route ID, as found in Config/Resources/routing/admin.xml
+     * @param unknown $urlParameters the URL parametrs, as a var/value pair array
+     */
+    public function redirectToRoute($routeId, $urlParameters = array()) {
+        $this->redirect(URL::absoluteUrl($this->getRoute($routeId), $urlParameters));
+    }
 }

core/lib/Thelia/Controller/Front/DefaultController.php

@@ -23,6 +23,9 @@
 namespace Thelia\Controller\Front;
 
 use Symfony\Component\HttpFoundation\Request;
+use Thelia\Model\ConfigQuery;
+use Thelia\Tools\Redirect;
+use Thelia\Tools\URL;
 
 /**
  *
@@ -43,6 +46,16 @@ class DefaultController extends BaseFrontController
      */
     public function noAction(Request $request)
     {
+        if(ConfigQuery::isRewritingEnable()) {
+
+            /* Does the query GET parameters match a rewritten URL ? */
+            $rewrittenUrl = URL::init()->retrieveCurrent($request);
+            if($rewrittenUrl->rewrittenUrl !== null) {
+                /* 301 redirection to rewritten URL */
+                $this->redirect($rewrittenUrl->rewrittenUrl, 301);
+            }
+        }
+
         if (! $view = $request->query->get('view')) {
             $view = "index";
             if ($request->request->has('view')) {

core/lib/Thelia/Controller/Front/UrlRewritingController.php

@@ -0,0 +1,81 @@
+<?php
+/*************************************************************************************/
+/*                                                                                   */
+/*      Thelia	                                                                     */
+/*                                                                                   */
+/*      Copyright (c) OpenStudio                                                     */
+/*	    email : info@thelia.net                                                      */
+/*      web : http://www.thelia.net                                                  */
+/*                                                                                   */
+/*      This program is free software; you can redistribute it and/or modify         */
+/*      it under the terms of the GNU General Public License as published by         */
+/*      the Free Software Foundation; either version 3 of the License                */
+/*                                                                                   */
+/*      This program is distributed in the hope that it will be useful,              */
+/*      but WITHOUT ANY WARRANTY; without even the implied warranty of               */
+/*      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                */
+/*      GNU General Public License for more details.                                 */
+/*                                                                                   */
+/*      You should have received a copy of the GNU General Public License            */
+/*	    along with this program. If not, see <http://www.gnu.org/licenses/>.         */
+/*                                                                                   */
+/*************************************************************************************/
+namespace Thelia\Controller\Front;
+
+use Thelia\Core\HttpFoundation\Request;
+use Thelia\Exception\UrlRewritingException;
+use Thelia\Model\ConfigQuery;
+use Thelia\Tools\URL;
+
+class UrlRewritingController extends BaseFrontController
+{
+    public function check(Request $request, $rewritten_url)
+    {
+        if(ConfigQuery::isRewritingEnable()) {
+            try {
+                $rewrittenUrlData = URL::init()->resolve($rewritten_url);
+            } catch(UrlRewritingException $e) {
+                switch($e->getCode()) {
+                    case UrlRewritingException::URL_NOT_FOUND :
+                        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 !== $rewrittenUrlData->view) {
+                $request->query->set('view', $rewrittenUrlData->view);
+                if(null !== $rewrittenUrlData->viewId) {
+                    $request->query->set($rewrittenUrlData->view . '_id', $rewrittenUrlData->viewId);
+                }
+            }
+            if(null !== $rewrittenUrlData->locale) {
+                $request->query->set('locale', $rewrittenUrlData->locale);
+            }
+
+            foreach($rewrittenUrlData->otherParameters as $parameter => $value) {
+                $request->query->set($parameter, $value);
+            }
+        }
+
+        if (! $view = $request->query->get('view')) {
+            $view = "index";
+            if ($request->request->has('view')) {
+                $view = $request->request->get('view');
+            }
+        }
+
+        $request->attributes->set('_view', $view);
+
+    }
+
+}