Merge pull request #205 from Shnoulle/master_routes

Dev: Don't take lang, because unexiting lang make a new false page
LimeSurvey · Jun 27, 2014 · 72e0dcf · 72e0dcf
2 parents 641b587 + ed67e93
commit 72e0dcf
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/application/config/routes.php b/application/config/routes.php
@@ -18,6 +18,7 @@
 $route['<_sid:\d+>/lang-<_lang:\w+[-\w]+>/*'] = "survey/index/sid/<_sid>/lang/<_lang>";
 $route['<_sid:\d+>/tk-<_token:\w+>/*'] = "survey/index/sid/<_sid>/token/<_token>";
 $route['<_sid:\d+>/*'] = "survey/index/sid/<_sid>";
+$route['<sid:\d+>'] = array('survey/index','matchValue'=>true);
 
 //Admin Routes
 $route['admin/index'] = "admin";
@@ -28,12 +29,15 @@
 $route['admin/labels/<_action:\w+>'] = "admin/labels/index/<_action>";
 $route['admin/labels/<_action:\w+>/<_lid:\d+>'] = "admin/labels/index/<_action>/<_lid>";
 
-$route['<_controller:\w+>/<_action:\w+>'] = '<_controller>/<_action>';
-
 //Expression Manager tests
 $route['admin/expressions'] = "admin/expressions/index";
 
-//optout
+//optout - optin
 $route['optout/<_sid:\d+>/(:any)/(:any)'] = "optout/index/<_sid>/$2/$3";
+$route['optout/tokens/<surveyid:\d+>'] = array('optout/tokens','matchValue'=>true);
+$route['optin/tokens/<surveyid:\d+>'] = array('optin/tokens','matchValue'=>true);
+$route['statistics_user/<surveyid:\d+>'] =  array('statistics_user/action','matchValue'=>true);
+
+$route['<_controller:\w+>/<_action:\w+>'] = '<_controller>/<_action>';
 
-return $route;
+return $route;