From a255dd9ef751a0ed581bcbfe20ecd55f766bce19 Mon Sep 17 00:00:00 2001
From: Arcturus <github@drk.st>
Date: Fri, 27 Sep 2024 17:34:22 +0900
Subject: [PATCH] update code and bump version

---
 AvocadoEdition_Light/adm/admin.lib.php           |  4 +---
 AvocadoEdition_Light/config.php                  |  2 +-
 .../skin/member/basic/login.admin.skin.php       | 16 ----------------
 .../skin/member/basic/login.skin.php             |  2 +-
 .../skin/member/basic/member_confirm.skin.php    |  9 ---------
 .../skin/member/basic/memo_form.skin.php         |  4 ----
 .../skin/member/basic/password.skin.php          | 13 ++++---------
 .../skin/member/basic/password_lost.skin.php     |  4 ----
 .../skin/member/basic/register.skin.php          | 12 ------------
 .../skin/member/basic/scrap.skin.php             | 12 ++++--------
 .../skin/member/basic/scrap_popin.skin.php       |  5 -----
 11 files changed, 11 insertions(+), 72 deletions(-)

diff --git a/AvocadoEdition_Light/adm/admin.lib.php b/AvocadoEdition_Light/adm/admin.lib.php
index 91d44e7..0fc36b8 100644
--- a/AvocadoEdition_Light/adm/admin.lib.php
+++ b/AvocadoEdition_Light/adm/admin.lib.php
@@ -460,9 +460,7 @@ if (!$member['mb_id']) {
 // 관리자의 클라이언트를 검증하여 일치하지 않으면 세션을 끊고 관리자에게 메일을 보낸다.
 if (!verify_mb_key($member)) {
   session_destroy();
-
-  include_once(G5_LIB_PATH . '/mailer.lib.php');
-
+  include_once G5_LIB_PATH . '/mailer.lib.php';
   // 메일 알림
   mailer($member['mb_nick'], $member['mb_email'], $member['mb_email'], 'XSS 공격 알림', $_SERVER['REMOTE_ADDR'] . ' 아이피로 XSS 공격이 있었습니다.\n\n관리자 권한을 탈취하려는 접근이므로 주의하시기 바랍니다.\n\n해당 아이피는 차단하시고 의심되는 게시물이 있는지 확인하시기 바랍니다.\n\n' . G5_URL, 0);
 
diff --git a/AvocadoEdition_Light/config.php b/AvocadoEdition_Light/config.php
index 67472e6..e4f4e76 100644
--- a/AvocadoEdition_Light/config.php
+++ b/AvocadoEdition_Light/config.php
@@ -7,7 +7,7 @@
 ********************/
 
 define('G5_VERSION', '아보카도 에디션 : Amber');
-define('G5_GNUBOARD_VER', '2.2.8');
+define('G5_GNUBOARD_VER', '2.2.9');
 define('_GNUBOARD_', true);
 
 date_default_timezone_set("Asia/Seoul");
diff --git a/AvocadoEdition_Light/skin/member/basic/login.admin.skin.php b/AvocadoEdition_Light/skin/member/basic/login.admin.skin.php
index 6fa423b..7528dd4 100644
--- a/AvocadoEdition_Light/skin/member/basic/login.admin.skin.php
+++ b/AvocadoEdition_Light/skin/member/basic/login.admin.skin.php
@@ -5,9 +5,7 @@ if (!defined('_GNUBOARD_'))
 // add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨
 add_stylesheet('<link rel="stylesheet" href="' . $member_skin_url . '/style.admin.css">', 0);
 ?>
-
 <div id="login_page_box">
-
   <div id="login_title">
     <div class="inner">
       <h1>
@@ -25,15 +23,11 @@ add_stylesheet('<link rel="stylesheet" href="' . $member_skin_url . '/style.admi
       </h1>
     </div>
   </div>
-
-
   <!-- 로그인 시작 { -->
   <div id="mb_login" class="mbskin">
     <div class="inner">
-
       <form name="flogin" action="<?php echo $login_action_url ?>" onsubmit="return flogin_submit(this);" method="post">
         <input type="hidden" name="url" value="<?php echo $login_url ?>">
-
         <fieldset class="input">
           <input type="text" name="mb_id" id="login_id" required class="frm_input required" size="20" maxLength="20">
           <label for="login_id" class="login_id">회원아이디<strong class="sound_only"> 필수</strong></label>
@@ -43,30 +37,22 @@ add_stylesheet('<link rel="stylesheet" href="' . $member_skin_url . '/style.admi
             maxLength="20">
           <label for="login_pw" class="login_pw">비밀번호<strong class="sound_only"> 필수</strong></label>
         </fieldset>
-
         <fieldset class="check">
           <input type="checkbox" name="auto_login" id="login_auto_login">
           <label for="login_auto_login">자동로그인</label>
         </fieldset>
-
         <fieldset class="button">
           <button type="submit" class="btn_submit">로그인</button>
         </fieldset>
       </form>
-
       <p id="copyright">
         COPYRIGHT &copy; 2017 System by Avocado<br />
         -<br />
         GNU BOARD 5.2.7
       </p>
-
     </div>
   </div>
-
 </div>
-
-
-
 <script>
   $(function () {
     $("#login_auto_login").click(function () {
@@ -74,9 +60,7 @@ add_stylesheet('<link rel="stylesheet" href="' . $member_skin_url . '/style.admi
         this.checked = confirm("자동로그인을 사용하시면 다음부터 회원아이디와 비밀번호를 입력하실 필요가 없습니다.\n\n공공장소에서는 개인정보가 유출될 수 있으니 사용을 자제하여 주십시오.\n\n자동로그인을 사용하시겠습니까?");
       }
     });
-
   });
-
   function flogin_submit(f) {
     return true;
   }
diff --git a/AvocadoEdition_Light/skin/member/basic/login.skin.php b/AvocadoEdition_Light/skin/member/basic/login.skin.php
index 8c6c364..a96e856 100644
--- a/AvocadoEdition_Light/skin/member/basic/login.skin.php
+++ b/AvocadoEdition_Light/skin/member/basic/login.skin.php
@@ -50,5 +50,5 @@ if (strstr($url, 'adm')) {
     }
   </script>
   <!-- } 로그인 끝 -->
-<?php
+  <?php
 }
diff --git a/AvocadoEdition_Light/skin/member/basic/member_confirm.skin.php b/AvocadoEdition_Light/skin/member/basic/member_confirm.skin.php
index 0fa1830..6b93fb9 100644
--- a/AvocadoEdition_Light/skin/member/basic/member_confirm.skin.php
+++ b/AvocadoEdition_Light/skin/member/basic/member_confirm.skin.php
@@ -3,8 +3,6 @@ if (!defined('_GNUBOARD_'))
   exit; // 개별 페이지 접근 불가
 add_stylesheet('<link rel="stylesheet" href="' . $member_skin_url . '/style.css">', 0);
 ?>
-
-
 <div id="password_box" class="theme-box">
   <h1>비밀번호 확인</h1>
   <hr class="line" />
@@ -17,14 +15,11 @@ add_stylesheet('<link rel="stylesheet" href="' . $member_skin_url . '/style.css"
         회원님의 정보를 안전하게 보호하기 위해 비밀번호를 한번 더 확인합니다.
       <?php } ?>
     </p>
-
     <div class="pass-form">
-
       <form name="fmemberconfirm" action="<?php echo $url ?>" onsubmit="return fmemberconfirm_submit(this);"
         method="post">
         <input type="hidden" name="mb_id" value="<?php echo $member['mb_id'] ?>">
         <input type="hidden" name="w" value="u">
-
         <fieldset class="box-id">
           <span id="mb_confirm_id" class="form-input"><?php echo $member['mb_id'] ?></span>
         </fieldset>
@@ -32,13 +27,10 @@ add_stylesheet('<link rel="stylesheet" href="' . $member_skin_url . '/style.css"
           <input type="password" name="mb_password" id="confirm_mb_password" required class="required frm_input"
             size="15" maxLength="20">
         </fieldset>
-
         <fieldset class="box-btn">
           <button type="submit" id="btn_submit" class="ui-btn point">확인</button>
         </fieldset>
-
       </form>
-
     </div>
   </div>
   <hr class="line" />
@@ -46,7 +38,6 @@ add_stylesheet('<link rel="stylesheet" href="' . $member_skin_url . '/style.css"
     <a href="<?php echo G5_URL ?>" class="ui-btn">메인으로 돌아가기</a>
   </div>
 </div>
-
 <script>
   function fmemberconfirm_submit(f) {
     document.getElementById("btn_submit").disabled = true;
diff --git a/AvocadoEdition_Light/skin/member/basic/memo_form.skin.php b/AvocadoEdition_Light/skin/member/basic/memo_form.skin.php
index ae55af0..7d22136 100644
--- a/AvocadoEdition_Light/skin/member/basic/memo_form.skin.php
+++ b/AvocadoEdition_Light/skin/member/basic/memo_form.skin.php
@@ -5,7 +5,6 @@ if (!defined('_GNUBOARD_'))
 // add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨
 add_stylesheet('<link rel="stylesheet" href="' . $member_skin_url . '/style.css">', 0);
 ?>
-
 <!-- 쪽지 보내기 시작 { -->
 <div id="memo_write" class="new_win mbskin">
   <form name="fmemoform" action="<?php echo $memo_action_url; ?>" onsubmit="return fmemoform_submit(this);"
@@ -29,7 +28,6 @@ add_stylesheet('<link rel="stylesheet" href="' . $member_skin_url . '/style.css"
           <td><textarea name="me_memo" id="me_memo" required class="required"
               style="min-height: 140px;"><?php echo $content ?></textarea></td>
         </tr>
-
       </tbody>
     </table>
     <hr class="padding" />
@@ -39,11 +37,9 @@ add_stylesheet('<link rel="stylesheet" href="' . $member_skin_url . '/style.css"
     </div>
   </form>
 </div>
-
 <script>
   function fmemoform_submit(f) {
     <?php echo chk_captcha_js(); ?>
-
     return true;
   }
 </script>
diff --git a/AvocadoEdition_Light/skin/member/basic/password.skin.php b/AvocadoEdition_Light/skin/member/basic/password.skin.php
index 2ca76a9..91d04c0 100644
--- a/AvocadoEdition_Light/skin/member/basic/password.skin.php
+++ b/AvocadoEdition_Light/skin/member/basic/password.skin.php
@@ -12,10 +12,8 @@ else if ($w == 'd' || $w == 'x')
 // add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨
 add_stylesheet('<link rel="stylesheet" href="' . $member_skin_url . '/style.css">', 0);
 ?>
-
 <!-- 비밀번호 확인 시작 { -->
 <div id="password_box" class="theme-box">
-
   <h1>비밀번호 확인</h1>
   <hr class="line" />
   <div class="descript">
@@ -24,11 +22,11 @@ add_stylesheet('<link rel="stylesheet" href="' . $member_skin_url . '/style.css"
         <strong class="txt-point">작성자만 글을 수정할 수 있습니다.</strong>
         작성자 본인이라면, 글 작성시 입력한 비밀번호를 입력하여 글을 수정할 수 있습니다.
       <?php } else if ($w == 'd' || $w == 'x') { ?>
-          <strong class="txt-point">작성자만 글을 삭제할 수 있습니다.</strong>
-          작성자 본인이라면, 글 작성시 입력한 비밀번호를 입력하여 글을 삭제할 수 있습니다.
+        <strong class="txt-point">작성자만 글을 삭제할 수 있습니다.</strong>
+        작성자 본인이라면, 글 작성시 입력한 비밀번호를 입력하여 글을 삭제할 수 있습니다.
       <?php } else { ?>
-          <strong class="txt-point">비밀글 기능으로 보호된 글입니다.</strong>
-          작성자와 관리자만 열람하실 수 있습니다. 본인이라면 비밀번호를 입력하세요.
+        <strong class="txt-point">비밀글 기능으로 보호된 글입니다.</strong>
+        작성자와 관리자만 열람하실 수 있습니다. 본인이라면 비밀번호를 입력하세요.
       <?php } ?>
     </p>
     <div class="pass-form">
@@ -40,12 +38,10 @@ add_stylesheet('<link rel="stylesheet" href="' . $member_skin_url . '/style.css"
         <input type="hidden" name="sfl" value="<?php echo $sfl ?>">
         <input type="hidden" name="stx" value="<?php echo $stx ?>">
         <input type="hidden" name="page" value="<?php echo $page ?>">
-
         <fieldset class="box-pw">
           <input type="password" name="wr_password" id="password_wr_password" required class="frm_input required"
             size="15" maxLength="20">
         </fieldset>
-
         <fieldset class="box-btn">
           <button type="submit" class="point ui-btn">확인</button>
         </fieldset>
@@ -56,6 +52,5 @@ add_stylesheet('<link rel="stylesheet" href="' . $member_skin_url . '/style.css"
   <div class="btn_confirm">
     <a href="<?php echo $return_url ?>" class="ui-btn">이전으로 돌아가기</a>
   </div>
-
 </div>
 <!-- } 비밀번호 확인 끝 -->
diff --git a/AvocadoEdition_Light/skin/member/basic/password_lost.skin.php b/AvocadoEdition_Light/skin/member/basic/password_lost.skin.php
index c110ab1..7fdb62b 100644
--- a/AvocadoEdition_Light/skin/member/basic/password_lost.skin.php
+++ b/AvocadoEdition_Light/skin/member/basic/password_lost.skin.php
@@ -5,11 +5,9 @@ if (!defined('_GNUBOARD_'))
 // add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨
 add_stylesheet('<link rel="stylesheet" href="' . $member_skin_url . '/style.css">', 0);
 ?>
-
 <!-- 회원정보 찾기 시작 { -->
 <div id="find_info" class="new_win mbskin">
   <h1 id="win_title">회원정보 찾기</h1>
-
   <form name="fpasswordlost" action="<?php echo $action_url ?>" onsubmit="return fpasswordlost_submit(this);"
     method="post" autocomplete="off">
     <fieldset id="info_fs">
@@ -27,11 +25,9 @@ add_stylesheet('<link rel="stylesheet" href="' . $member_skin_url . '/style.css"
     </div>
   </form>
 </div>
-
 <script>
   function fpasswordlost_submit(f) {
     <?php echo chk_captcha_js(); ?>
-
     return true;
   }
 
diff --git a/AvocadoEdition_Light/skin/member/basic/register.skin.php b/AvocadoEdition_Light/skin/member/basic/register.skin.php
index 6b92f59..b56bcf8 100644
--- a/AvocadoEdition_Light/skin/member/basic/register.skin.php
+++ b/AvocadoEdition_Light/skin/member/basic/register.skin.php
@@ -3,21 +3,15 @@ if (!defined('_GNUBOARD_'))
   exit; // 개별 페이지 접근 불가
 add_stylesheet('<link rel="stylesheet" href="' . $member_skin_url . '/style.css">', 0);
 ?>
-
-
 <div id="member_page">
-
   <h1 class="member-title">
     <strong>오너 동의 사항</strong>
     <span>《 Community Joining Assent 》</span>
   </h1>
-
-
   <!-- 회원가입약관 동의 시작 { -->
   <div class="member-contents agree-pannel">
     <form name="fregister" id="fregister" action="<?php echo $register_action_url ?>"
       onsubmit="return fregister_submit(this);" method="POST" autocomplete="off">
-
       <section id="fregister_term">
         <h2>커뮤니티 활동 규칙</h2>
         <div class="theme-box">
@@ -28,7 +22,6 @@ add_stylesheet('<link rel="stylesheet" href="' . $member_skin_url . '/style.css"
           <label for="agree11">커뮤니티 활동 규칙 내용에 동의합니다.</label>
         </fieldset>
       </section>
-
       <section id="fregister_private">
         <h2>캐릭터 유의사항</h2>
         <div class="theme-box">
@@ -39,17 +32,12 @@ add_stylesheet('<link rel="stylesheet" href="' . $member_skin_url . '/style.css"
           <label for="agree21">캐릭터 유의사항 내용에 동의합니다.</label>
         </fieldset>
       </section>
-
       <div class="ui-button-box txt-center">
         <button type="submit" class="ui-btn point">계정생성</button>
       </div>
-
     </form>
-
   </div>
-
 </div>
-
 <script>
   function fregister_submit(f) {
     if (!f.agree.checked) {
diff --git a/AvocadoEdition_Light/skin/member/basic/scrap.skin.php b/AvocadoEdition_Light/skin/member/basic/scrap.skin.php
index 210eece..eb14e59 100644
--- a/AvocadoEdition_Light/skin/member/basic/scrap.skin.php
+++ b/AvocadoEdition_Light/skin/member/basic/scrap.skin.php
@@ -5,11 +5,9 @@ if (!defined('_GNUBOARD_'))
 // add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨
 add_stylesheet('<link rel="stylesheet" href="' . $member_skin_url . '/style.css">', 0);
 ?>
-
 <!-- 스크랩 목록 시작 { -->
 <div id="scrap" class="new_win mbskin">
   <h1 id="win_title"><?php echo $g5['title'] ?></h1>
-
   <div class="tbl_head01 tbl_wrap">
     <table>
       <caption>스크랩 목록</caption>
@@ -36,16 +34,14 @@ add_stylesheet('<link rel="stylesheet" href="' . $member_skin_url . '/style.css"
             <td class="td_mng"><a href="<?php echo $list[$i]['del_href']; ?>"
                 onclick="del(this.href); return false;">삭제</a></td>
           </tr>
-        <?php } ?>
-
-        <?php if ($i == 0)
-          echo "<tr><td colspan=\"5\" class=\"empty_table\">자료가 없습니다.</td></tr>"; ?>
+        <?php }
+        if ($i == 0) {
+          echo "<tr><td colspan=\"5\" class=\"empty_table\">자료가 없습니다.</td></tr>"; 
+        }?>
       </tbody>
     </table>
   </div>
-
   <?php echo get_paging($config['cf_write_pages'], $page, $total_page, "?$qstr&amp;page="); ?>
-
   <div class="win_btn">
     <button type="button" onclick="window.close();">창닫기</button>
   </div>
diff --git a/AvocadoEdition_Light/skin/member/basic/scrap_popin.skin.php b/AvocadoEdition_Light/skin/member/basic/scrap_popin.skin.php
index f2eb70b..b3b43aa 100644
--- a/AvocadoEdition_Light/skin/member/basic/scrap_popin.skin.php
+++ b/AvocadoEdition_Light/skin/member/basic/scrap_popin.skin.php
@@ -5,15 +5,12 @@ if (!defined('_GNUBOARD_'))
 // add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨
 add_stylesheet('<link rel="stylesheet" href="' . $member_skin_url . '/style.css">', 0);
 ?>
-
 <!-- 스크랩 시작 { -->
 <div id="scrap_do" class="new_win mbskin">
   <h1 id="win_title">스크랩하기</h1>
-
   <form name="f_scrap_popin" action="./scrap_popin_update.php" method="post">
     <input type="hidden" name="bo_table" value="<?php echo $bo_table ?>">
     <input type="hidden" name="wr_id" value="<?php echo $wr_id ?>">
-
     <div class="tbl_frm01 tbl_wrap">
       <table>
         <caption>제목 확인 및 댓글 쓰기</caption>
@@ -29,11 +26,9 @@ add_stylesheet('<link rel="stylesheet" href="' . $member_skin_url . '/style.css"
         </tbody>
       </table>
     </div>
-
     <p class="win_desc">
       스크랩을 하시면서 감사 혹은 격려의 댓글을 남기실 수 있습니다.
     </p>
-
     <div class="win_btn">
       <input type="submit" value="스크랩 확인" class="btn_submit">
     </div>