From 10cfd38754323871703d7f22041122b26cbb6198 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Tue, 29 Jan 2013 17:06:06 +0900
Subject: [PATCH 1/9] =?UTF-8?q?popup=5Flarge=5Fimage=20=ED=95=A8=EC=88=98?=
 =?UTF-8?q?=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 js/shop.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/js/shop.js b/js/shop.js
index 64801f872..8ce6333d5 100644
--- a/js/shop.js
+++ b/js/shop.js
@@ -2,11 +2,10 @@ if (typeof(SHOP_JS) == 'undefined') { // 한번만 실행
     var SHOP_JS = true;
 
     // 큰이미지 창
-    function popup_large_image(it_id, img, width, height, cart_dir)
+    function popup_large_image(url, width, height)
     {
         var top = 10;
         var left = 10;
-        url = cart_dir+"/largeimage.php?it_id=" + it_id + "&img=" + img;
         width = width + 50;
         height = height + 100;
         opt = 'scrollbars=yes,width='+width+',height='+height+',top='+top+',left='+left;

From 63f8c9d5a51cffb0a4251df7ba9920b1ec54d583 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Tue, 29 Jan 2013 17:06:48 +0900
Subject: [PATCH 2/9] =?UTF-8?q?get=5Flarge=5Fimage=20=ED=95=A8=EC=88=98=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/shop.lib.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/shop.lib.php b/lib/shop.lib.php
index e0dad79a5..68dd1ba72 100644
--- a/lib/shop.lib.php
+++ b/lib/shop.lib.php
@@ -211,12 +211,12 @@ function get_large_image($img, $it_id, $btn_image=true)
 {
     global $g4;
 
-    if (file_exists("$g4[path]/data/item/$img") && $img != "")
+    if (file_exists(G4_DATA_PATH."/item/$img") && $img != "")
     {
-        $size   = getimagesize("$g4[path]/data/item/$img");
+        $size   = getimagesize(G4_DATA_PATH."/item/$img");
         $width  = $size[0];
         $height = $size[1];
-        $str = "<a href=\"javascript:popup_large_image('$it_id', '$img', $width, $height, '$g4[shop_path]')\">";
+        $str = "<a href=\"".G4_SHOP_URL."/largeimage.php?it_id=".$it['it_id']."&amp;img=".$img."\" target=\"_blank\" onclick=\"popup_large_image(this.href, $width, $height); return false;\">";
         if ($btn_image)
             $str .= "<img src='$g4[shop_img_path]/btn_zoom.gif' border='0'></a>";
     }

From 40a65d798c59aba976f637e54ad17783827842b1 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Tue, 29 Jan 2013 17:08:52 +0900
Subject: [PATCH 3/9] =?UTF-8?q?=EC=98=A4=EB=8A=98=EB=B3=B8=EC=83=81?=
 =?UTF-8?q?=ED=92=88=20=EC=8D=B8=EB=84=A4=EC=9D=BC=20=EC=83=9D=EC=84=B1?=
 =?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

---
 shop/boxtodayview.inc.php | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/shop/boxtodayview.inc.php b/shop/boxtodayview.inc.php
index 9f0bd6f81..bd5729696 100644
--- a/shop/boxtodayview.inc.php
+++ b/shop/boxtodayview.inc.php
@@ -1,4 +1,6 @@
 <?
+include_once(G4_LIB_PATH.'/thumbnail.lib.php');
+
 $tv_idx = get_session("ss_tv_idx");
 
 $tv_div[top] = 0;
@@ -54,9 +56,18 @@ echo "\n";
 for ($i=1; $i<=$tv_idx; $i++)
 {
     $tv_it_id = get_session("ss_tv[$i]");
-    $rowx = sql_fetch(" select it_name from $g4[yc4_item_table] where it_id = '$tv_it_id' ");
+    $sqlx = " select it_name, it_img1, it_img2, it_img3, it_img4, it_img5, it_img6, it_img7, it_img8, it_img9, it_img10
+                from $g4[yc4_item_table] where it_id = '$tv_it_id' ";
+    $rowx = sql_fetch($sqlx);
     $it_name = get_text(addslashes($rowx['it_name']));
-    $img = get_it_image($tv_it_id."_s", $tv_div['img_width'], $tv_div['img_height'], $tv_it_id);
+    $tv_filepath = G4_DATA_PATH.'/item/'.$tv_it_id;
+    for($k=1;$k<=10;$k++) {
+        $tv_filename = $rowx['it_img'.$k];
+        if(file_exists($tv_filepath.'/'.$tv_filename) && $tv_filename != "")
+            break;
+    }
+    $tv_it_img = $tv_it_id.'/'.it_img_thumb($tv_filename, $tv_filepath, $tv_div['img_width'], $tv_div['img_height']);
+    $img = get_it_image($tv_it_img, $tv_div['img_width'], $tv_div['img_height'], $tv_it_id);
     $img = preg_replace("/\<a /", "<a title='$it_name' ", $img);
     echo "goods_link[$i] = \"{$img}<br/><span class=small>".cut_str($it_name,10,"")."</span>\";\n";
 }

From 2c8eacde839568d5814c59441f48a86ba1c82727 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Tue, 29 Jan 2013 17:09:39 +0900
Subject: [PATCH 4/9] =?UTF-8?q?=EC=83=81=ED=92=88=EC=9D=B4=EB=AF=B8?=
 =?UTF-8?q?=EC=A7=80=20G4=20=EA=B2=BD=EB=A1=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shop/largeimage.php | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/shop/largeimage.php b/shop/largeimage.php
index 3d40da0ae..3ffefeb78 100644
--- a/shop/largeimage.php
+++ b/shop/largeimage.php
@@ -1,29 +1,33 @@
 <?
 include_once("./_common.php");
 
-$sql = " select it_name from $g4[yc4_item_table] where it_id='$it_id' ";
+$sql = " select it_name, it_img1, it_img2, it_img3, it_img4, it_img5, it_img6, it_img7, it_img8, it_img9, it_img10
+            from $g4[yc4_item_table]
+            where it_id='$it_id' ";
 $row = sql_fetch_array(sql_query($sql));
 
-$imagefile = "$g4[path]/data/item/$img";
+$imagefile = G4_DATA_PATH."/item/$img";
+$imagefile_url = G4_DATA_URL."/item/$img";
 $size = getimagesize($imagefile);
 
-$g4[title] = "$row[it_name] ($it_id)";
-include_once("$g4[path]/head.sub.php");
+$g4['title'] = "{$row['it_name']} ($it_id)";
+include_once(G4_PATH.'/head.sub.php');
 ?>
 <br>
 <div align=center>
-    <a href='#' onclick='window.close();'><img id='largeimage' src='<?=$imagefile?>' width='<?=$size[0]?>' height='<?=$size[1]?>' alt='<?=$row[it_name]?>' border=0 style='border:1 solid #E4E4E4;'></a>
+    <a href='#' onclick='window.close();'><img id='largeimage' src='<?=$imagefile_url?>' width='<?=$size[0]?>' height='<?=$size[1]?>' alt='<?=$row['it_name']?>' border=0 style='border:1 solid #E4E4E4;'></a>
 </div>
 <p>
 <table width=100% cellpadding=0 cellspacing=0>
 <tr>
-    <td width=30% align=center><a href='#' onclick='window.close();'><img src='<? echo "$g4[shop_img_path]/" ?>/btn_close.gif' border=0 alt="창닫기"></a></td>
+    <td width=30% align=center><a href='#' onclick='window.close();'><img src='<? echo G4_SHOP_IMG_URL; ?>/btn_close.gif' border=0 alt="창닫기"></a></td>
     <td width=70% align=right>
         <?
-        for ($i=1; $i<=5; $i++)
+        for ($i=1; $i<=10; $i++)
         {
-            if (file_exists("$g4[path]/data/item/{$it_id}_l{$i}"))
-                echo "<img id='large{$i}' src='$g4[path]/data/item/{$it_id}_l{$i}' border=0 width=50 height=50 style='border:1 solid #E4E4E4;'
+            $filename = $row['it_img'.$i];
+            if (file_exists(G4_DATA_PATH."/item/{$it_id}/{$filename}") && $filename != "")
+                echo "<img id='large{$i}' src='".G4_DATA_URL."/item/{$it_id}/{$filename}' border=0 width=50 height=50 style='border:1 solid #E4E4E4;'
                     onmouseover=\"document.getElementById('largeimage').src=document.getElementById('large{$i}').src;\"> &nbsp;";
         }
         ?>
@@ -31,5 +35,5 @@ include_once("$g4[path]/head.sub.php");
 </tr>
 </table>
 <?
-include_once("$g4[path]/tail.sub.php");
+include_once(G4_PATH.'/tail.sub.php');
 ?>
\ No newline at end of file

From 686021e9754463f670354c716e4e685fc1f44b3b Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Tue, 29 Jan 2013 17:12:29 +0900
Subject: [PATCH 5/9] =?UTF-8?q?=EC=A4=91=EA=B0=84=EC=9D=B4=EB=AF=B8?=
 =?UTF-8?q?=EC=A7=80=20=EC=8D=B8=EB=84=A4=EC=9D=BC=EC=83=9D=EC=84=B1=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

---
 shop/item.php | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/shop/item.php b/shop/item.php
index 4828f7771..570881985 100644
--- a/shop/item.php
+++ b/shop/item.php
@@ -1,5 +1,6 @@
 <?
 include_once('./_common.php');
+include_once(G4_LIB_PATH.'/thumbnail.lib.php');
 
 // 불법접속을 할 수 없도록 세션에 아무값이나 저장하여 hidden 으로 넘겨서 다음 페이지에서 비교함
 $token = md5(uniqid(rand(), true));
@@ -70,10 +71,6 @@ else
 $ca_id = $it['ca_id'];
 include G4_SHOP_PATH.'/navigation1.inc.php';
 
-$himg = G4_DATA_PATH.'/item/'.$it_id.'_h';
-if (file_exists($himg))
-    echo '<img src="'.$himg.'" border="0"><br>';
-
 // 상단 HTML
 echo stripslashes($it['it_head_html']);
 
@@ -179,26 +176,33 @@ else
 
     <!-- 상품중간이미지 -->
     <?
-    $middle_image = $it['it_id']."_m";
+    $filepath = G4_DATA_PATH.'/item/'.$it['it_id'];
+    for($i=1; $i<=10; $i++) {
+        if(file_exists($filepath.'/'.$it['it_img'.$i]) && $it['it_img'.$i] != "") {
+            $filename = $it['it_img'.$i];
+            break;
+        }
+    }
+
+    $middle_image = $it['it_id'].'/'.it_img_thumb($filename, $filepath, $default['de_mimg_width'], $default['de_mimg_height']);
     ?>
     <td align=center valign=top>
         <table cellpadding=0 cellspacing=0>
             <tr><td height=22></td></tr>
             <tr><td colspan=3 align=center>
-                <table cellpadding=1 cellspacing=0 bgcolor=#E4E4E4><tr><td><?=get_large_image($it['it_id']."_l1", $it['it_id'], false)?><?=get_it_image($middle_image);?></a></td></tr></table></td></tr>
+                <table cellpadding=1 cellspacing=0 bgcolor=#E4E4E4><tr><td><?=get_large_image($it['it_id'].'/'.$filename, $it['it_id'], false)?><?=get_it_image($middle_image);?></a></td></tr></table></td></tr>
             <tr><td colspan=3 height=10></td></tr>
             <tr>
                 <td colspan=3 align=center>
                 <?
-                for ($i=1; $i<=5; $i++)
+                for ($i=1; $i<=10; $i++)
                 {
-                    if (file_exists(G4_DATA_PATH."/item/{$it_id}_l{$i}"))
+                    $filename = $it['it_img'.$i];
+
+                    if (file_exists($filepath.'/'.$filename) && $filename != "")
                     {
-                        echo get_large_image("{$it_id}_l{$i}", $it['it_id'], false);
-                        if ($i==1 && file_exists(G4_DATA_PATH."/item/{$it_id}_m"))
-                            echo "<img id='middle{$i}' src='".G4_DATA_URL."/item/{$it_id}_m' border=0 width=40 height=40 style='border:1px solid #E4E4E4;' ";
-                        else
-                            echo "<img id='middle{$i}' src='".G4_DATA_URL."/item/{$it_id}_l{$i}' border=0 width=40 height=40 style='border:1px solid #E4E4E4;' ";
+                        echo get_large_image($it['it_id'].'/'.$filename, $it['it_id'], false);
+                        echo "<img id='middle{$i}' src='".G4_DATA_URL."/item/{$it_id}/{$filename}' border=0 width=40 height=40 style='border:1px solid #E4E4E4;' ";
                         echo " onmouseover=\"document.getElementById('$middle_image').src=document.getElementById('middle{$i}').src;\">";
                         echo "</a> &nbsp;";
                     }
@@ -1113,10 +1117,6 @@ $(function() {
 // 하단 HTML
 echo stripslashes($it['it_tail_html']);
 
-$timg = G4_DATA_PATH."/item/{$it_id}_t";
-if (file_exists($timg))
-    echo "<img src='$timg' border=0><br>";
-
 if ($ca['ca_include_tail'])
     @include_once($ca['ca_include_tail']);
 else

From 7c05894de22d26c91073dac77cc5f8692807b349 Mon Sep 17 00:00:00 2001
From: gnuboard <kagla@naver.com>
Date: Tue, 29 Jan 2013 17:28:40 +0900
Subject: [PATCH 6/9] =?UTF-8?q?=EB=A9=94=EC=9D=BC=EB=B3=B4=EB=82=B4?=
 =?UTF-8?q?=EA=B8=B0=20=EA=B2=BD=EB=A1=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/js/common.js b/js/common.js
index 2585b29ab..06728a068 100644
--- a/js/common.js
+++ b/js/common.js
@@ -311,9 +311,9 @@ function win_comment(url)
 function win_formmail(mb_id, name, email)
 {
     if (g4_charset.toLowerCase() == 'euc-kr')
-        win_open(g4_path+"/" + g4_bbs + "/formmail.php?mb_id="+mb_id+"&name="+name+"&email="+email, "winFormmail", "left=50, top=50, width=600, height=500, scrollbars=0");
+        win_open(g4_bbs_url+"/formmail.php?mb_id="+mb_id+"&name="+name+"&email="+email, "winFormmail", "left=50, top=50, width=600, height=500, scrollbars=0");
     else
-        win_open(g4_path+"/" + g4_bbs + "/formmail.php?mb_id="+mb_id+"&name="+encodeURIComponent(name)+"&email="+email, "winFormmail", "left=50, top=50, width=600, height=480, scrollbars=0");
+        win_open(g4_bbs_url+"/formmail.php?mb_id="+mb_id+"&name="+encodeURIComponent(name)+"&email="+email, "winFormmail", "left=50, top=50, width=600, height=480, scrollbars=0");
 }
 
 // 자기소개 창

From a370c9b06e195c6f9ae7b0616954a9dd879e85b3 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Tue, 29 Jan 2013 17:40:22 +0900
Subject: [PATCH 7/9] =?UTF-8?q?=EC=A0=9C=EB=AA=A9=20=EC=A4=84=EC=9E=84?=
 =?UTF-8?q?=ED=95=A8=EC=88=98=EB=A5=BC=20cut=5Fstr=20=EB=A1=9C=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 skin/board/neo/view.skin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/skin/board/neo/view.skin.php b/skin/board/neo/view.skin.php
index 493641215..8d5f73413 100644
--- a/skin/board/neo/view.skin.php
+++ b/skin/board/neo/view.skin.php
@@ -7,7 +7,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
 <div id="bo_v" class="cbg">
     <h1 id="bo_v_h1">
         <? if ($category_name) { // 분류가 지정되었다면 ?><span><?=($category_name ? "{$view['ca_name']} " : "");?></span><? } // 분류 출력 끝 ?>
-        <?=cut_hangul_last(get_text($view['wr_subject'])) // 글제목 출력?>
+        <?=cut_str(get_text($view['wr_subject']), 70) // 글제목 출력?>
     </h1>
 
     <section id="bo_v_info">

From d8cfc021e1f5691a53b49e0895ca87e4eb3124b7 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Tue, 29 Jan 2013 17:44:18 +0900
Subject: [PATCH 8/9] =?UTF-8?q?html5.js=20=EA=B2=BD=EB=A1=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

---
 head.sub.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/head.sub.php b/head.sub.php
index 975ed12bc..bf523464a 100644
--- a/head.sub.php
+++ b/head.sub.php
@@ -42,7 +42,7 @@ else $g4_css = "default";
 <link rel="stylesheet" href="<?=G4_CSS_URL?>/<?=$g4_css?>.css?=<?=date("md")?>">
 <?}?>
 <!--[if lte IE 8]>
-<script src="<?=$g4['url']?>/js/html5.js"></script>
+<script src="<?=G4_JS_URL?>/html5.js"></script>
 <![endif]-->
 <script>
 // 자바스크립트에서 사용하는 전역변수 선언
@@ -56,11 +56,7 @@ var g4_charset   = "<?=$g4['charset']?>";
 var g4_cookie_domain = "<?=$g4['cookie_domain']?>";
 var g4_is_gecko  = navigator.userAgent.toLowerCase().indexOf("gecko") != -1;
 var g4_is_ie     = navigator.userAgent.toLowerCase().indexOf("msie") != -1;
-<? 
-if ($is_admin) { 
-    echo PHP_EOL.'var g4_admin_url = "'.G4_ADMIN_URL.'";';
-} 
-?>
+<? if ($is_admin) { echo "var g4_admin = '{$g4['admin']}';"; } ?>
 </script>
 <script src="<?=G4_JS_URL?>/jquery-1.8.3.min.js"></script>
 <script src="<?=G4_JS_URL?>/common.js"></script>

From 59b9cbc9c25f67e837f64990ea2b7b68d89d5068 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Tue, 29 Jan 2013 17:46:12 +0900
Subject: [PATCH 9/9] =?UTF-8?q?=EC=83=81=EB=8B=A8=20=EA=B4=80=EB=A6=AC?=
 =?UTF-8?q?=EC=9E=90=20=EB=A9=94=EB=89=B4=20=EB=A7=81=ED=81=AC=20=EA=B2=BD?=
 =?UTF-8?q?=EB=A1=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/head.php b/head.php
index cb23f8712..d269f8148 100644
--- a/head.php
+++ b/head.php
@@ -23,7 +23,7 @@ include_once(G4_LIB_PATH.'/popular.lib.php');
             <li><a href="<?=G4_BBS_URL?>/current_connect.php">현재접속자 <?=connect(); // 현재 접속자수 ?></a></li>
             <li><a href="<?=G4_BBS_URL?>/new.php">최근게시물</a></li>
             <? if ($is_member) { ?>
-            <? if ($is_admin) { ?><li><a href="<?=G4_ADM_URL?>">관리자</a></li><? } ?>
+            <? if ($is_admin) { ?><li><a href="<?=G4_ADMIN_URL?>">관리자</a></li><? } ?>
             <li><a href="<?=G4_BBS_URL?>/member_confirm.php?url=<?=G4_BBS_URL?>/register_form.php">정보수정</a></li>
             <li><a href="<?=G4_BBS_URL?>/logout.php">로그아웃</a></li>
             <? } else { ?>