From d51ed5166cf622919bb29a18003b3da23f725df6 Mon Sep 17 00:00:00 2001
From: whitedot <whitedot@naver.com>
Date: Mon, 13 Jan 2014 09:18:25 +0900
Subject: [PATCH 01/17] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90:=20=ED=99=98?=
 =?UTF-8?q?=EA=B2=BD=EC=84=A4=EC=A0=95=20>=20=EB=A9=94=EC=9D=BC=ED=85=8C?=
 =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EA=B2=B0=EA=B3=BC=20=EB=A9=94=EC=84=B8?=
 =?UTF-8?q?=EC=A7=80=20=EC=8A=A4=ED=83=80=EC=9D=BC=20=EC=88=98=EC=A0=95,?=
 =?UTF-8?q?=20=EC=82=AC=EB=85=B8=EB=9D=BC=EA=B0=80=EB=85=B8=EB=9D=BC(ogoga?=
 =?UTF-8?q?go)=EB=8B=98=20=EC=A0=9C=EB=B3=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/sendmail_test.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/adm/sendmail_test.php b/adm/sendmail_test.php
index eadc627cf..ace86fe89 100644
--- a/adm/sendmail_test.php
+++ b/adm/sendmail_test.php
@@ -17,21 +17,21 @@ if (isset($_POST['email'])) {
     for ($i=0; $i<count($email); $i++)
         mailer($config['cf_title'], $config['cf_admin_email'], trim($email[$i]), '[메일검사] 제목', '<span style="font-size:9pt;">[메일검사] 내용<p>이 내용이 제대로 보인다면 보내는 메일 서버에는 이상이 없는것입니다.<p>'.G5_TIME_YMDHIS.'<p>이 메일 주소로는 회신되지 않습니다.</span>', 1);
 
-    echo '<section class=\'cbox\'>';
+    echo '<section>';
     echo '<h2>결과메세지</h2>';
-    echo '<p>';
+    echo '<div class="local_desc01 local_desc"><p>';
     echo '다음 '.count($email).'개의 메일 주소로 테스트 메일 발송이 완료되었습니다.';
-    echo '</p>';
+    echo '</p></div>';
     echo '<ul>';
     for ($i=0;$i<count($email);$i++) {
         echo '<li>'.$email[$i].'</li>';
     }
     echo '</ul>';
-    echo '<p>';
+    echo '<div class="local_desc02 local_desc"><p>';
     echo '해당 주소로 테스트 메일이 도착했는지 확인해 주십시오.<br>';
     echo '만약, 테스트 메일이 오지 않는다면 더 다양한 계정의 메일 주소로 메일을 보내 보십시오.<br>';
     echo '그래도 메일이 하나도 도착하지 않는다면 메일 서버(sendmail server)의 오류일 가능성이 높으니, 웹 서버관리자에게 문의하여 주십시오.<br>';
-    echo '</p>';
+    echo '</p></div>';
     echo '</section>';
 }
 ?>

From 7e7e9c17b7e79f80c94b991440f9a39bc52ca8d1 Mon Sep 17 00:00:00 2001
From: whitedot <whitedot@naver.com>
Date: Mon, 13 Jan 2014 09:21:41 +0900
Subject: [PATCH 02/17] =?UTF-8?q?=EA=B3=B5=ED=86=B5:=20=EA=B2=8C=EC=8B=9C?=
 =?UTF-8?q?=ED=8C=90=20=EA=B8=80=EC=93=B0=EA=B8=B0=20=ED=8E=98=EC=9D=B4?=
 =?UTF-8?q?=EC=A7=80=EC=9D=98=20=EC=99=84=EB=A3=8C=20=EB=B2=84=ED=8A=BC?=
 =?UTF-8?q?=EB=AA=85=EC=9D=84=20'=EA=B8=80=EC=93=B0=EA=B8=B0'=EC=97=90?=
 =?UTF-8?q?=EC=84=9C=20'=EC=9E=91=EC=84=B1=EC=99=84=EB=A3=8C'=EB=A1=9C=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95,=20=ED=9C=B4=EB=A8=BC(humansoft)=EB=8B=98=20?=
 =?UTF-8?q?=EA=B1=B4=EC=9D=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mobile/skin/board/basic/write.skin.php   | 2 +-
 mobile/skin/board/gallery/write.skin.php | 2 +-
 mobile/skin/qa/basic/write.skin.php      | 2 +-
 skin/board/basic/write.skin.php          | 2 +-
 skin/board/gallery/write.skin.php        | 2 +-
 skin/qa/basic/write.skin.php             | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/mobile/skin/board/basic/write.skin.php b/mobile/skin/board/basic/write.skin.php
