мелкие улучшения для более удобной разработки

Author: fuzegit

manifest.en.ini

@@ -6,8 +6,8 @@ addon_id = "600"
 [version]
 major = "2"
 minor = "0"
-build = "0"
-date  = "20170905"
+build = "1"
+date  = "20180105"
 
 [depends]
 core = "2.5.0"

manifest.ru.ini

@@ -6,8 +6,8 @@ addon_id = "600"
 [version]
 major = "2"
 minor = "0"
-build = "0"
-date  = "20170905"
+build = "1"
+date  = "20180105"
 
 [depends]
 core = "2.5.0"

package/system/controllers/api/actions/method.php

@@ -9,8 +9,7 @@
 
 class actionApiMethod extends cmsAction {
 
-    private $method_name       = null;
-    private $method_params     = array();
+    private $method_params          = array();
     private $method_controller_name = null;
     private $method_action_name     = null;
 
@@ -183,6 +182,7 @@ public function run($method_name = null){
 
         // ставим ключ API в свойство
         $this->method_action->key = $this->key;
+        $this->method_action->method_name = $this->method_name;
 
         // валидация параметров запроса
         $params_error = $this->validateMethodParams();
@@ -288,6 +288,8 @@ private function validateMethodParams() {
 
                 $this->request->set($param_name, $value);
 
+            } elseif(!is_null($value) && isset($rules['default'])){
+                $value = $this->request->get($param_name, $rules['default']);
             }
 
             foreach ($rules['rules'] as $rule) {

package/system/controllers/api/api_actions/api_users_get_sig.php

@@ -9,7 +9,8 @@ class actionUsersApiUsersGetSig extends cmsAction {
     public function run(){
 
         $this->result = array(
-            'sig' => get_sig()
+            'sig' => get_sig(),
+            'csrf_token' => cmsForm::generateCSRFToken()
         );
 
     }

package/system/controllers/api/frontend.php

@@ -15,6 +15,7 @@ class api extends cmsFrontend {
     private $output_error = array();
 
     public $key = null;
+    public $method_name = null;
 
     public function __construct($request){
 
@@ -125,7 +126,7 @@ public function actionExecute() {
 
             if(!$method_result){ return $this->error(13); }
 
-            $response[$method_param['method']] = $this->output_success['response'];
+            $response[!empty($method_param['key']) ? $method_param['key'] : $method_param['method']] = $this->output_success['response'];
 
         }
 
@@ -268,7 +269,7 @@ function api_image_src($images, $size_preset = false){
 }
 function form_to_params($form) {
 
-    $params = array(array(
+    $params = array('csrf_token' => array(
         'title'  => 'csrf_token',
         'fields' => array(
             array(
@@ -293,7 +294,7 @@ function form_to_params($form) {
 
     $structure = $form->getStructure();
 
-    foreach($structure as $fieldset){
+    foreach($structure as $key => $fieldset){
 
         if (empty($fieldset['childs'])) { continue; }
 
@@ -304,20 +305,21 @@ function form_to_params($form) {
 
         foreach($fieldset['childs'] as $field){
 
-            $param['fields'][] = array(
+            $param['fields'][$field->getName()] = array(
                 'title'    => $field->title,
                 'type'     => $field->class,
                 'name'     => $field->getName(),
                 'rules'    => $field->getRules(),
                 'var_type' => $field->var_type,
                 'items'    => (method_exists($field, 'getListItems') ? $field->getListItems() : null),
                 'hint'     => (!empty($field->hint) ? $field->hint : null),
+                'units'    => (!empty($field->units) ? $field->units : null),
                 'default'  => (isset($field->default) ? $field->default : null)
             );
 
         }
 
-        $params[] = $param;
+        $params[$key] = $param;
 
     }