From ecc8b3b5f42212bfd56d1ffcffb7cf0e2b989cce Mon Sep 17 00:00:00 2001 From: chicpro Date: Wed, 2 Oct 2013 15:47:01 +0900 Subject: [PATCH 1/6] =?UTF-8?q?=EC=82=AC=EC=9A=A9=ED=9B=84=EA=B8=B0=20?= =?UTF-8?q?=EC=83=81=ED=92=88=EB=AC=B8=EC=9D=98=20=EC=9D=B4=EB=AF=B8?= =?UTF-8?q?=EC=A7=80=20=EB=A6=AC=EC=82=AC=EC=9D=B4=EC=A6=88=20=EC=8A=A4?= =?UTF-8?q?=ED=81=AC=EB=A6=BD=ED=8A=B8=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/iteminfoimageresize.js | 44 +++++++++++++++++++++ mobile/skin/shop/basic/itemqa.skin.php | 8 +++- mobile/skin/shop/basic/itemqalist.skin.php | 8 +++- mobile/skin/shop/basic/itemuse.skin.php | 10 ++++- mobile/skin/shop/basic/itemuselist.skin.php | 8 +++- skin/shop/basic/itemqa.skin.php | 8 +++- skin/shop/basic/itemqalist.skin.php | 8 +++- skin/shop/basic/itemuse.skin.php | 8 +++- skin/shop/basic/itemuselist.skin.php | 8 +++- 9 files changed, 101 insertions(+), 9 deletions(-) create mode 100644 js/iteminfoimageresize.js diff --git a/js/iteminfoimageresize.js b/js/iteminfoimageresize.js new file mode 100644 index 000000000..4d15c89ec --- /dev/null +++ b/js/iteminfoimageresize.js @@ -0,0 +1,44 @@ +(function($) { + $.fn.iteminfoimageresize = function(selector) + { + var cfg = { + selector: "img" + }; + + if(typeof selector == "object") { + cfg = $.extend(cfg, selector); + } else { + if(selector) { + cfg = $.extend({ selector: selector }); + } + } + + var $img = this.find(cfg.selector); + var $this = this; + + function image_resize() + { + var width = $this.width(); + + $img.each(function() { + $(this).removeAttr("width") + .removeAttr("height") + .css("width","") + .css("height", ""); + + if($(this).data("width") == undefined) + $(this).data("width", $(this).width()); + + if($(this).data("width") > width) { + $(this).css("width", "100%"); + } + }); + } + + $(window).on("resize", function() { + image_resize(); + }); + + image_resize(); + } +}(jQuery)); \ No newline at end of file diff --git a/mobile/skin/shop/basic/itemqa.skin.php b/mobile/skin/shop/basic/itemqa.skin.php index a4f8859a4..c48fbe95d 100644 --- a/mobile/skin/shop/basic/itemqa.skin.php +++ b/mobile/skin/shop/basic/itemqa.skin.php @@ -3,6 +3,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 ?> +
@@ -110,7 +111,12 @@ $(function(){ $con.slideUp(); } else { $(".sit_qa_con:visible").hide(); - $con.slideDown(); + $con.slideDown( + function() { + // 이미지 리사이즈 + $con.iteminfoimageresize(); + } + ); } }); diff --git a/mobile/skin/shop/basic/itemqalist.skin.php b/mobile/skin/shop/basic/itemqalist.skin.php index 824f23d1d..37d87b827 100644 --- a/mobile/skin/shop/basic/itemqalist.skin.php +++ b/mobile/skin/shop/basic/itemqalist.skin.php @@ -3,6 +3,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 ?> +
@@ -111,7 +112,12 @@ $(function(){ } else { $(".sqa_con_btn button").text("보기"); $("div[id^=sqa_con]:visible").hide(); - $con.slideDown(); + $con.slideDown( + function() { + // 이미지 리사이즈 + $con.iteminfoimageresize(); + } + ); $(this).text("닫기"); } }); diff --git a/mobile/skin/shop/basic/itemuse.skin.php b/mobile/skin/shop/basic/itemuse.skin.php index 9080d7d85..9acad155a 100644 --- a/mobile/skin/shop/basic/itemuse.skin.php +++ b/mobile/skin/shop/basic/itemuse.skin.php @@ -3,6 +3,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 ?> +
@@ -28,7 +29,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 ?>
  • - +
    작성자
    @@ -90,7 +91,12 @@ $(function(){ $con.slideUp(); } else { $(".sit_use_con:visible").hide(); - $con.slideDown(); + $con.slideDown( + function() { + // 이미지 리사이즈 + $con.iteminfoimageresize(); + } + ); } }); diff --git a/mobile/skin/shop/basic/itemuselist.skin.php b/mobile/skin/shop/basic/itemuselist.skin.php index 34762d29b..291d3662b 100644 --- a/mobile/skin/shop/basic/itemuselist.skin.php +++ b/mobile/skin/shop/basic/itemuselist.skin.php @@ -3,6 +3,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 ?> + @@ -91,7 +92,12 @@ $(function(){ } else { $(".sps_con_btn button").text("보기"); $("div[id^=sps_con]:visible").hide(); - $con.slideDown(); + $con.slideDown( + function() { + // 이미지 리사이즈 + $con.iteminfoimageresize(); + } + ); $(this).text("닫기"); } }); diff --git a/skin/shop/basic/itemqa.skin.php b/skin/shop/basic/itemqa.skin.php index ab918864d..bb810c8b3 100644 --- a/skin/shop/basic/itemqa.skin.php +++ b/skin/shop/basic/itemqa.skin.php @@ -3,6 +3,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 ?> +
    @@ -110,7 +111,12 @@ $(function(){ $con.slideUp(); } else { $(".sit_qa_con:visible").hide(); - $con.slideDown(); + $con.slideDown( + function() { + // 이미지 리사이즈 + $con.iteminfoimageresize(); + } + ); } }); diff --git a/skin/shop/basic/itemqalist.skin.php b/skin/shop/basic/itemqalist.skin.php index c6b685faf..5fb7a9e0a 100644 --- a/skin/shop/basic/itemqalist.skin.php +++ b/skin/shop/basic/itemqalist.skin.php @@ -3,6 +3,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 ?> + @@ -112,7 +113,12 @@ $(function(){ } else { $(".sqa_con_btn button").text("보기"); $("div[id^=sqa_con]:visible").hide(); - $con.slideDown(); + $con.slideDown( + function() { + // 이미지 리사이즈 + $con.iteminfoimageresize(); + } + ); $(this).text("닫기"); } }); diff --git a/skin/shop/basic/itemuse.skin.php b/skin/shop/basic/itemuse.skin.php index 15c559a5f..5d0ed50c0 100644 --- a/skin/shop/basic/itemuse.skin.php +++ b/skin/shop/basic/itemuse.skin.php @@ -3,6 +3,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 ?> +
    @@ -89,7 +90,12 @@ $(function(){ $con.slideUp(); } else { $(".sit_use_con:visible").hide(); - $con.slideDown(); + $con.slideDown( + function() { + // 이미지 리사이즈 + $con.iteminfoimageresize(); + } + ); } }); diff --git a/skin/shop/basic/itemuselist.skin.php b/skin/shop/basic/itemuselist.skin.php index c8cfd08e8..57f3062b3 100644 --- a/skin/shop/basic/itemuselist.skin.php +++ b/skin/shop/basic/itemuselist.skin.php @@ -3,6 +3,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 ?> + @@ -90,7 +91,12 @@ $(function(){ } else { $(".sps_con_btn button").text("보기"); $("div[id^=sps_con]:visible").hide(); - $con.slideDown(); + $con.slideDown( + function() { + // 이미지 리사이즈 + $con.iteminfoimageresize(); + } + ); $(this).text("닫기"); } }); From 23fd49704127999db3532f5c0ec39fd7d449a148 Mon Sep 17 00:00:00 2001 From: chicpro Date: Wed, 2 Oct 2013 17:28:59 +0900 Subject: [PATCH 2/6] =?UTF-8?q?=EB=A6=AC=EC=82=AC=EC=9D=B4=EC=A6=88=20?= =?UTF-8?q?=EC=8B=A4=ED=96=89=EC=8B=9C=20width=20=EA=B5=AC=ED=95=98?= =?UTF-8?q?=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 --- js/viewimageresize.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/js/viewimageresize.js b/js/viewimageresize.js index 40e436143..7893ae45c 100644 --- a/js/viewimageresize.js +++ b/js/viewimageresize.js @@ -14,10 +14,12 @@ } var $img = this.find(cfg.selector); - var width = this.width(); + var $this = this; function image_resize() { + var width = $this.width(); + $img.each(function() { $(this).removeAttr("width") .removeAttr("height") From a3ea9ebee9e63dadd55361868ac3b8f0005b4615 Mon Sep 17 00:00:00 2001 From: whitedot Date: Wed, 2 Oct 2013 18:36:10 +0900 Subject: [PATCH 3/6] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20btn=5Ffrmlin?= =?UTF-8?q?e=20=EA=B8=80=EC=9E=90=EC=83=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/default.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/default.css b/css/default.css index d47a49703..254dd2fce 100644 --- a/css/default.css +++ b/css/default.css @@ -138,7 +138,7 @@ fieldset .btn_submit {height:22px;font-size:1em} .btn_cancel {display:inline-block;padding:0 10px;height:22px;border:1px solid #ccc;background:#fafafa;line-height:2em} button.btn_cancel {display:inline-block;padding:0 10px;height:24px;border:1px solid #ccc;background:#fafafa;line-height:2em} .btn_cancel:focus, .btn_cancel:hover {text-decoration:none !important} -.btn_frmline {display:inline-block;padding:0 7px 0 5px;height:22px;border:0;background:#333;color:#fff;letter-spacing:-0.1em;text-decoration:none;vertical-align:top;line-height:2em} /* 우편번호검색버튼 등 */ +a.btn_frmline, button.btn_frmline {display:inline-block;padding:0 7px 0 5px;height:22px;border:0;background:#333;color:#fff;letter-spacing:-0.1em;text-decoration:none;vertical-align:top;line-height:2em} /* 우편번호검색버튼 등 */ button.btn_frmline {font-size:1em} .btn_win {clear:both;margin-bottom:20px;text-align:center} /* 새창용 */ .btn_win button {display:inline-block;padding:0 10px;height:30px;border:0;background:#666;color:#fff;vertical-align:top;line-height:2em;cursor:pointer} From 09215c8b39778ac08f9dda14cf1721b7af9d29ec Mon Sep 17 00:00:00 2001 From: whitedot Date: Wed, 2 Oct 2013 18:38:10 +0900 Subject: [PATCH 4/6] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20btn=5Ffrmlin?= =?UTF-8?q?e=20=EA=B8=80=EC=9E=90=EC=83=89=20=EA=B2=8C=EC=8B=9C=ED=8C=90?= =?UTF-8?q?=EC=8A=A4=ED=82=A8=20=EC=8A=A4=ED=83=80=EC=9D=BC=EC=97=90?= =?UTF-8?q?=EB=8F=84=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- skin/board/basic/style.css | 2 +- skin/board/gallery/style.css | 2 +- skin/member/basic/style.css | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/skin/board/basic/style.css b/skin/board/basic/style.css index bb7195191..2b9363fc5 100644 --- a/skin/board/basic/style.css +++ b/skin/board/basic/style.css @@ -26,7 +26,7 @@ #bo_w .btn_cancel {display:inline-block;padding:0 10px;height:22px;border:1px solid #ccc;background:#fafafa;line-height:2em} #bo_w button.btn_cancel {display:inline-block;padding:0 10px;height:24px;border:1px solid #ccc;background:#fafafa;line-height:2em} #bo_w .btn_cancel:focus, #bo_w .btn_cancel:hover {text-decoration:none !important} -#bo_w .btn_frmline {display:inline-block;padding:0 7px 0 5px;height:22px;border:0;background:#333;color:#fff;letter-spacing:-0.1em;text-decoration:none;vertical-align:top;line-height:2em} /* 우편번호검색버튼 등 */ +#bo_w a.btn_frmline, #bo_w button.btn_frmline, {display:inline-block;padding:0 7px 0 5px;height:22px;border:0;background:#333;color:#fff;letter-spacing:-0.1em;text-decoration:none;vertical-align:top;line-height:2em} /* 우편번호검색버튼 등 */ #bo_w button.btn_frmline {font-size:1em} /* 기본 테이블 */ diff --git a/skin/board/gallery/style.css b/skin/board/gallery/style.css index a5471fb4d..d1b4e3018 100644 --- a/skin/board/gallery/style.css +++ b/skin/board/gallery/style.css @@ -26,7 +26,7 @@ #bo_w .btn_cancel {display:inline-block;padding:0 10px;height:22px;border:1px solid #ccc;background:#fafafa;line-height:2em} #bo_w button.btn_cancel {display:inline-block;padding:0 10px;height:24px;border:1px solid #ccc;background:#fafafa;line-height:2em} #bo_w .btn_cancel:focus, #bo_w .btn_cancel:hover {text-decoration:none !important} -#bo_w .btn_frmline {display:inline-block;padding:0 7px 0 5px;height:22px;border:0;background:#333;color:#fff;letter-spacing:-0.1em;text-decoration:none;vertical-align:top;line-height:2em} /* 우편번호검색버튼 등 */ +#bo_w a.btn_frmline, #bo_w button.btn_frmline {display:inline-block;padding:0 7px 0 5px;height:22px;border:0;background:#333;color:#fff;letter-spacing:-0.1em;text-decoration:none;vertical-align:top;line-height:2em} /* 우편번호검색버튼 등 */ #bo_w button.btn_frmline {font-size:1em} /* 기본 테이블 */ diff --git a/skin/member/basic/style.css b/skin/member/basic/style.css index 830cecf90..090d70283 100644 --- a/skin/member/basic/style.css +++ b/skin/member/basic/style.css @@ -13,7 +13,7 @@ .mbskin .btn_cancel {display:inline-block;padding:0 10px;height:22px;border:1px solid #ccc;background:#fafafa;line-height:2em} .mbskin button.btn_cancel {display:inline-block;padding:0 10px;height:24px;border:1px solid #ccc;background:#fafafa;line-height:2em} .mbskin .btn_cancel:focus, .mbskin .btn_cancel:hover {text-decoration:none !important} -.mbskin .btn_frmline {display:inline-block;padding:0 7px 0 5px;height:22px;border:0;background:#333;color:#fff;letter-spacing:-0.1em;text-decoration:none;vertical-align:top;line-height:2em} /* 우편번호검색버튼 등 */ +.mbskin a.btn_frmline, .mbskin button.btn_frmline {display:inline-block;padding:0 7px 0 5px;height:22px;border:0;background:#333;color:#fff;letter-spacing:-0.1em;text-decoration:none;vertical-align:top;line-height:2em} /* 우편번호검색버튼 등 */ .mbskin button.btn_frmline {font-size:1em} .mbskin .btn_win {clear:both;margin-bottom:20px;text-align:center} /* 새창용 */ .mbskin .btn_win button {display:inline-block;padding:0 10px;height:30px;border:0;background:#666;color:#fff;vertical-align:top;line-height:2em;cursor:pointer} From 0c03c1f69608df31d496954ccf865795409fae43 Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 4 Oct 2013 09:00:09 +0900 Subject: [PATCH 5/6] =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC=20=ED=94=8C?= =?UTF-8?q?=EB=A1=9C=ED=8C=85=EB=A9=94=EB=89=B4=20=EC=8A=A4=ED=81=AC?= =?UTF-8?q?=EB=A1=A4=20=EC=9C=84=EC=B9=98=20=EA=B3=84=EC=82=B0=20=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/jquery.floatmenu.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/js/jquery.floatmenu.js b/js/jquery.floatmenu.js index f87dad53e..df60c4eb9 100644 --- a/js/jquery.floatmenu.js +++ b/js/jquery.floatmenu.js @@ -52,10 +52,10 @@ { hide_menu(); - origin_y = $("body").scrollTop(); + origin_y = $(window).scrollTop(); timeout = setTimeout(function() { - scroll_y = $("body").scrollTop(); + scroll_y = $(window).scrollTop(); if(origin_y == scroll_y) { $menu.css("top", (scroll_y - height)+"px").css("display", "block"); @@ -87,10 +87,10 @@ interval_count++; } - origin_y = $("body").scrollTop(); + origin_y = $(window).scrollTop(); timeout = setTimeout(function() { - scroll_y = $("body").scrollTop(); + scroll_y = $(window).scrollTop(); if(origin_y == scroll_y) { element_y = parseInt($menu.css("top")); @@ -164,7 +164,7 @@ hide_menu(); timeout = setTimeout(function() { - scroll_y = $("body").scrollTop(); + scroll_y = $(window).scrollTop(); w_height = $(window).height(); element_y = scroll_y + w_height; $menu.css("top", element_y+"px").css("display", "block"); @@ -176,10 +176,10 @@ { hide_menu(); - origin_y = $("body").scrollTop(); + origin_y = $(window).scrollTop(); timeout = setTimeout(function() { - scroll_y = $("body").scrollTop(); + scroll_y = $(window).scrollTop(); if(origin_y == scroll_y) { w_height = $(window).height(); @@ -222,10 +222,10 @@ interval_count++; } - origin_y = $("body").scrollTop(); + origin_y = $(window).scrollTop(); timeout = setTimeout(function() { - scroll_y = $("body").scrollTop(); + scroll_y = $(window).scrollTop(); if(origin_y == scroll_y) { w_height = $(window).height(); From a43628a0ebf53a43c6464c2bb2ab5e85b5576b25 Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 4 Oct 2013 10:10:00 +0900 Subject: [PATCH 6/6] =?UTF-8?q?php=205.3=20=EB=AF=B8=EB=A7=8C=EC=97=90?= =?UTF-8?q?=EC=84=9C=EB=8A=94=20mysql=5Freal=5Fescape=5Fstring=20=EC=A0=81?= =?UTF-8?q?=EC=9A=A9=20=ED=9B=84=20stripslashes=20=EC=A0=81=EC=9A=A9?= =?UTF-8?q?=EB=90=98=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 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/common.lib.php b/lib/common.lib.php index 8a8f473dd..d915b06aa 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -1879,7 +1879,12 @@ function convert_charset($from_charset, $to_charset, $str) function escape_trim($field) { if ($field) { - return mysql_real_escape_string(@trim($field)); + $str = mysql_real_escape_string(@trim($field)); + + if(PHP_VERSION < '5.3.0') + $str = stripslashes($str); + + return $str; } }