index 74115f47b..5a4184b95 100644
--- a/mobile/skin/board/basic/write.skin.php
+++ b/mobile/skin/board/basic/write.skin.php
@@ -157,7 +157,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
     </div>
 
     <div class="btn_confirm">
-        <input type="submit" value="글쓰기" id="btn_submit" class="btn_submit" accesskey="s">
+        <input type="submit" value="작성완료" id="btn_submit" class="btn_submit" accesskey="s">
         <a href="./board.php?bo_table=<?php echo $bo_table ?>" class="btn_cancel">취소</a>
     </div>
     </form>
diff --git a/mobile/skin/board/gallery/write.skin.php b/mobile/skin/board/gallery/write.skin.php
index 30870dc4c..9c6805945 100644
--- a/mobile/skin/board/gallery/write.skin.php
+++ b/mobile/skin/board/gallery/write.skin.php
@@ -157,7 +157,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
     </div>
 
     <div class="btn_confirm">
-        <input type="submit" value="글쓰기" id="btn_submit" class="btn_submit" accesskey="s">
+        <input type="submit" value="작성완료" id="btn_submit" class="btn_submit" accesskey="s">
         <a href="./board.php?bo_table=<?php echo $bo_table ?>" class="btn_cancel">취소</a>
     </div>
     </form>
diff --git a/mobile/skin/qa/basic/write.skin.php b/mobile/skin/qa/basic/write.skin.php
index cbadd6028..c7fa1e568 100644
--- a/mobile/skin/qa/basic/write.skin.php
+++ b/mobile/skin/qa/basic/write.skin.php
@@ -110,7 +110,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
     </div>
 
     <div class="btn_confirm">
-        <input type="submit" value="글쓰기" id="btn_submit" accesskey="s" class="btn_submit">
+        <input type="submit" value="작성완료" id="btn_submit" accesskey="s" class="btn_submit">
         <a href="<?php echo $list_href; ?>" class="btn_cancel">목록</a>
     </div>
     </form>
diff --git a/skin/board/basic/write.skin.php b/skin/board/basic/write.skin.php
index 8b74c24a2..07eb7f676 100644
--- a/skin/board/basic/write.skin.php
+++ b/skin/board/basic/write.skin.php
@@ -173,7 +173,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
     </div>
 
     <div class="btn_confirm">
-        <input type="submit" value="글쓰기" id="btn_submit" accesskey="s" class="btn_submit">
+        <input type="submit" value="작성완료" id="btn_submit" accesskey="s" class="btn_submit">
         <a href="./board.php?bo_table=<?php echo $bo_table ?>" class="btn_cancel">취소</a>
     </div>
     </form>
diff --git a/skin/board/gallery/write.skin.php b/skin/board/gallery/write.skin.php
index 8b74c24a2..07eb7f676 100644
--- a/skin/board/gallery/write.skin.php
+++ b/skin/board/gallery/write.skin.php
@@ -173,7 +173,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
     </div>
 
     <div class="btn_confirm">
-        <input type="submit" value="글쓰기" id="btn_submit" accesskey="s" class="btn_submit">
+        <input type="submit" value="작성완료" id="btn_submit" accesskey="s" class="btn_submit">
         <a href="./board.php?bo_table=<?php echo $bo_table ?>" class="btn_cancel">취소</a>
     </div>
     </form>
