Merge branch 'master' of github.com:gnuboard/g5

bbs/move_update.php

@@ -42,8 +42,17 @@ while ($row = sql_fetch_array($result))
         while ($row2 = sql_fetch_array($result2))
         {
             $nick = cut_str($member['mb_nick'], $config['cf_cut_name']);
-            if (!$row2['wr_is_comment'] && $config['cf_use_copy_log'])
+            if (!$row2['wr_is_comment'] && $config['cf_use_copy_log']) {
-                $row2['wr_content'] .= "\n".'<div class="content_'.$sw.'">[이 게시물은 '.$nick.'님에 의해 '.G5_TIME_YMDHIS.' '.$board['bo_subject'].'에서 '.($sw == 'copy' ? '복사' : '이동').' 됨]</div>';
+                if(strstr($row2['wr_option'], 'html')) {
+                    $log_tag1 = '<div class="content_'.$sw.'">';
+                    $log_tag2 = '</div>';
+                } else {
+                    $log_tag1 = "\n";
+                    $log_tag2 = '';
+                }
+
+                $row2['wr_content'] .= "\n".$log_tag1.'[이 게시물은 '.$nick.'님에 의해 '.G5_TIME_YMDHIS.' '.$board['bo_subject'].'에서 '.($sw == 'copy' ? '복사' : '이동').' 됨]'.$log_tag2;
+            }
 
             $sql = " insert into $move_write_table
                         set wr_num = '$next_wr_num',

mobile/skin/board/basic/write.skin.php

@@ -6,7 +6,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 
 <h1 id="wrapper_title"><?php echo $g5['title'] ?></h1>
 
-<form name="fwrite" id="fwrite" action="<?php echo $action_url ?>" onsubmit="return fwrite_submit(this);" method="post" enctype="multipart/form-data" autocomplete="off" style="width:<?php echo $width; ?>">
+<form name="fwrite" id="fwrite" action="<?php echo $action_url ?>" onsubmit="return fwrite_submit(this);" method="post" enctype="multipart/form-data" autocomplete="off">
 <input type="hidden" name="w" value="<?php echo $w ?>">
 <input type="hidden" name="bo_table" value="<?php echo $bo_table ?>">
 <input type="hidden" name="wr_id" value="<?php echo $wr_id ?>">
@@ -49,8 +49,8 @@ if ($is_notice || $is_html || $is_secret || $is_mail) {
 
 echo $option_hidden;
 ?>
-
+<div id="bo_w">
-<table id="bo_w" class="frm_tbl">
+    <table class="frm_tbl">
     <tbody>
     <?php if ($is_name) { ?>
     <tr>
@@ -152,6 +152,7 @@ echo $option_hidden;
 
     </tbody>
     </table>
+</div>
 
 <div class="btn_confirm">
     <p>

mobile/skin/board/gallery/write.skin.php

@@ -6,7 +6,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 
 <h1 id="wrapper_title"><?php echo $g5['title'] ?></h1>
 
-<form name="fwrite" id="fwrite" action="<?php echo $action_url ?>" onsubmit="return fwrite_submit(this);" method="post" enctype="multipart/form-data" autocomplete="off" style="width:<?php echo $width; ?>">
+<form name="fwrite" id="fwrite" action="<?php echo $action_url ?>" onsubmit="return fwrite_submit(this);" method="post" enctype="multipart/form-data" autocomplete="off">
 <input type="hidden" name="w" value="<?php echo $w ?>">
 <input type="hidden" name="bo_table" value="<?php echo $bo_table ?>">
 <input type="hidden" name="wr_id" value="<?php echo $wr_id ?>">
@@ -49,8 +49,8 @@ if ($is_notice || $is_html || $is_secret || $is_mail) {
 
 echo $option_hidden;
 ?>
-
+<div id="bo_w">
-<table id="bo_w" class="frm_tbl">
+    <table class="frm_tbl">
     <tbody>
     <?php if ($is_name) { ?>
     <tr>
@@ -91,7 +91,7 @@ echo $option_hidden;
     <tr>
         <th scope="row"><label for="ca_name">분류<strong class="sound_only">필수</strong></label></th>
         <td>
-        <select name="ca_name" id="ca_name" required class="required">
+            <select class="required" id="ca_name" name="ca_name" required>
                 <option value="">선택하세요</option>
                 <?php echo $category_option ?>
             </select>
@@ -135,7 +135,7 @@ echo $option_hidden;
             <input type="text" name="bf_content[]" value="<?php echo $file[$i]['bf_content']; ?>" title="파일 설명을 입력해주세요." class="frm_file frm_input" size="50">
             <?php } ?>
             <?php if($w == 'u' && $file[$i]['file']) { ?>
-        <input type="checkbox" name="bf_file_del[<?php echo $i; ?>]" value="1" id="bf_file_del<?php echo $i ?>"> <label for="bf_file_del<?php echo $i ?>"><?php echo $file[$i]['source'].'('.$file[$i]['size'].')'; ?> 파일 삭제</label>
+            <input type="checkbox" id="bf_file_del<?php echo $i ?>" name="bf_file_del[<?php echo $i; ?>]" value="1"> <label for="bf_file_del<?php echo $i ?>"><?php echo $file[$i]['source'].'('.$file[$i]['size'].')'; ?> 파일 삭제</label>
             <?php } ?>
         </td>
     </tr>
@@ -152,12 +152,13 @@ echo $option_hidden;
 
     </tbody>
     </table>
+</div>
 
 <div class="btn_confirm">
     <p>
         작성하신 내용을 제출하시려면 <strong>글쓰기</strong> 버튼을, 작성을 취소하고 목록으로 돌아가시려면 <strong>취소</strong> 링크를 누르세요.
     </p>
-    <input type="submit" value="글쓰기" id="btn_submit" accesskey="s" class="btn_submit">
+    <input type="submit" value="글쓰기" id="btn_submit" class="btn_submit" accesskey="s">
     <a href="./board.php?bo_table=<?php echo $bo_table ?>" class="btn_cancel">취소</a>
 </div>
 </form>