Alex Savenko / semena

Merged
Merge Request #20 · created by Dima

Remote work

New merge request From Alex:remote_work into Alex:master

From remote_work into master

Merged by Dima

1 participants
Showing 1 changed file   Show diff stats
Inline Side-by-side
www/index.php
  Show/Hide comments   Edit  View file @3269b8a
... ... @@ -1779,18 +1779,30 @@ try
1779 1779 'action' => 'please_return',]
1780 1780 )
1781 1781 ->setName( 'please_return' );
1782   - $router->add
1783   - ('/nasinnja_ovochiv_1c0/koshiki_1c1',
1784   - ['controller' => 'page',
1785   - 'action' => 'basket_ua',]
1786   - )
1787   - ->setName( 'basket_ua' );
1788   - $router->add
1789   - ('/semena_ovoshchey_1c_20/koshiki_1c_21{language:([/][a-z]{2})?}',
1790   - ['controller' => 'page',
1791   - 'action' => 'basket_ru',]
1792   - )
1793   - ->setName( 'basket_ru' );
  1782 + $router->add
  1783 + ('/nasinnja_ovochiv_1c0/koshiki_1c1',
  1784 + ['controller' => 'page']
  1785 + )->beforeMatch(function($matchedRoute, $routeObject) {
  1786 + return \Phalcon\DI::getDefault()->getResponse()->redirect("/koshiki_1c0/koshiki_ovochevi_1c1", true, 301);
  1787 + });
  1788 + $router->add
  1789 + ('/semena_ovoshchey_1c_20/koshiki_1c_21{language:([/][a-z]{2})?}',
  1790 + ['controller' => 'page'])->beforeMatch(function($matchedRoute, $routeObject){
  1791 + return \Phalcon\DI::getDefault()->getResponse()->redirect("/koshiki_1c_20/koshiki_ovochevi_1c_21/ru", true, 301);
  1792 + });
  1793 +
  1794 + $router->add
  1795 + ('/koshiki_1c0/koshiki_ovochevi_1c1',
  1796 + ['controller' => 'page',
  1797 + 'action' => 'basket_ua',]
  1798 + )
  1799 + ->setName( 'basket_ua' );
  1800 + $router->add
  1801 + ('/koshiki_1c_20/koshiki_ovochevi_1c_21{language:([/][a-z]{2})?}',
  1802 + ['controller' => 'page',
  1803 + 'action' => 'basket_ru',]
  1804 + )
  1805 + ->setName( 'basket_ru' );
1794 1806 return $router;
1795 1807 }, true );
1796 1808  
... ...