diff --git a/skin/qa/basic/write.skin.php b/skin/qa/basic/write.skin.php
index ced9ba8a7..817e8f943 100644
--- a/skin/qa/basic/write.skin.php
+++ b/skin/qa/basic/write.skin.php
@@ -110,7 +110,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
     </div>
 
     <div class="btn_confirm">
-        <input type="submit" value="글쓰기" id="btn_submit" accesskey="s" class="btn_submit">
+        <input type="submit" value="작성완료" id="btn_submit" accesskey="s" class="btn_submit">
         <a href="<?php echo $list_href; ?>" class="btn_cancel">목록</a>
     </div>
     </form>

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 03/17] =?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 04/17] =?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 ea1f180b2d6a87447fc07ee5b6ce8190a84b583c Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Mon, 13 Jan 2014 15:40:26 +0900
Subject: [PATCH 05/17] =?UTF-8?q?=EC=83=81=ED=92=88=EB=AA=85=EC=97=90=20?=
 =?UTF-8?q?=EB=94=B0=EC=98=B4=ED=91=9C=20=EC=9E=88=EC=9D=84=20=EA=B2=BD?=
 =?UTF-8?q?=EC=9A=B0=20=EC=9E=A5=EB=B0=94=EA=B5=AC=EB=8B=88=20=EB=8B=B4?=
 =?UTF-8?q?=EA=B8=B0=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

---
 shop/cartupdate.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shop/cartupdate.php b/shop/cartupdate.php
index 948c6f0d8..351c58669 100644
--- a/shop/cartupdate.php
+++ b/shop/cartupdate.php
@@ -221,7 +221,7 @@ else // 장바구니에 담기
             if($it['it_sc_type'] > 1 && $it['it_sc_method'] == 1)
                 $ct_send_cost = 1;
 
-            $sql .= $comma."( '$tmp_cart_id', '{$member['mb_id']}', '{$it['it_id']}', '{$it['it_name']}', '쇼핑', '{$it['it_price']}', '$point', '0', '0', '$io_value', '$ct_qty', '{$it['it_notax']}', '$io_id', '$io_type', '$io_price', '".G5_TIME_YMDHIS."', '$REMOTE_ADDR', '$ct_send_cost', '$sw_direct', '$ct_select' )";
+            $sql .= $comma."( '$tmp_cart_id', '{$member['mb_id']}', '{$it['it_id']}', '".addslashes($it['it_name'])."', '쇼핑', '{$it['it_price']}', '$point', '0', '0', '$io_value', '$ct_qty', '{$it['it_notax']}', '$io_id', '$io_type', '$io_price', '".G5_TIME_YMDHIS."', '$REMOTE_ADDR', '$ct_send_cost', '$sw_direct', '$ct_select' )";
             $comma = ' , ';
             $ct_count++;
         }

From 9239b57137c87af956ae6d95555141a1b4fab07a Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Mon, 13 Jan 2014 16:47:17 +0900
Subject: [PATCH 06/17] =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC=20=EA=B2=B0?=
 =?UTF-8?q?=EC=A0=9C=EB=AA=A8=EB=93=88=20=EC=97=B0=EB=8F=99=EC=9D=84=20?=
 =?UTF-8?q?=EC=9C=84=ED=95=B4=20openssl=20=EB=AA=A8=EB=93=88=EC=B2=B4?=
 =?UTF-8?q?=ED=81=AC=20=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

---
 install/library.check.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/install/library.check.php b/install/library.check.php
index 96e77ce3f..e1cfe0e06 100644
--- a/install/library.check.php
+++ b/install/library.check.php
@@ -12,6 +12,9 @@ function die_utf8($msg)
 if(!extension_loaded('gd') || !function_exists('gd_info'))
     die_utf8('GD 라이브러리를 설치하신 후 '.G5_VERSION.' 설치를 진행해 주십시오.');
 
