From defd0bd38aea45bf5d19cb8fd946ed283f4a60ca Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Tue, 4 Mar 2014 17:40:16 +0900
Subject: [PATCH 1/5] =?UTF-8?q?escape=5Ftrim=20=ED=95=A8=EC=88=98=EC=97=90?=
 =?UTF-8?q?=EC=84=9C=20G5=5FESCAPE=5FFUNCTION=20=EC=84=A4=EC=A0=95?=
 =?UTF-8?q?=EC=82=AC=EC=9A=A9=ED=95=98=EB=8F=84=EB=A1=9D=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 | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/lib/common.lib.php b/lib/common.lib.php
index de725408f..e36816502 100644
--- a/lib/common.lib.php
+++ b/lib/common.lib.php
@@ -1883,10 +1883,7 @@ function convert_charset($from_charset, $to_charset, $str)
 function escape_trim($field)
 {
     if ($field) {
-        $str = mysql_real_escape_string(@trim($field));
-
-        //if(PHP_VERSION < '5.3.0')
-        //    $str = stripslashes($str);
+        $str = call_user_func(G5_ESCAPE_FUNCTION, $field);
 
         return $str;
     }

From cc7e1a4b2fdc2740d17a9e4e167414348795987d Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Thu, 6 Mar 2014 15:23:35 +0900
Subject: [PATCH 2/5] =?UTF-8?q?=ED=95=84=EC=88=98=20=EB=AA=A8=EB=93=88=20?=
 =?UTF-8?q?=EC=B2=B4=ED=81=AC=20=ED=9B=84=20=EC=95=8C=EB=A6=BC=20=EB=B0=A9?=
 =?UTF-8?q?=EB=B2=95=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 install/index.php         |  3 ++-
 install/library.check.php | 13 ++++---------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/install/index.php b/install/index.php
index 273d6716c..056b399c0 100644
--- a/install/index.php
+++ b/install/index.php
@@ -1,12 +1,13 @@
 <?php
 include_once ('../config.php');
 $title = G5_VERSION." 라이센스 확인 1/3";
-require_once('./library.check.php');
 include_once ('./install.inc.php');
 ?>
 
 <?php
 if ($exists_data_dir && $write_data_dir) {
+    // 필수 모듈 체크
+    require_once('./library.check.php');
 ?>
 <form action="./install_config.php" method="post" onsubmit="return frm_submit(this);">
 
diff --git a/install/library.check.php b/install/library.check.php
index 08889cc50..c01d9643e 100644
--- a/install/library.check.php
+++ b/install/library.check.php
@@ -1,14 +1,9 @@
 <?php
 if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 
-function die_utf8($msg)
-{
-    if(!trim($msg))
-        return;
-
-    die('<meta charset="utf-8"><p>'.$msg.'</p>');
+if(!extension_loaded('gd') || !function_exists('gd_info')) {
+    echo '<script>'.PHP_EOL;
+    echo 'alert("'.G5_VERSION.'의 정상적인 사용을 위해서는 GD 라이브러리가 필요합니다.\nGD 라이브러리가 없을 경우 자동등록방지 문자와 썸네일 기능이 작동하지 않습니다.");'.PHP_EOL;
+    echo '</script>'.PHP_EOL;
 }
-
-if(!extension_loaded('gd') || !function_exists('gd_info'))
-    die('GD 라이브러리를 설치하신 후 '.G5_VERSION.' 설치를 진행해 주십시오.');
 ?>
\ No newline at end of file

From 94822deddc0292f3b92775d0e86d9180af467928 Mon Sep 17 00:00:00 2001
From: whitedot <whitedot@naver.com>
Date: Thu, 6 Mar 2014 18:31:35 +0900
Subject: [PATCH 3/5] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20gnb=20z-inde?=
 =?UTF-8?q?x=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 head.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/head.php b/head.php
index a9a14d967..bce43194a 100644
--- a/head.php
+++ b/head.php
@@ -122,7 +122,9 @@ if (G5_IS_MOBILE) {
                     <?php
                     $sql2 = " select * from {$g5['board_table']} where gr_id = '{$row['gr_id']}' and bo_show_menu = '1' and bo_device <> 'mobile' order by bo_order ";
                     $result2 = sql_query($sql2);
-                    for ($bi=0; $row2=sql_fetch_array($result2); $bi++) { // bi 는 board index
+                    $gnb_zindex = 999; // gnb_1dli z-index 값 설정용
+                    for ($gi=0; $row=sql_fetch_array($result); $gi++) { // gi 는 group index
+                        $gnb_zindex -= 1; // html 구조에서 앞선 gnb_1dli 에 더 높은 z-index 값 부여
                      ?>
                     <li class="gnb_2dli"><a href="<?php echo G5_BBS_URL ?>/board.php?bo_table=<?php echo $row2['bo_table'] ?>" class="gnb_2da"><?php echo $row2['bo_subject'] ?></a></li>
                     <?php } ?>

From ebb6a1c63a53c4ecbaf8a0b67794b7d8eefe078f Mon Sep 17 00:00:00 2001
From: whitedot <whitedot@naver.com>
Date: Thu, 6 Mar 2014 18:34:53 +0900
Subject: [PATCH 4/5] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20gnb=20z-inde?=
 =?UTF-8?q?x=20=EC=B6=94=EA=B0=802?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 head.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/head.php b/head.php
index bce43194a..e0600fd7f 100644
--- a/head.php
+++ b/head.php
@@ -114,7 +114,9 @@ if (G5_IS_MOBILE) {
             <?php
             $sql = " select * from {$g5['group_table']} where gr_show_menu = '1' and gr_device <> 'mobile' order by gr_order ";
             $result = sql_query($sql);
+            $gnb_zindex = 999; // gnb_1dli z-index 값 설정용
             for ($gi=0; $row=sql_fetch_array($result); $gi++) { // gi 는 group index
+                $gnb_zindex -= 1; // html 구조에서 앞선 gnb_1dli 에 더 높은 z-index 값 부여
              ?>
             <li class="gnb_1dli">
                 <a href="<?php echo G5_BBS_URL ?>/group.php?gr_id=<?php echo $row['gr_id'] ?>" class="gnb_1da"><?php echo $row['gr_subject'] ?></a>
@@ -122,9 +124,7 @@ if (G5_IS_MOBILE) {
                     <?php
                     $sql2 = " select * from {$g5['board_table']} where gr_id = '{$row['gr_id']}' and bo_show_menu = '1' and bo_device <> 'mobile' order by bo_order ";
                     $result2 = sql_query($sql2);
-                    $gnb_zindex = 999; // gnb_1dli z-index 값 설정용
                     for ($gi=0; $row=sql_fetch_array($result); $gi++) { // gi 는 group index
-                        $gnb_zindex -= 1; // html 구조에서 앞선 gnb_1dli 에 더 높은 z-index 값 부여
                      ?>
                     <li class="gnb_2dli"><a href="<?php echo G5_BBS_URL ?>/board.php?bo_table=<?php echo $row2['bo_table'] ?>" class="gnb_2da"><?php echo $row2['bo_subject'] ?></a></li>
                     <?php } ?>

From ddd1726bf1e1f90efe2a1c3032fad2d5ad9ee573 Mon Sep 17 00:00:00 2001
From: whitedot <whitedot@naver.com>
Date: Thu, 6 Mar 2014 18:38:21 +0900
Subject: [PATCH 5/5] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20gnb=20z-inde?=
 =?UTF-8?q?x=20=EC=B6=94=EA=B0=803?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 head.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/head.php b/head.php
index e0600fd7f..d574bd650 100644
--- a/head.php
+++ b/head.php
@@ -118,13 +118,13 @@ if (G5_IS_MOBILE) {
             for ($gi=0; $row=sql_fetch_array($result); $gi++) { // gi 는 group index
                 $gnb_zindex -= 1; // html 구조에서 앞선 gnb_1dli 에 더 높은 z-index 값 부여
              ?>
-            <li class="gnb_1dli">
+            <li class="gnb_1dli" style="z-index:<?php echo $gnb_zindex; ?>">
                 <a href="<?php echo G5_BBS_URL ?>/group.php?gr_id=<?php echo $row['gr_id'] ?>" class="gnb_1da"><?php echo $row['gr_subject'] ?></a>
                 <ul class="gnb_2dul">
                     <?php
                     $sql2 = " select * from {$g5['board_table']} where gr_id = '{$row['gr_id']}' and bo_show_menu = '1' and bo_device <> 'mobile' order by bo_order ";
                     $result2 = sql_query($sql2);
-                    for ($gi=0; $row=sql_fetch_array($result); $gi++) { // gi 는 group index
+                    for ($bi=0; $row2=sql_fetch_array($result2); $bi++) { // bi 는 board index
                      ?>
                     <li class="gnb_2dli"><a href="<?php echo G5_BBS_URL ?>/board.php?bo_table=<?php echo $row2['bo_table'] ?>" class="gnb_2da"><?php echo $row2['bo_subject'] ?></a></li>
                     <?php } ?>