From 41ed1d7bec8897b8c2ea1eba446d6baafe4802b1 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Fri, 29 Jan 2021 15:01:26 +0900
Subject: [PATCH] Fix importer module not saving documents/comments with empty
 password fields

---
 modules/comment/queries/insertComment.xml      | 2 +-
 modules/comment/queries/updateComment.xml      | 2 +-
 modules/document/queries/insertDocument.xml    | 2 +-
 modules/document/queries/updateDocument.xml    | 2 +-
 modules/importer/importer.admin.controller.php | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/comment/queries/insertComment.xml b/modules/comment/queries/insertComment.xml
index 3277f9051..b3fcf9717 100644
--- a/modules/comment/queries/insertComment.xml
+++ b/modules/comment/queries/insertComment.xml
@@ -12,7 +12,7 @@
 		<column name="content" var="content" notnull="notnull" />
         <column name="voted_count" var="voted_count" default="0" />
         <column name="blamed_count" var="blamed_count" default="0" />
-		<column name="password" var="password" minlength="2" maxlength="60" />
+		<column name="password" var="password" maxlength="60" />
 		<column name="nick_name" var="nick_name" notnull="notnull" minlength="1" maxlength="40" />
 		<column name="user_id" var="user_id" default="" />
 		<column name="user_name" var="user_name" default="" />
diff --git a/modules/comment/queries/updateComment.xml b/modules/comment/queries/updateComment.xml
index 373fd25f7..357b8851b 100644
--- a/modules/comment/queries/updateComment.xml
+++ b/modules/comment/queries/updateComment.xml
@@ -9,7 +9,7 @@
 		<column name="is_secret" var="is_secret" default="N" />
         <column name="notify_message" var="notify_message" default="N" />
 		<column name="content" var="content" notnull="notnull" />
-		<column name="password" var="password" minlength="2" maxlength="60" />
+		<column name="password" var="password" maxlength="60" />
 		<column name="user_id" var="user_id" />
 		<column name="user_name" var="user_name" default="" />
 		<column name="nick_name" var="nick_name" notnull="notnull" minlength="1" maxlength="40" />
diff --git a/modules/document/queries/insertDocument.xml b/modules/document/queries/insertDocument.xml
index 31c586aad..862404274 100644
--- a/modules/document/queries/insertDocument.xml
+++ b/modules/document/queries/insertDocument.xml
@@ -18,7 +18,7 @@
         <column name="comment_count" var="comment_count" default="0" />
         <column name="trackback_count" var="trackback_count" default="0" />
         <column name="uploaded_count" var="uploaded_count" default="0" />
-        <column name="password" var="password" minlength="2" maxlength="60" />
+        <column name="password" var="password" maxlength="60" />
         <column name="nick_name" var="nick_name" notnull="notnull" minlength="1" maxlength="40" />
         <column name="member_srl" var="member_srl" default="0" filter="number" />
         <column name="user_id" var="user_id" default="" />
diff --git a/modules/document/queries/updateDocument.xml b/modules/document/queries/updateDocument.xml
index 46f7e0409..429c8584d 100644
--- a/modules/document/queries/updateDocument.xml
+++ b/modules/document/queries/updateDocument.xml
@@ -11,7 +11,7 @@
         <column name="title_color" var="title_color" default="N" />
         <column name="content" var="content" notnull="notnull" />
         <column name="uploaded_count" var="uploaded_count" default="0" />
-        <column name="password" var="password" minlength="2" maxlength="60" />
+        <column name="password" var="password" maxlength="60" />
         <column name="nick_name" var="nick_name" minlength="1" maxlength="40" />
         <column name="member_srl" var="member_srl" />
         <column name="user_id" var="user_id" />
diff --git a/modules/importer/importer.admin.controller.php b/modules/importer/importer.admin.controller.php
index 9628186d9..43ccafadb 100644
--- a/modules/importer/importer.admin.controller.php
+++ b/modules/importer/importer.admin.controller.php
@@ -765,7 +765,7 @@ class importerAdminController extends importer
 			$obj->readed_count = base64_decode($xmlDoc->post->readed_count->body);
 			$obj->voted_count = base64_decode($xmlDoc->post->voted_count->body);
 			$obj->blamed_count = base64_decode($xmlDoc->post->blamed_count->body);
-			$obj->password = base64_decode($xmlDoc->post->password->body);
+			$obj->password = base64_decode($xmlDoc->post->password->body) ?: null;
 			$obj->user_name = base64_decode($xmlDoc->post->user_name->body);
 			$obj->nick_name = base64_decode($xmlDoc->post->nick_name->body);
 			if(!$obj->user_name) $obj->user_name = $obj->nick_name;
@@ -974,7 +974,7 @@ class importerAdminController extends importer
 				$obj->content = base64_decode($xmlDoc->comment->content->body);
 				$obj->voted_count = base64_decode($xmlDoc->comment->voted_count->body);
 				$obj->blamed_count = base64_decode($xmlDoc->comment->blamed_count->body);
-				$obj->password = base64_decode($xmlDoc->comment->password->body);
+				$obj->password = base64_decode($xmlDoc->comment->password->body) ?: null;
 				$obj->user_name =base64_decode($xmlDoc->comment->user_name->body);
 				$obj->nick_name = base64_decode($xmlDoc->comment->nick_name->body);
 				if(!$obj->user_name) $obj->user_name = $obj->nick_name;