REST service added

easterism · Oct 3, 2014 · c024cb0 · c024cb0
1 parent eec1239
commit c024cb0
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 3 deletions.
diff --git a/inc/classes/Email.php b/inc/classes/Email.php
@@ -186,7 +186,7 @@ public function send($in_transaction = false) {
             $db = new Db();
 
             if ($db->isModuleActive('queue')) {
-                require_once($db->getModuleLocation('queue') . '/modQueueController.php');
+                require_once($db->getModuleLocation('queue') . '/ModQueueController.php');
                 $queue = new modQueueController();
 
                 $queue->createEmail(

diff --git a/inc/classes/Init.php b/inc/classes/Init.php
@@ -225,7 +225,7 @@ public function dispatch() {
 
         // Веб-сервис (SOAP)
         $matches = array();
-        if (preg_match('~(wsdl_([a-zA-Z0-9_]+)\.xml|ws_([a-zA-Z0-9_]+)\.php)~', basename($_SERVER['REQUEST_URI']), $matches)) {
+        if (preg_match('~^(wsdl_([a-zA-Z0-9_]+)\.xml|ws_([a-zA-Z0-9_]+)\.php)~', basename($_SERVER['REQUEST_URI']), $matches)) {
 
             // Инициализация модуля вебсервиса
             if ( ! $this->isModuleActive('webservice')) {
@@ -257,6 +257,33 @@ public function dispatch() {
             return $webservice_controller->dispatch_soap($module_name, $service_request_action);
         }
 
+        // Веб-сервис (REST)
+        $matches = array();
+        if (preg_match('~api/([a-zA-Z0-9_]+)(\?|$)~', $_SERVER['REQUEST_URI'], $matches)) {
+
+            // Инициализация модуля вебсервиса
+            if ( ! $this->isModuleActive('webservice')) {
+                throw new Exception("SYSTEM:Module webservice does not active");
+            }
+
+            $webservice_location        = $this->getModuleLocation('webservice');
+            $webservice_controller_path = $webservice_location . '/ModWebserviceController.php';
+
+            if ( ! file_exists($webservice_controller_path)) {
+                throw new Exception("SYSTEM:Module does not exists");
+            }
+
+            require_once($webservice_controller_path);
+
+            if ( ! class_exists('ModWebserviceController')) {
+                throw new Exception("SYSTEM:Module broken");
+            }
+
+
+            $webservice_controller = new ModWebserviceController();
+            return $webservice_controller->dispatch_rest(strtolower($matches[1]));
+        }
+
 
 		if (!empty($this->auth->ID) && !empty($this->auth->NAME) && is_int($this->auth->ID)) {
 			// LOG USER ACTIVITY

diff --git a/inc/classes/Tool.php b/inc/classes/Tool.php
@@ -162,7 +162,7 @@ public static function fb($text) {
 
     	$cnf = Zend_Registry::get('config');
     	if ($cnf->log->on) {
-    		require_once('core2/ext/FirePHPCore/fb.php');
+    		require_once('core2/ext/FirePHPCore-0.3.2/lib/FirePHPCore/fb.php');
 			fb($text);
 		}
     }