Исправлено неверное приведение к типам в параметрах списка id,

дополнены разные мелочи
close #3

Author: fuzegit

clientExamples/instantcms/README.md

@@ -8,6 +8,9 @@
 
 ## Использование
 
+Заполнить константы api_key, api_point, api_point_execute своими данными.
+Создать директорию /cache/api/. В ней будут кэшироваться ответы.
+
 Вызовы можно осуществлять из любого места кода InstantCMS
 
 Обычные методы

clientExamples/instantcms/api.php

@@ -191,4 +191,31 @@ public static function getExecute($params, $cacheable = false, $is_upload = fals
         return self::getMethod('execute', ['code' => json_encode($params)], $cacheable, $is_upload, self::getApiExecutePoint());
     }
 
+    public static function arrayToForm($data) {
+
+        $form = new cmsForm();
+
+        $form->addFieldset('', 'basic');
+
+        foreach ($data as $fsets) {
+            foreach ($fsets['fields'] as $field) {
+
+                if($field['name'] == 'csrf_token'){
+                    cmsUser::sessionSet('csrf_token', $field['default']);
+                    continue;
+                }
+
+                $field_class = 'field' . string_to_camel('_',  $field['field_type'] );
+
+                $form->addField('basic',
+                    new $field_class($field['name'], $field)
+                );
+
+            }
+        }
+
+        return $form;
+
+    }
+
 }

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

@@ -177,6 +177,13 @@ public function run($method_name = null){
 
         }
 
+        // проверяем csrf, если включена проверка
+        if(!empty($this->method_action->check_csrf)){
+            if (!cmsForm::validateCSRFToken($this->request->get('csrf_token', ''))){
+                return $this->error(0, LANG_API_ERROR_CSRF_TOKEN);
+            }
+        }
+
         // проверяем sig, если включена проверка
         if(!empty($this->method_action->check_sig)){
             if(!check_sig($this->request->get('sig', ''))){

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

@@ -197,10 +197,22 @@ public function validateApiRequest() {
 
     public function run(){
 
+        $is_first_auth = null;
+
+        if(!empty($this->user['id'])){
+            if(cmsUser::getUPS('first_auth', $this->user['id'])){
+                cmsUser::deleteUPS('first_auth', $this->user['id']);
+                $is_first_auth = true;
+            } else {
+                $is_first_auth = false;
+            }
+        }
+
         $this->result = array(
             'wait_2fa'     => $this->wait_2fa,
             '2fa_type'     => $this->twofa_type,
             '2fa_params'   => $this->twofa_params,
+            'is_first_auth' => $is_first_auth,
             'remember_token' => (isset(cmsUser::$auth_token) ? cmsUser::$auth_token : false),
             'session_name' => session_name(),
             'session_id'   => session_id(),
@@ -212,3 +224,4 @@ public function run(){
     }
 
 }
+

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

@@ -66,7 +66,7 @@ class actionContentApiContentGet extends cmsAction {
             )
         ),
         'ids' => array(
-            'default' => 0,
+            'default' => '',
             'rules'   => array(
                 array('regexp', '/^([0-9,]+)$/i')
             )

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

@@ -24,7 +24,7 @@ class actionContentApiContentGetCategories extends cmsAction {
      */
     public $request_params = array(
         'cat_ids' => array(
-            'default' => 0,
+            'default' => '',
             'rules'   => array(
                 array('regexp', '/^([0-9,]+)$/i')
             )

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

@@ -48,7 +48,7 @@ class actionContentApiContentGetFields extends cmsAction {
             )
         ),
         'ids' => array(
-            'default' => 0,
+            'default' => '',
             'rules'   => array(
                 array('regexp', '/^([0-9,]+)$/i')
             )

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

@@ -30,7 +30,7 @@ class actionContentApiContentGetFolders extends cmsAction {
             )
         ),
         'ids' => array(
-            'default' => 0,
+            'default' => '',
             'rules'   => array(
                 array('regexp', '/^([0-9,]+)$/i')
             )

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

@@ -36,7 +36,7 @@ class actionContentApiContentGetProps extends cmsAction {
             )
         ),
         'ids' => array(
-            'default' => 0,
+            'default' => '',
             'rules'   => array(
                 array('regexp', '/^([0-9,]+)$/i')
             )

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

@@ -12,7 +12,7 @@ class actionMessagesApiMessagesReaded extends cmsAction {
 
     public $request_params = array(
         'ids' => array(
-            'default' => 0,
+            'default' => '',
             'rules'   => array(
                 array('required'),
                 array('regexp', '/^([0-9]{1}[0-9,]*)$/')