fix #63

AgelxNash · Nov 29, 2014 · 2120019 · 2120019
1 parent 829e678
commit 2120019
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 12 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,6 +1,7 @@
-## 2.0.21 (29.11.2014)
+## 2.1.0 (30.11.2014)
 * [Add] Добавлен класс \Helpers\Collection для работы с коллекциями
 * [Add] Добавлена поддержка callback'a в методе MODxAPI::toJson()
+* [Fix] Игнорирование флагов учета GET параметров из CSV файла при импорте (Issue #63)
 * [Fix] Баг в \Helpers\FS::getInexistantFilename() (Issue #106)
 * [Fix] Отсутствие ID записи в modResource::toArray() (Issue #104)
 * [Fix] Исправлена проверка возникновения ошибок при запаковке данных в методе MODxAPI::toJson()

diff --git a/assets/lib/MODxAPI/modResource.php b/assets/lib/MODxAPI/modResource.php
@@ -170,8 +170,7 @@ public function set($key, $value)
                     break;
                 }
                 case 'published':{
-                    $value = (int)$value;
-                    $value = $value ? 1 : 0;
+                    $value = (int)((bool)$value);
                     if($value){
                         $this->field['publishedon'] = time() + $this->modxConfig('server_offset_time');
                     }
@@ -203,8 +202,7 @@ public function set($key, $value)
                     break;
                 }
                 case 'deleted':{
-                    $value = (int)$value;
-                    $value = $value ? 1 : 0;
+                    $value = (int)((bool)$value);
                     if($value){
                         $this->field['deletedon'] = time() + $this->modxConfig('server_offset_time');
                     }else{

diff --git a/assets/modules/redirectMap2/src/Action.class.php b/assets/modules/redirectMap2/src/Action.class.php
@@ -234,11 +234,11 @@ public static function csv()
                          */
                         $modRM = new modRedirectMap($modx);
                         $insert = array(
-                            'uri' => $line,
-                            'active' => 0,
-                            'page' => 0
+                                'uri' => $line,
+                                'active' => 0,
+                                'page' => 0
                         );
-                        $insert = Action::checkPageID($insert['uri'], $insert['page']);
+                        $insert = array_merge($insert, Action::checkPageID($insert['uri'], $insert['page']));
                         $isNew = $modRM->create($insert)->save();
 
                         $uri = $modRM->get('uri');
@@ -276,7 +276,7 @@ public static function csv()
                                 'active' => Template::getParam(3, $data, '1'),
                                 'uri' => iconv('windows-1251', 'UTF-8//IGNORE', Template::getParam(4, $data)),
                             );
-                            $insert = Action::checkPageID($insert['uri'], $insert['page']);
+                            $insert = array_merge($insert, Action::checkPageID($insert['uri'], $insert['page']));
                             $isNew = $modRM->create($insert)->save();
                             $uri = $modRM->get('uri');
                             $q = $modx->db->select('id', $modx->getFullTableName("redirect_map"), "`uri` = '" . $modx->db->escape($uri) . "'");

diff --git a/assets/snippets/DocLister/core/DocLister.abstract.php b/assets/snippets/DocLister/core/DocLister.abstract.php
@@ -29,7 +29,7 @@ abstract class DocLister
     /**
      * Текущая версия ядра DocLister
      */
-    const VERSION = '2.0.21';
+    const VERSION = '2.1.0';
 
     /**
      * Ключ в массиве $_REQUEST в котором находится алиас запрашиваемого документа

diff --git a/install/assets/snippets/DocLister.tpl b/install/assets/snippets/DocLister.tpl
@@ -5,7 +5,7 @@
  * Snippet to display the information of the tables by the description rules. The main goal - replacing Ditto and CatalogView
  *
  * @category 	snippet
- * @version 	2.0.21
+ * @version 	2.1.0
  * @license 	http://www.gnu.org/copyleft/gpl.html GNU Public License (GPL)
  * @internal	@properties
  * @internal	@modx_category Content