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

adm/mail_select_list.php

@@ -94,7 +94,7 @@ include_once('./admin.head.php');
     while ($row=sql_fetch_array($result)) {
         $i++;
         $ma_list .= $cr . $row['mb_email'] . "||" . $row['mb_id'] . "||" . $row['mb_name'] . "||" . $row['mb_nick'] . "||" . $row['mb_datetime'];
-        $cr = chr(30);
+        $cr = "\n";
 
         $bg = 'bg'.($i%2);
     ?>

adm/mail_select_update.php

@@ -36,7 +36,7 @@ $ma_id = trim($_POST['ma_id']);
 $select_member_list = trim($_POST['ma_list']);
 
 //print_r2($_POST); EXIT;
-$member_list = explode(chr(30), $select_member_list);
+$member_list = explode("\n", conv_unescape_nl($select_member_list));
 
 // 메일내용 가져오기
 $sql = "select ma_subject, ma_content from {$g5['mail_table']} where ma_id = '$ma_id' ";

adm/menu_form.php

@@ -9,7 +9,7 @@ $g5['title'] = '메뉴 추가';
 include_once(G5_PATH.'/head.sub.php');
 
 // 코드
-if($new == 'new' || $code == 0) {
+if($new == 'new' || !$code) {
     $code = base_convert(substr($code,0, 2), 36, 10);
     $code += 36;
     $code = base_convert($code, 10, 36);
@@ -71,7 +71,12 @@ function add_menu_list(name, link, code)
 {
     var $menulist = $("#menulist", opener.document);
     var ms = new Date().getTime();
-    var sub_menu_class = "";
+    var sub_menu_class;
+    <?php if($new == 'new') { ?>
+    sub_menu_class = " class=\"td_category\"";
+    <?php } else { ?>
+    sub_menu_class = " class=\"td_category sub_menu_class\"";
+    <?php } ?>
 
     var list = "<tr class=\"menu_list menu_group_<?php echo $code; ?>\">\n";
     list += "<td"+sub_menu_class+">\n";

adm/menu_form_search.php

@@ -56,7 +56,7 @@ if($sql) {
                 $link = G5_BBS_URL.'/content.php?co_id='.$row['id'];
                 break;
             default:
-                $link = ''; 
+                $link = '';
                 break;
         }
 ?>
@@ -64,7 +64,7 @@ if($sql) {
     <tr>
         <td><?php echo $row['subject']; ?></td>
         <td class="td_mngsmall">
-            <input type="hidden" name="subject[]" value="<?php preg_replace('/[\'\"]/', '', $row['subject']); ?>">
+            <input type="hidden" name="subject[]" value="<?php echo preg_replace('/[\'\"]/', '', $row['subject']); ?>">
             <input type="hidden" name="link[]" value="<?php echo $link; ?>">
             <button type="button" class="add_select"><span class="sound_only"><?php echo $row['subject']; ?> </span>선택</button>
         </td>

lib/common.lib.php

@@ -2615,4 +2615,13 @@ function conv_date_format($format, $date, $add='')
 
     return date($format, $timestamp);
 }
+
+// unescape nl 얻기
+function conv_unescape_nl($str)
+{
+    $search = array('\\r', '\r', '\\n', '\n');
+    $replace = array('', '', "\n", "\n");
+
+    return str_replace($search, $replace, $str);
+}
 ?>