+if(!extension_loaded('openssl'))
+    die_utf8('openssl 모듈을 설치하신 후 '.G5_VERSION.' 설치를 진행해 주십시오.');
+
 // SOAP 모듈체크
 if(!extension_loaded('soap') || !class_exists('SOAPClient'))
     die_utf8('SOAP 확장모듈을 설치하신 후 '.G5_VERSION.' 설치를 진행해 주십시오.');

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 07/17] =?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 5fd65e3917ce3093e95033f631fafc93f2f12db1 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Tue, 14 Jan 2014 13:18:47 +0900
Subject: [PATCH 08/17] =?UTF-8?q?pc=EC=87=BC=ED=95=91=EB=AA=B0=20=EA=B4=80?=
 =?UTF-8?q?=EB=A0=A8=EC=83=81=ED=92=88=20=EC=8A=A4=ED=82=A8=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/shop_admin/configform.php        |  2 +-
 skin/shop/basic/relation.10.skin.php | 98 ++++++++++++++++++++++++++++
 2 files changed, 99 insertions(+), 1 deletion(-)
 create mode 100644 skin/shop/basic/relation.10.skin.php

diff --git a/adm/shop_admin/configform.php b/adm/shop_admin/configform.php
index eda43a428..4c8866942 100644
--- a/adm/shop_admin/configform.php
+++ b/adm/shop_admin/configform.php
@@ -727,7 +727,7 @@ if(!isset($default['de_root_index_use'])) {
                 <?php echo help("관련상품의 경우 등록된 상품은 모두 출력하므로 '출력할 줄 수'는 설정하지 않습니다. 이미지높이를 0으로 설정하면 상품이미지를 이미지폭에 비례하여 생성합니다."); ?>
                 <label for="de_rel_list_skin">스킨</label>
                 <select name="de_rel_list_skin" id="de_rel_list_skin">
-                    <?php echo get_list_skin_options("^list.[0-9]+\.skin\.php", G5_SHOP_SKIN_PATH, $default['de_rel_list_skin']); ?>
+                    <?php echo get_list_skin_options("^relation.[0-9]+\.skin\.php", G5_SHOP_SKIN_PATH, $default['de_rel_list_skin']); ?>
                 </select>
                 <label for="de_rel_img_width">이미지폭</label>
                 <input type="text" name="de_rel_img_width" value="<?php echo $default['de_rel_img_width']; ?>" id="de_rel_img_width" class="frm_input" size="3">
diff --git a/skin/shop/basic/relation.10.skin.php b/skin/shop/basic/relation.10.skin.php
new file mode 100644
index 000000000..8bc26da40
--- /dev/null
+++ b/skin/shop/basic/relation.10.skin.php
@@ -0,0 +1,98 @@
+<?php
+if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
+?>
+
+<link rel="stylesheet" href="<?php echo G5_SHOP_SKIN_URL; ?>/style.css">
+
+<!-- 상품진열 10 시작 { -->
+<?php
+for ($i=1; $row=sql_fetch_array($result); $i++) {
+    if ($this->list_mod >= 2) { // 1줄 이미지 : 2개 이상
+        if ($i%$this->list_mod == 0) $sct_last = ' sct_last'; // 줄 마지막
+        else if ($i%$this->list_mod == 1) $sct_last = ' sct_clear'; // 줄 첫번째
+        else $sct_last = '';
+    } else { // 1줄 이미지 : 1개
+        $sct_last = ' sct_clear';
+    }
+
+    if ($i == 1) {
+        if ($this->css) {
+            echo "<ul class=\"{$this->css}\">\n";
+        } else {
+            echo "<ul class=\"sct sct_10\">\n";
+        }
+    }
+
+    echo "<li class=\"sct_li {$sct_last}\" style=\"width:{$this->img_width}px\">\n";
+
+    if ($this->href) {
+        echo "<a href=\"{$this->href}{$row['it_id']}\" class=\"sct_a sct_img\">\n";
+    }
+
+    if ($this->view_it_img) {
+        echo get_it_image($row['it_id'], $this->img_width, $this->img_height, '', '', stripslashes($row['it_name']))."\n";
+    }
+
+    if ($this->href) {
+        echo "</a>\n";
+    }
+
+    if ($this->view_it_id) {
+        echo "<span class=\"sct_id\">&lt;".stripslashes($row['it_id'])."&gt;</span>\n";
+    }
+
+    if ($this->href) {
+        echo "<a href=\"{$this->href}{$row['it_id']}\" class=\"sct_a sct_txt\">\n";
+    }
+
+    if ($this->view_it_name) {
+        echo stripslashes($row['it_name'])."\n";
+    }
+
+    if ($this->href) {
+        echo "</a>\n";
+    }
+
+    if ($this->view_it_basic && $row['it_basic']) {
+        echo "<div class=\"sct_basic\">".stripslashes($row['it_basic'])."</div>\n";
+    }
+
+    if ($this->view_it_cust_price || $this->view_it_price) {
+
+        echo "<div class=\"sct_cost\">\n";
+
+        if ($this->view_it_cust_price && $row['it_cust_price']) {
+            echo "<strike>".display_price($row['it_cust_price'])."</strike>\n";
+        }
+
+        if ($this->view_it_price) {
+            echo display_price(get_price($row), $row['it_tel_inq'])."\n";
+        }
+
+        echo "</div>\n";
+
+    }
+
+    if ($this->view_it_icon) {
+        echo "<div class=\"sct_icon\">".item_icon($row)."</div>\n";
+    }
+
+    if ($this->view_sns) {
+        $sns_top = $this->img_height + 10;
+        $sns_url  = G5_SHOP_URL.'/item.php?it_id='.$row['it_id'];
+        $sns_title = get_text($row['it_name']).' | '.get_text($config['cf_title']);
+        echo "<div class=\"sct_sns\" style=\"top:{$sns_top}px\">";
+        echo get_sns_share_link('facebook', $sns_url, $sns_title, G5_SHOP_SKIN_URL.'/img/sns_fb.png');
+        echo get_sns_share_link('twitter', $sns_url, $sns_title, G5_SHOP_SKIN_URL.'/img/sns_twt.png');
+        echo get_sns_share_link('googleplus', $sns_url, $sns_title, G5_SHOP_SKIN_URL.'/img/sns_goo.png');
+        echo "</div>\n";
+    }
+
+    echo "</li>\n";
+}
+
+if ($i > 1) echo "</ul>\n";
+
+if($i == 1) echo "<p class=\"sct_noitem\">등록된 상품이 없습니다.</p>\n";
+?>
+<!-- } 상품진열 10 끝 -->
\ No newline at end of file

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 09/17] =?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 10/17] =?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 11/17] =?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 12/17] =?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 1496850aad8b323188b227016f51f66bc4a34475 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Wed, 15 Jan 2014 13:17:11 +0900
Subject: [PATCH 13/17] =?UTF-8?q?=EC=A3=BC=EB=AC=B8=EC=A0=95=EB=B3=B4=20?=
 =?UTF-8?q?=EA=B0=80=EC=A0=B8=EC=98=A4=EB=8A=94=20=EC=A4=91=EB=B3=B5=20?=
 =?UTF-8?q?=EC=BF=BC=EB=A6=AC=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/shop_admin/orderform.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/adm/shop_admin/orderform.php b/adm/shop_admin/orderform.php
