Merge branch 'api-rework' into working

2 files changed, 6 insertions, 1 deletions

diff --git a/application/config/config.php b/application/config/config.php
index 2748e97c0..16f5af4bb 100644
--- a/application/config/config.php
+++ b/application/config/config.php
@@ -126,7 +126,11 @@ $config['subclass_prefix'] = 'MY_';
 | DO NOT CHANGE THIS UNLESS YOU FULLY UNDERSTAND THE REPERCUSSIONS!!
 |
 */
-$config['permitted_uri_chars'] = 'a-z 0-9~%.:_\-';
+if (php_sapi_name() == "cli") {
+	$config['permitted_uri_chars'] = '';
+} else {
+	$config['permitted_uri_chars'] = 'a-z 0-9~%.:_\-';
+}
 
 
 /*
diff --git a/application/config/routes.php b/application/config/routes.php
index e0d963405..23c9bebee 100644
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -42,6 +42,7 @@ $route['default_controller'] = "file";
 $route['user/(:any)'] = "user/$1";
 $route['file/(:any)'] = "file/$1";
 $route['tools/(:any)'] = "tools/$1";
+$route['api/(:any)'] = "api/route/$1";
 $route['(:any)'] = "file/index/$1";
 $route['404_override'] = '';