Merge branch 'g4s'

adm/board_form.php

@@ -73,6 +73,10 @@ if (!isset($board['bo_use_list_file'])) {
     }
 }
 
+if (!isset($board['bo_mobile_subject'])) {
+    sql_query(" ALTER TABLE `{$g4['board_table']}` ADD `bo_mobile_subject` VARCHAR(255) NOT NULL DEFAULT '' AFTER `bo_subject` ", false);
+}
+
 $required = "";
 $readonly = "";
 if ($w == '') {
@@ -195,6 +199,13 @@ $pg_anchor = '<ul class="anchor">
             <input type="text" name="bo_subject" value="<?php echo get_text($board['bo_subject']) ?>" id="bo_subject" required class="required frm_input" size="80" maxlength="120">
         </td>
     </tr>
+    <tr>
+        <th scope="row"><label for="bo_mobile_subject">모바일 게시판 제목</label></th>
+        <td colspan="2">
+            <?php echo help("모바일에서 보여지는 게시판 제목이 다른 경우에 입력합니다. 입력이 없으면 기본 게시판 제목이 출력됩니다.") ?>
+            <input type="text" name="bo_mobile_subject" value="<?php echo get_text($board['bo_mobile_subject']) ?>" id="bo_mobile_subject" class="frm_input" maxlength="120">
+        </td>
+    </tr>
     <tr>
         <th scope="row"><label for="bo_device">접속기기</label></th>
         <td>

adm/board_form_update.php

@@ -44,6 +44,7 @@ $bo_category_list = str_replace($src_char, $dst_char, $bo_category_list);
 
 $sql_common = " gr_id               = '{$_POST['gr_id']}',
                 bo_subject          = '{$_POST['bo_subject']}',
+                bo_mobile_subject   = '{$_POST['bo_mobile_subject']}',
                 bo_device           = '{$_POST['bo_device']}',
                 bo_admin            = '{$_POST['bo_admin']}',
                 bo_list_level       = '{$_POST['bo_list_level']}',

install/gnuboard4s.sql

@@ -632,7 +632,7 @@ CREATE TABLE IF NOT EXISTS `g4s_visit_sum` (
 -- Table structure for table `g4s_unique`
 --
 
-DROP TABLE IF EXISTS `g4s_unique`;
+DROP TABLE IF EXISTS `g4s_uniqid`;
 CREATE TABLE IF NOT EXISTS `g4s_uniqid` (
   `uq_id` bigint(20) unsigned NOT NULL,
   `uq_ip` varchar(255) NOT NULL,

mobile/head.php

@@ -88,8 +88,12 @@ include_once(G4_LIB_PATH.'/popular.lib.php');
         $sql2 .= " order by bo_order ";
         $result2 = sql_query($sql2);
         for ($bi=0; $row2=sql_fetch_array($result2); $bi++) { // bi 는 board index
+            $bo_subject = $row2['bo_subject'];
+            if (G4_IS_MOBILE && $row2['bo_mobile_subject']) {
+                $bo_subject = $row2['bo_mobile_subject'];
+            }
         ?>
-        <li><a href="<?php echo G4_BBS_URL ?>/board.php?bo_table=<?php echo $row2['bo_table'] ?>"><?php echo $row2['bo_subject'] ?></a></li>
+        <li><a href="<?php echo G4_BBS_URL ?>/board.php?bo_table=<?php echo $row2['bo_table'] ?>"><?php echo $bo_subject; ?></a></li>
         <?php } ?>
     </ul>
 </nav>