index 568137a4e..bf22eee2c 100644
--- a/adm/shop_admin/orderform.php
+++ b/adm/shop_admin/orderform.php
@@ -505,11 +505,6 @@ if(!sql_query(" select ad_addr3 from {$g5['g5_shop_order_address_table']} limit
                 <tbody>
                 <?php if ($od['od_settle_case'] == '무통장' || $od['od_settle_case'] == '가상계좌' || $od['od_settle_case'] == '계좌이체') { ########## 시작?>
                 <?php
-                // 주문서
-                $sql = " select * from {$g5['g5_shop_order_table']} where od_id = '$od_id' ";
-                $result = sql_query($sql);
-                $od = sql_fetch_array($result);
-
                 if ($od['od_settle_case'] == '무통장')
                 {
                     // 은행계좌를 배열로 만든후

From f80f631e37f7e876ccc1e1c078f1410e207b3465 Mon Sep 17 00:00:00 2001
From: whitedot <whitedot@naver.com>
Date: Wed, 15 Jan 2014 13:26:45 +0900
Subject: [PATCH 14/17] =?UTF-8?q?=EC=87=BC=ED=95=91=EB=AA=B0:=20=EC=A3=BC?=
 =?UTF-8?q?=EB=AC=B8=EC=84=9C=EC=9E=91=EC=84=B1=20=EC=8B=9C=20=EB=AC=B4?=
 =?UTF-8?q?=ED=86=B5=EC=9E=A5=EC=9E=85=EA=B8=88/=ED=8F=AC=EC=9D=B8?=
 =?UTF-8?q?=ED=8A=B8=EA=B2=B0=EC=A0=9C=20=EC=95=88=EB=82=B4=20=EA=B4=80?=
 =?UTF-8?q?=EB=A0=A8=20=EC=8A=A4=ED=83=80=EC=9D=BC=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 css/default_shop.css | 3 +++
 shop/orderform.php   | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/css/default_shop.css b/css/default_shop.css
index 7c69cabdd..f4d7c75f4 100644
--- a/css/default_shop.css
+++ b/css/default_shop.css
@@ -710,6 +710,9 @@ a.btn_admin:focus, a.btn_admin:hover {text-decoration:none}
 
 #sod_frm #od_memo {height:50px}
 
+#sod_frm_pt {margin:10px 0 5px}
+#sod_frm_pt_alert {margin:0 0 10px}
+
 #sod_frm_pay {position:relative}
 #sod_frm_pay h2 {margin:0 0 10px}
 #sod_frm_pay .basic_tbl th {width:auto !important;font-weight:bold;text-align:center !important}
diff --git a/shop/orderform.php b/shop/orderform.php
index e6e7011d5..3b4e452e9 100644
--- a/shop/orderform.php
+++ b/shop/orderform.php
@@ -889,7 +889,7 @@ function get_intall_file()
 
         <?php
         if (!$default['de_card_point'])
-            echo '<p><strong>무통장입금</strong> 이외의 결제 수단으로 결제하시는 경우 포인트를 적립해드리지 않습니다.</p>';
+            echo '<p id="sod_frm_pt_alert"><strong>무통장입금</strong> 이외의 결제 수단으로 결제하시는 경우 포인트를 적립해드리지 않습니다.</p>';
 
         $multi_settle == 0;
         $checked = '';
@@ -957,7 +957,7 @@ function get_intall_file()
                 $point_unit = (int)$default['de_settle_point_unit'];
                 $temp_point = (int)((int)($temp_point / $point_unit) * $point_unit);
         ?>
-            <p>보유포인트(<?php echo display_point($member['mb_point']); ?>)중 <strong id="use_max_point">최대 <?php echo display_point($temp_point); ?></strong>까지 사용 가능</p>
+            <p id="sod_frm_pt">보유포인트(<?php echo display_point($member['mb_point']); ?>)중 <strong id="use_max_point">최대 <?php echo display_point($temp_point); ?></strong>까지 사용 가능</p>
             <input type="hidden" name="max_temp_point" value="<?php echo $temp_point; ?>">
             <label for="od_temp_point">사용 포인트</label>
             <input type="text" name="od_temp_point" value="0" id="od_temp_point" class="frm_input" size="10">점 (<?php echo $point_unit; ?>점 단위로 입력하세요.)

From 2658fbe02db49a59360855c11c71ec18434681b2 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Wed, 15 Jan 2014 13:31:30 +0900
Subject: [PATCH 15/17] =?UTF-8?q?uq=5Fid=20=EB=85=84=EB=8F=84=204=EC=9E=90?=
 =?UTF-8?q?=EB=A6=AC=20=ED=91=9C=EC=8B=9C=EB=A1=9C=20=EB=B3=80=EA=B2=BD?=
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 b16e8d2df..638a249e8 100644
--- a/lib/common.lib.php
+++ b/lib/common.lib.php
@@ -1930,7 +1930,7 @@ function get_uniqid()
     sql_query(" LOCK TABLE {$g5['uniqid_table']} WRITE ");
     while (1) {
         // 년월일시분초에 100분의 1초 두자리를 추가함 (1/100 초 앞에 자리가 모자르면 0으로 채움)
-        $key = date('ymdHis', time()) . str_pad((int)(microtime()*100), 2, "0", STR_PAD_LEFT);
+        $key = date('YmdHis', time()) . str_pad((int)(microtime()*100), 2, "0", STR_PAD_LEFT);
 
         $result = sql_query(" insert into {$g5['uniqid_table']} set uq_id = '$key', uq_ip = '{$_SERVER['REMOTE_ADDR']}' ", false);
         if ($result) break; // 쿼리가 정상이면 빠진다.

From 4f980797d4b19a1128f7e0319c09378fd6adb870 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Wed, 15 Jan 2014 13:57:59 +0900
Subject: [PATCH 16/17] =?UTF-8?q?=EC=9D=B4=EB=B2=A4=ED=8A=B8=EC=9D=BC?=
 =?UTF-8?q?=EA=B4=84=EC=B2=98=EB=A6=AC=20=EC=9D=B4=EB=B2=A4=ED=8A=B8=20?=
 =?UTF-8?q?=EC=84=A0=ED=83=9D=ED=95=98=EC=A7=80=20=EC=95=8A=EC=95=98?=
 =?UTF-8?q?=EC=9D=84=20=EB=95=8C=20=EC=9E=90=EB=B0=94=EC=8A=A4=ED=81=AC?=
 =?UTF-8?q?=EB=A6=BD=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/shop_admin/itemeventlist.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/adm/shop_admin/itemeventlist.php b/adm/shop_admin/itemeventlist.php
index 1a952abab..dabf6beab 100644
--- a/adm/shop_admin/itemeventlist.php
+++ b/adm/shop_admin/itemeventlist.php
@@ -201,7 +201,6 @@ function fitemeventlistupdatecheck(f)
     if (!f.ev_id.value)
     {
         alert('이벤트를 선택하세요');
-        document.flist.ev_id.focus();
         return false;
     }
 

From be4961afd60694083467eeeba021739d14af9b06 Mon Sep 17 00:00:00 2001
From: whitedot <whitedot@naver.com>
Date: Wed, 15 Jan 2014 14:08:27 +0900
Subject: [PATCH 17/17] =?UTF-8?q?=EC=87=BC=ED=95=91=EB=AA=B0=EA=B4=80?=
 =?UTF-8?q?=EB=A6=AC=EC=9E=90:=20SMS=20=EB=AC=B8=EC=9E=90=EC=A0=84?=
 =?UTF-8?q?=EC=86=A1,=20=EC=98=88=EC=95=BD=EB=B0=9C=EC=86=A1=20=EC=95=88?=
 =?UTF-8?q?=EB=82=B4=20=EB=AC=B8=EA=B5=AC=20min-width=20=EA=B0=92=20?=
 =?UTF-8?q?=EC=A1=B0=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 css/admin.css | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/css/admin.css b/css/admin.css
index c07482ff1..9c9e87fb5 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -735,6 +735,8 @@ strong.sodr_nonpay {display:block;padding:5px 0;text-align:right}
 #sms_sm_text {position:absolute;top:75px;left:27px;width:180px;color:#fff;font-size:2em;word-break:break-all}
 #sms_sm p {position:absolute;bottom:-70px;left:0;font-size:0.95em;letter-spacing:-0.1em}
 
+#sms_send .local_desc01 {min-width:320px}
+
 /* 가격비교사이트 */
 #anc_pricecompare_info li {margin:5px 0}