bug fix

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@4892 201d5d3c-b55e-5fd7-737f-ddc643e51545

modules/board/skins/xe_default/filter/insert.xml

@@ -4,7 +4,7 @@
     <node target="password" required="true" />
     <node target="email_address" maxlength="250" />
     <node target="homepage" maxlength="250"/>
-    <node target="title" required="true" minlength="1" maxlength="250" />
+    <node target="title" required="true" maxlength="250" />
     <node target="content" required="true" />
   </form>
   <response callback_func="completeDocumentInserted">

modules/document/queries/updateDocument.xml

@@ -7,7 +7,7 @@
         <column name="category_srl" var="category_srl" filter="number" default="0" />
         <column name="is_notice" var="is_notice" notnull="notnull" default="N" />
         <column name="is_secret" var="is_secret" notnull="notnull" default="N" />
-        <column name="title" var="title" notnull="notnull" minlength="2" maxlength="250" />
+        <column name="title" var="title" notnull="notnull" minlength="1" maxlength="250" />
         <column name="title_bold" var="title_bold" default="N" />
         <column name="title_color" var="title_color" default="N" />
         <column name="content" var="content" notnull="notnull" />

modules/editor/tpl/js/editor.js

@@ -425,7 +425,7 @@ function editorChangeMode(mode, editor_sequence) {
     // html 편집 사용시
     if(mode == 'html' && textarea_obj) {
         preview_obj.style.display='none';
-        xGetElementById('fileUploader_'+editor_sequence).style.display='block';
+        if(xGetElementById('fileUploader_'+editor_sequence)) xGetElementById('fileUploader_'+editor_sequence).style.display='block';
         textarea_obj.value = html;
         xWidth(textarea_obj, xWidth(iframe_obj.parentNode));
         xHeight(textarea_obj, xHeight(iframe_obj.parentNode));
@@ -440,7 +440,7 @@ function editorChangeMode(mode, editor_sequence) {
     // 미리보기
     } else if(mode == 'preview' && preview_obj) {
         preview_obj.style.display='';
-        xGetElementById('fileUploader_'+editor_sequence).style.display='none';
+        if(xGetElementById('fileUploader_'+editor_sequence)) xGetElementById('fileUploader_'+editor_sequence).style.display='none';
 
         var fo_obj = xGetElementById("preview_form");
         if(!fo_obj) {
@@ -461,12 +461,12 @@ function editorChangeMode(mode, editor_sequence) {
             xGetElementById('xeEditor_'+editor_sequence).className = 'xeEditor preview';
             xGetElementById('use_rich_'+editor_sequence).className = '';
             xGetElementById('preview_html_'+editor_sequence).className = 'active';
-            xGetElementById('use_html_'+editor_sequence).className = '';
+            if(xGetElementById('use_html_'+editor_sequence)) xGetElementById('use_html_'+editor_sequence).className = '';
         }
     // 위지윅 모드 사용시
     } else {
         preview_obj.style.display='none';
-        xGetElementById('fileUploader_'+editor_sequence).style.display='block';
+        if(xGetElementById('fileUploader_'+editor_sequence)) xGetElementById('fileUploader_'+editor_sequence).style.display='block';
         contentDocument.body.innerHTML = html;
         editorMode[editor_sequence] = null;
 
@@ -474,7 +474,7 @@ function editorChangeMode(mode, editor_sequence) {
             xGetElementById('xeEditor_'+editor_sequence).className = 'xeEditor rich';
             xGetElementById('use_rich_'+editor_sequence).className = 'active';
             xGetElementById('preview_html_'+editor_sequence).className = '';
-            xGetElementById('use_html_'+editor_sequence).className = '';
+            if(xGetElementById('use_html_'+editor_sequence)) xGetElementById('use_html_'+editor_sequence).className = '';
         }
     }
 
@@ -520,7 +520,7 @@ function showEditorExtension(e,editor_sequence){
 
 function showPreviewContent(ret_obj,response_tags, params, fo_obj) {
     var preview_obj = editorGetPreviewArea(params.editor_sequence);
-    xGetElementById('fileUploader_'+params.editor_sequence).style.display='none';
+    if(xGetElementById('fileUploader_'+editor_sequence)) xGetElementById('fileUploader_'+params.editor_sequence).style.display='none';
 //  alert(ret_obj.content);
     xInnerHtml(preview_obj, ret_obj.content);
 }

modules/member/tpl/insert_member.html

@@ -45,7 +45,7 @@
     <tr class="row2">
         <th scope="row"><div>{$lang->password}</div></th>
         <td>
-            <input type="password" name="password" value="" class="inputTypeText" />
+            <input type="text" name="password" value="" class="inputTypeText" />
         </td>
     </tr>
     <tr>

modules/module/lang/ko.lang.php

@@ -45,6 +45,7 @@
     $lang->msg_no_checked_document = '선택된 게시물이 없습니다';
     $lang->msg_move_failed = '이동 실패하였습니다';
     $lang->msg_cannot_delete_for_child = '하부 분류가  있는 분류는 삭제하실 수 없습니다';
+    $lang->msg_limit_mid ="모듈이름은 영문+[영문+숫자+_] 만 가능합니다.";
 
     $lang->about_browser_title = "브라우저의 제목에 나타나는 값입니다. RSS/Trackback에서도 사용됩니다.";
     $lang->about_mid = "모듈이름은 http://주소/?mid=모듈이름 처럼 직접 호출할 수 있는 값입니다. ( 영문+[영문+숫자+_] 만 가능)";

modules/module/module.admin.controller.php

@@ -75,6 +75,7 @@
             $args = Context::getAll();
             for($i=1;$i<=10;$i++) {
                 $mid = $args->{"mid_".$i};
+                if(!ereg("^[a-zA-Z][a-zA-Z0-9_]+", $mid)) return new Object(-1, 'msg_limit_mid');
                 $browser_title = $args->{"browser_title_".$i};
                 if(!$mid) continue;
                 if($mid && !$browser_title) $browser_title = $mid;

modules/module/module.controller.php

@@ -133,6 +133,8 @@
          * @brief 모듈 입력
          **/
         function insertModule($args) {
+            if(!ereg("^[a-zA-Z][a-zA-Z0-9_]+", $args->mid)) return new Object(-1, 'msg_limit_mid');
+
             // begin transaction
             $oDB = &DB::getInstance();
             $oDB->begin();

modules/module/tpl/filter/copy_module.xml

@@ -1,6 +1,16 @@
 <filter name="copy_module" module="module" act="procModuleAdminCopyModule">
     <form>
         <node target="module_srl" required="true" />
+        <node target="mid_1" filter="alpha_number" />
+        <node target="mid_2" filter="alpha_number" />
+        <node target="mid_3" filter="alpha_number" />
+        <node target="mid_4" filter="alpha_number" />
+        <node target="mid_5" filter="alpha_number" />
+        <node target="mid_6" filter="alpha_number" />
+        <node target="mid_7" filter="alpha_number" />
+        <node target="mid_8" filter="alpha_number" />
+        <node target="mid_9" filter="alpha_number" />
+        <node target="mid_10" filter="alpha_number" />
     </form>
     <response callback_func="completeCopyModule">
         <tag name="error" />