From 4a2e4208ed8b43953298a52fd1b72f900c851a41 Mon Sep 17 00:00:00 2001
From: thisgun <thisgun@naver.com>
Date: Tue, 20 Apr 2021 14:45:26 +0900
Subject: [PATCH 1/8] =?UTF-8?q?gitignore=20=EA=B7=9C=EC=B9=99=EC=97=90=20v?=
 =?UTF-8?q?scode=20=EB=AC=B8=EC=9E=90=EC=97=B4=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 2ac415747..adb4ccb6b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,4 +10,5 @@ cheditor5.*/
 ckeditor*/
 log/
 g5_tree/
+.vscode/
 naver*.html

From 546e2586be1492e99c505da3c5047305c7660d04 Mon Sep 17 00:00:00 2001
From: thisgun <thisgun@naver.com>
Date: Tue, 27 Apr 2021 11:26:56 +0900
Subject: [PATCH 2/8] =?UTF-8?q?SMS=EA=B4=80=EB=A6=AC=EC=97=90=EC=84=9C=20?=
 =?UTF-8?q?=ED=9C=B4=EB=8C=80=ED=8F=B0=EB=B2=88=ED=98=B8=20=EA=B7=B8?=
 =?UTF-8?q?=EB=A3=B9=EC=9D=B4=20=EC=B6=94=EA=B0=80=EB=90=98=EC=A7=80=20?=
 =?UTF-8?q?=EC=95=8A=EB=8A=94=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/sms_admin/num_group_update.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/adm/sms_admin/num_group_update.php b/adm/sms_admin/num_group_update.php
