From 4261c92f616553a46ffe236f687eb74f9a1d96ee Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Mon, 13 Jan 2014 10:31:23 +0900
Subject: [PATCH 1/8] =?UTF-8?q?=EC=B5=9C=EC=8B=A0=EA=B8=80=20=ED=95=A8?=
 =?UTF-8?q?=EC=88=98=EC=97=90=20options=20=EB=B3=80=EC=88=98=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/latest.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/latest.lib.php b/lib/latest.lib.php
index 6786c4be1..71dad15bc 100644
--- a/lib/latest.lib.php
+++ b/lib/latest.lib.php
@@ -3,7 +3,7 @@ if (!defined('_GNUBOARD_')) exit;
 
 // 최신글 추출
 // $cache_time 캐시 갱신시간
-function latest($skin_dir='', $bo_table, $rows=10, $subject_len=40, $cache_time=1)
+function latest($skin_dir='', $bo_table, $rows=10, $subject_len=40, $cache_time=1, $options='')
 {
     global $g5;
     //static $css = array();

From 0cdaa1fd2d45bb6a965230281f86bfaa1adacf10 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Mon, 13 Jan 2014 10:31:48 +0900
Subject: [PATCH 2/8] =?UTF-8?q?=EC=8D=B8=EB=84=A4=EC=9D=BC=20=EC=9D=B4?=
 =?UTF-8?q?=EB=AF=B8=EC=A7=80=20=ED=92=88=EC=A7=88=20config.php=20?=
 =?UTF-8?q?=EC=97=90=EC=84=9C=20=EC=84=A4=EC=A0=95=ED=95=A0=20=EC=88=98=20?=
 =?UTF-8?q?=EC=9E=88=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config.php            | 3 +++
 lib/thumbnail.lib.php | 7 ++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/config.php b/config.php
index d4ad12e70..27820488d 100644
--- a/config.php
+++ b/config.php
@@ -156,4 +156,7 @@ define('G5_SMTP', '127.0.0.1');
 // 게시판에서 링크의 기본개수를 말합니다.
 // 필드를 추가하면 이 숫자를 필드수에 맞게 늘려주십시오.
 define('G5_LINK_COUNT', 2);
+
+// 썸네일 jpg Quality 설정
+define('G5_THUMB_JPG_QUALITY', 90);
 ?>
\ No newline at end of file
diff --git a/lib/thumbnail.lib.php b/lib/thumbnail.lib.php
index caf04acc1..3f71de35a 100644
--- a/lib/thumbnail.lib.php
+++ b/lib/thumbnail.lib.php
@@ -356,7 +356,12 @@ function thumbnail($filename, $source_path, $target_path, $thumb_width, $thumb_h
         UnsharpMask($dst, $val[0], $val[1], $val[2]);
     }
 
-    imagejpeg($dst, $thumb_file, 90);
+    if(!defined('G5_THUMB_JPG_QUALITY'))
+        $jpg_quality = 90;
+    else
+        $jpg_quality = G5_THUMB_JPG_QUALITY;
+
+    imagejpeg($dst, $thumb_file, $jpg_quality);
     chmod($thumb_file, G5_FILE_PERMISSION); // 추후 삭제를 위하여 파일모드 변경
 
     imagedestroy($src);

From 546da0d579c25a8c13e1527afe03d8a3cd39a8b1 Mon Sep 17 00:00:00 2001
From: gnuboard <kagla@naver.com>
Date: Tue, 14 Jan 2014 09:39:01 +0900
Subject: [PATCH 3/8] =?UTF-8?q?.htaccess=20=EB=A5=BC=20push=20=ED=95=98?=
 =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EB=8F=84=EB=A1=9D=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index be427cb2e..96ca0ceec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 !.gitignore
+.htaccess
 data/
 test/
 sirgle/

From 963d43a33605f287d236105df87236d06f6d9548 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Tue, 14 Jan 2014 17:17:30 +0900
Subject: [PATCH 4/8] =?UTF-8?q?index=20=ED=8E=98=EC=9D=B4=EC=A7=80?=
 =?UTF-8?q?=EC=9D=98=20=EC=B5=9C=EC=8B=A0=EA=B8=80=20=EC=B6=9C=EB=A0=A5?=
 =?UTF-8?q?=EC=88=9C=EC=84=9C=20=EB=8F=99=EC=9D=BC=ED=95=98=EB=8F=84?=
 =?UTF-8?q?=EB=A1=9D=20=EC=BF=BC=EB=A6=AC=EB=AC=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mobile/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/index.php b/mobile/index.php
index 2359ac1ee..514a3223e 100644
--- a/mobile/index.php
+++ b/mobile/index.php
@@ -7,7 +7,7 @@ include_once(G5_MOBILE_PATH.'/_head.php');
 <!-- 메인화면 최신글 시작 -->
 <?php
 //  최신글
-$sql = " select bo_table from {$g5['board_table']} where bo_device <> 'pc' order by gr_id, bo_table ";
+$sql = " select bo_table from `{$g5['board_table']}` a left join `{$g5['group_table']}` b on (a.gr_id=b.gr_id)  where a.bo_device <> 'pc' order by b.gr_order, a.bo_order ";
 $result = sql_query($sql);
 for ($i=0; $row=sql_fetch_array($result); $i++) {
     // 이 함수가 바로 최신글을 추출하는 역할을 합니다.

From 6c6785442d91265dc2417eb5b4d66d718d000e36 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Wed, 15 Jan 2014 09:42:34 +0900
Subject: [PATCH 5/8] =?UTF-8?q?check=5Fdemo=20=ED=95=A8=EC=88=98=20G5=20?=
 =?UTF-8?q?=ED=99=98=EA=B2=BD=EC=97=90=20=EB=A7=9E=EA=B2=8C=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/common.lib.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/common.lib.php b/lib/common.lib.php
index a0f877cd7..459d829a0 100644
--- a/lib/common.lib.php
+++ b/lib/common.lib.php
@@ -1662,8 +1662,8 @@ function time_select($time, $name="")
 // DEMO 라는 파일이 있으면 데모 화면으로 인식함
 function check_demo()
 {
-    global $g5;
-    if (file_exists($g5['path'].'/DEMO'))
+    global $is_admin;
+    if (file_exists(G5_PATH.'/DEMO'))
         alert('데모 화면에서는 하실(보실) 수 없는 작업입니다.');
 }
 

From d7009ba6f3d08ba14c337e7df0f7cc914213ed76 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Wed, 15 Jan 2014 10:44:45 +0900
Subject: [PATCH 6/8] =?UTF-8?q?=EC=B5=9C=EA=B3=A0=EA=B4=80=EB=A6=AC?=
 =?UTF-8?q?=EC=9E=90=EB=8A=94=20DEMO=20=EC=B2=B4=ED=81=AC=ED=95=98?=
 =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/common.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/common.lib.php b/lib/common.lib.php
index 459d829a0..23c322b23 100644
--- a/lib/common.lib.php
+++ b/lib/common.lib.php
@@ -1663,7 +1663,7 @@ function time_select($time, $name="")
 function check_demo()
 {
     global $is_admin;
-    if (file_exists(G5_PATH.'/DEMO'))
+    if ($is_admin != 'super' && file_exists(G5_PATH.'/DEMO'))
         alert('데모 화면에서는 하실(보실) 수 없는 작업입니다.');
 }
 

From 559d9b573cc997fa5dc1b73a077c25eb8d65ada1 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Wed, 15 Jan 2014 11:42:54 +0900
Subject: [PATCH 7/8] =?UTF-8?q?=EA=B7=B8=EB=A3=B9=EA=B4=80=EB=A6=AC?=
 =?UTF-8?q?=EC=9E=90=EB=A1=9C=20=EA=B2=8C=EC=8B=9C=ED=8C=90=20=EA=B7=B8?=
 =?UTF-8?q?=EB=A3=B9=EC=84=A4=EC=A0=95=EC=97=90=20=EC=A0=91=EC=86=8D?=
 =?UTF-8?q?=ED=96=88=EC=9D=84=20=EB=95=8C=20=ED=99=94=EB=A9=B4=20=EB=A7=88?=
 =?UTF-8?q?=ED=81=AC=EC=97=85=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/boardgroup_list.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/adm/boardgroup_list.php b/adm/boardgroup_list.php
index 4b735294c..ff14489dd 100644
--- a/adm/boardgroup_list.php
+++ b/adm/boardgroup_list.php
@@ -101,7 +101,7 @@ $colspan = 11;
         </th>
         <th scope="col"><?php echo subject_sort_link('gr_id') ?>그룹아이디</a></th>
         <th scope="col"><?php echo subject_sort_link('gr_subject') ?>제목</a></th>
-        <?php if ($is_admin == 'super'){ ?><th scope="col"><?php echo subject_sort_link('gr_admin') ?>그룹관리자</a></th><?php } ?>
+        <th scope="col"><?php echo subject_sort_link('gr_admin') ?>그룹관리자</a></th>
         <th scope="col">게시판</th>
         <th scope="col">접근<br>사용</th>
         <th scope="col">접근<br>회원수</th>
@@ -144,7 +144,7 @@ $colspan = 11;
             <label for="gr_admin_<?php echo $i; ?>" class="sound_only">그룹관리자</label>
             <input type="text" name="gr_admin[<?php echo $i ?>]" value="<?php echo $row['gr_admin'] ?>" id="gr_admin_<?php echo $i ?>" class="frm_input" size="10" maxlength="20">
         <?php }else{ ?>
-            <input type="hidden" name="gr_admin[<?php echo $i ?>]" value="<?php echo $row['gr_admin'] ?>"><td><?php echo $row['gr_admin'] ?>
+            <input type="hidden" name="gr_admin[<?php echo $i ?>]" value="<?php echo $row['gr_admin'] ?>"><?php echo $row['gr_admin'] ?>
         <?php } ?>
         </td>
         <td class="td_numsmall"><a href="./board_list.php?sfl=a.gr_id&amp;stx=<?php echo $row['gr_id'] ?>"><?php echo $row2['cnt'] ?></a></td>

From a502508d7329c3ffd06e043b2f7ac1c792d6a936 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Fri, 17 Jan 2014 09:43:58 +0900
Subject: [PATCH 8/8] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90=20=EB=A9=94?=
 =?UTF-8?q?=ED=83=80=ED=83=9C=EA=B7=B8=20=EC=84=A4=EC=A0=95=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/config_form.php        | 12 ++++++++++++
 adm/config_form_update.php |  1 +
 head.sub.php               |  3 +++
 install/gnuboard5.sql      |  1 +
 4 files changed, 17 insertions(+)

diff --git a/adm/config_form.php b/adm/config_form.php
index 3df62ab63..125032e68 100644
--- a/adm/config_form.php
+++ b/adm/config_form.php
@@ -120,6 +120,11 @@ if(!isset($config['cf_analytics'])) {
                     ADD `cf_analytics` TEXT NOT NULL AFTER `cf_intercept_ip` ", true);
 }
 
+if(!isset($config['cf_add_meta'])) {
+    sql_query(" ALTER TABLE `{$g5['config_table']}`
+                    ADD `cf_add_meta` TEXT NOT NULL AFTER `cf_analytics` ", true);
+}
+
 if(!isset($config['cf_sms_use'])) {
     sql_query(" ALTER TABLE `{$g5['config_table']}`
                     ADD `cf_sms_use` varchar(255) NOT NULL DEFAULT '' AFTER `cf_cert_limit`,
@@ -418,6 +423,13 @@ if ($config['cf_icode_id'] && $config['cf_icode_pw']) {
                 <textarea name="cf_analytics" id="cf_analytics"><?php echo $config['cf_analytics']; ?></textarea>
             </td>
         </tr>
+        <tr>
+            <th scope="row"><label for="cf_add_meta">추가 메타태그</label></th>
+            <td colspan="3">
+                <?php echo help('추가로 사용하실 meta 태그를 입력합니다.'); ?>
+                <textarea name="cf_add_meta" id="cf_add_meta"><?php echo $config['cf_add_meta']; ?></textarea>
+            </td>
+        </tr>
         </tbody>
         </table>
     </div>
diff --git a/adm/config_form_update.php b/adm/config_form_update.php
index e5be0a956..0a2682508 100644
--- a/adm/config_form_update.php
+++ b/adm/config_form_update.php
@@ -53,6 +53,7 @@ $sql = " update {$g5['config_table']}
                 cf_possible_ip = '".trim($_POST['cf_possible_ip'])."',
                 cf_intercept_ip = '".trim($_POST['cf_intercept_ip'])."',
                 cf_analytics = '{$_POST['cf_analytics']}',
+                cf_add_meta = '{$_POST['cf_add_meta']}',
                 cf_member_skin = '{$_POST['cf_member_skin']}',
                 cf_use_homepage = '{$_POST['cf_use_homepage']}',
                 cf_req_homepage = '{$_POST['cf_req_homepage']}',
diff --git a/head.sub.php b/head.sub.php
index b1988fe05..e1a2942e2 100644
--- a/head.sub.php
+++ b/head.sub.php
@@ -41,6 +41,9 @@ if (G5_IS_MOBILE) {
     echo '<meta http-equiv="imagetoolbar" content="no">'.PHP_EOL;
     echo '<meta http-equiv="X-UA-Compatible" content="IE=10,chrome=1">'.PHP_EOL;
 }
+
+if($config['cf_add_meta'])
+    echo $config['cf_add_meta'].PHP_EOL;
 ?>
 <title><?php echo $g5_head_title; ?></title>
 <?php
diff --git a/install/gnuboard5.sql b/install/gnuboard5.sql
index 4fd0372c6..dbfcb56a5 100644
--- a/install/gnuboard5.sql
+++ b/install/gnuboard5.sql
@@ -222,6 +222,7 @@ CREATE TABLE IF NOT EXISTS `g5_config` (
   `cf_possible_ip` text NOT NULL,
   `cf_intercept_ip` text NOT NULL,
   `cf_analytics` text NOT NULL,
+  `cf_add_meta` text NOT NULL,
   `cf_register_skin` varchar(255) NOT NULL DEFAULT 'basic',
   `cf_member_skin` varchar(255) NOT NULL DEFAULT '',
   `cf_use_homepage` tinyint(4) NOT NULL DEFAULT '0',