index abd3407b0..b168271f6 100644
--- a/adm/sms_admin/num_group_update.php
+++ b/adm/sms_admin/num_group_update.php
@@ -65,7 +65,7 @@ else if ($w == 'em') // 비우기
 }
 else // 등록
 {
-    $bg_name = isset($_POST['bg_name']) ? strip_tags(clean_xss_attributes($_POST['bg_name'])) : '';
+    $bg_name = isset($_REQUEST['bg_name']) ? strip_tags(clean_xss_attributes($_REQUEST['bg_name'])) : '';
 
     if (!strlen(trim($bg_name)))
         alert('그룹명을 입력해주세요');

From 33120a85c355c03dabf95fc76996dd438b9036dd Mon Sep 17 00:00:00 2001
From: thisgun <thisgun@naver.com>
Date: Wed, 28 Apr 2021 11:43:14 +0900
Subject: [PATCH 3/8] =?UTF-8?q?=EA=B7=B8=EB=88=84=EB=B3=B4=EB=93=9C4=20imp?=
 =?UTF-8?q?ort=20=ED=8C=8C=EC=9D=BC=EC=97=90=20=ED=85=8C=EB=A7=88=EB=A5=BC?=
 =?UTF-8?q?=20=EC=82=AC=EC=9A=A9=EC=97=AC=EB=B6=80=20=EC=A1=B0=EA=B1=B4=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80=20=EC=BD=94=EB=93=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 g4_import.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/g4_import.php b/g4_import.php
index 0bb6c23bd..437238e0b 100644
--- a/g4_import.php
+++ b/g4_import.php
@@ -4,7 +4,7 @@ include_once(G5_LIB_PATH.'/connect.lib.php');
 include_once(G5_LIB_PATH.'/outlogin.lib.php');
 
 $g5['title'] = '그누보드4 DB 데이터 이전';
-include_once(G5_PATH.'/'.G5_THEME_DIR.'/basic/head.sub.php');
+if((isset($config['cf_theme']) && $config['cf_theme'])) include_once(G5_PATH.'/'.G5_THEME_DIR.'/basic/head.sub.php');
 
 if(get_session('tables_copied') == 'done')
     alert('DB 데이터 변환을 이미 실행하였습니다. 중복 실행시 오류가 발생할 수 있습니다.', G5_URL);

From 4ae5040db87d8cb96193205af40ecd6679faab5a Mon Sep 17 00:00:00 2001
From: thisgun <thisgun@naver.com>
Date: Fri, 30 Apr 2021 10:03:29 +0900
Subject: [PATCH 4/8] =?UTF-8?q?=EC=9D=BC=EB=B6=80=20=ED=8C=8C=EC=9D=BC?=
 =?UTF-8?q?=EC=97=90=20=EB=B3=80=EC=88=98=20=EC=B4=88=EA=B8=B0=ED=99=94=20?=
 =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/sms_admin/config.php | 3 +++
 bbs/move.php             | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/adm/sms_admin/config.php b/adm/sms_admin/config.php
index dc2d28467..e6e256b18 100644
--- a/adm/sms_admin/config.php
+++ b/adm/sms_admin/config.php
@@ -17,6 +17,9 @@ if( ! isset($config['cf_icode_token_key']) ){
     $config['cf_icode_token_key'] = '';
 }
 
+// 배열코드 초기화
+$userinfo = array('payment'=>'', 'coin'=>'');
+
 if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw'])
 {
     $userinfo = get_icode_userinfo($config['cf_icode_id'], $config['cf_icode_pw']);
diff --git a/bbs/move.php b/bbs/move.php
index 9fbc97d51..70d13cfdb 100644
--- a/bbs/move.php
+++ b/bbs/move.php
@@ -41,6 +41,9 @@ else if ($is_admin == 'board')
     $sql .= " and a.bo_admin = '{$member['mb_id']}' ";
 $sql .= " order by a.gr_id, a.bo_order, a.bo_table ";
 $result = sql_query($sql);
+
+$list = array();
+
 for ($i=0; $row=sql_fetch_array($result); $i++)
 {
     $list[$i] = $row;

From a248f260857fd8448028285a02a36cd52244e6c6 Mon Sep 17 00:00:00 2001
From: seeoya <seeoya@naver.com>
Date: Wed, 12 May 2021 10:39:38 +0900
Subject: [PATCH 5/8] =?UTF-8?q?=EA=B2=8C=EC=8B=9C=ED=8C=90=20:=20#96=20?=
 =?UTF-8?q?=EB=AA=A9=EB=A1=9D=20=EA=B2=80=EC=83=89=20=EA=B2=B0=EA=B3=BC?=
 =?UTF-8?q?=EC=97=90=EC=84=9C=20=ED=8E=98=EC=9D=B4=EC=A7=95=20=ED=81=B4?=
 =?UTF-8?q?=EB=9E=98=EC=8A=A4=20=EB=84=A4=EC=9D=B4=EB=B0=8D=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=20=EB=B0=8F=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/bbs/list.php b/bbs/list.php
index bbe61e3e6..9a18a393b 100644
--- a/bbs/list.php
+++ b/bbs/list.php
@@ -222,14 +222,14 @@ if ($is_search_bbs) {
     if (isset($min_spt) && $prev_spt >= $min_spt) {
         $qstr1 = preg_replace($patterns, '', $qstr);
         $prev_part_href = get_pretty_url($bo_table,0,$qstr1.'&amp;spt='.$prev_spt.'&amp;page=1');
-        $write_pages = page_insertbefore($write_pages, '<a href="'.$prev_part_href.'" class="pg_page pg_prev">이전검색</a>');
+        $write_pages = page_insertbefore($write_pages, '<a href="'.$prev_part_href.'" class="pg_page pg_search pg_prev">이전검색</a>');
     }
 
     $next_spt = $spt + $config['cf_search_part'];
     if ($next_spt < 0) {
         $qstr1 = preg_replace($patterns, '', $qstr);
         $next_part_href = get_pretty_url($bo_table,0,$qstr1.'&amp;spt='.$next_spt.'&amp;page=1');
-        $write_pages = page_insertafter($write_pages, '<a href="'.$next_part_href.'" class="pg_page pg_end">다음검색</a>');
+        $write_pages = page_insertafter($write_pages, '<a href="'.$next_part_href.'" class="pg_page pg_search pg_next">다음검색</a>');
     }
 }
 

From b03302794db938cb44291a7814a945643bfbdb30 Mon Sep 17 00:00:00 2001
From: thisgun <thisgun@naver.com>
Date: Fri, 14 May 2021 14:14:09 +0900
Subject: [PATCH 6/8] =?UTF-8?q?=EC=98=A4=ED=83=80=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/mail_select_update.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/adm/mail_select_update.php b/adm/mail_select_update.php
index 4a7ba5be8..cb4f62681 100644
--- a/adm/mail_select_update.php
+++ b/adm/mail_select_update.php
@@ -61,7 +61,7 @@ for ($i=0; $i<count($member_list); $i++)
         $content = preg_replace("/{회원아이디}/", $mb_id, $content);
         $content = preg_replace("/{이메일}/", $to_email, $content);
 
-        $content = $content . "<hr size=0><p><span style='font-size:9pt; font-familye:굴림'>▶ 더 이상 정보 수신을 원치 않으시면 [<a href='".G5_BBS_URL."/email_stop.php?mb_id={$mb_id}&amp;mb_md5={$mb_md5}' target='_blank'>수신거부</a>] 해 주십시오.</span></p>";
+        $content = $content . "<hr size=0><p><span style='font-size:9pt; font-family:굴림'>▶ 더 이상 정보 수신을 원치 않으시면 [<a href='".G5_BBS_URL."/email_stop.php?mb_id={$mb_id}&amp;mb_md5={$mb_md5}' target='_blank'>수신거부</a>] 해 주십시오.</span></p>";
 
         mailer($config['cf_admin_email_name'], $config['cf_admin_email'], $to_email, $subject, $content, 1);
 

From 138c07b2768f9d6795125612e717374513b19b32 Mon Sep 17 00:00:00 2001
From: thisgun <thisgun@naver.com>
Date: Fri, 14 May 2021 15:47:04 +0900
Subject: [PATCH 7/8] =?UTF-8?q?=EA=B2=8C=EC=8B=9C=ED=8C=90=20=EC=9D=B4?=
 =?UTF-8?q?=EB=AF=B8=EC=A7=80=20=EC=83=88=EC=B0=BD=EC=97=B4=EA=B8=B0?=
 =?UTF-8?q?=EC=8B=9C=20=EC=A2=8C=EC=9A=B0=EC=8A=A4=ED=81=AC=EB=A1=A4=20?=
 =?UTF-8?q?=EC=83=9D=EA=B8=B0=EB=8A=94=20=EB=AC=B8=EC=A0=9C=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

---
 bbs/view_image.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/bbs/view_image.php b/bbs/view_image.php
index 6be5aedd0..c083a37e9 100644
--- a/bbs/view_image.php
+++ b/bbs/view_image.php
@@ -104,6 +104,12 @@ $.fn.imgLoad = function(callback) {
             }
         }
 
+        if(win_w < screen.width) {
+            if(window.outerWidth){
+                win_w = win_w + (window.outerWidth - (document.documentElement.clientWidth || window.innerWidth));
+            }
+        }
+
         window.moveTo(win_l, win_t);
         window.resizeTo(win_w, win_h);
     });

From 29b6ca29ccf7413e11728093fdb06423cef7b881 Mon Sep 17 00:00:00 2001
From: thisgun <thisgun@naver.com>
Date: Mon, 17 May 2021 15:34:13 +0900
Subject: [PATCH 8/8] =?UTF-8?q?=EB=B2=84=EC=A0=84=205.4.5.5=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

---
 config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.php b/config.php
index 5b23c8105..e0c11fa1a 100644
--- a/config.php
+++ b/config.php
@@ -5,7 +5,7 @@
 ********************/
 
 define('G5_VERSION', '그누보드5');
-define('G5_GNUBOARD_VER', '5.4.5.4');
+define('G5_GNUBOARD_VER', '5.4.5.5');
 
 // 이 상수가 정의되지 않으면 각각의 개별 페이지는 별도로 실행될 수 없음
 define('_GNUBOARD_', true);