From a7b317f6c3c1a32971e8a4760d342eda87641626 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Thu, 4 Jul 2013 17:25:18 +0900 Subject: [PATCH 01/20] =?UTF-8?q?=EC=9E=84=EC=8B=9C=20=EC=A0=80=EC=9E=A5?= =?UTF-8?q?=EB=90=9C=20=EA=B8=80=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/ajax.autosave.php | 24 ++++++++++++++++++++ bbs/write.php | 3 +++ bbs/write_update.php | 3 +++ lib/common.lib.php | 16 ++++++++++++- plugin/ckeditor/ckeditor.lib.php | 2 +- skin/board/basic/write.skin.php | 39 +++++++++++++++++++++++++++++--- 6 files changed, 82 insertions(+), 5 deletions(-) create mode 100644 bbs/ajax.autosave.php diff --git a/bbs/ajax.autosave.php b/bbs/ajax.autosave.php new file mode 100644 index 000000000..635d962a5 --- /dev/null +++ b/bbs/ajax.autosave.php @@ -0,0 +1,24 @@ + \ No newline at end of file diff --git a/bbs/write.php b/bbs/write.php index dfc2009a4..e6ac6970c 100644 --- a/bbs/write.php +++ b/bbs/write.php @@ -380,6 +380,9 @@ if (!G4_IS_MOBILE && $board['bo_use_dhtml_editor'] && $member['mb_level'] >= $bo } $editor_html = editor_html('wr_content', $content, $is_dhtml_editor); +// 임시 저장된 글 갯수 +$autosave_count = autosave_count($member['mb_id']); + include_once(G4_PATH.'/head.sub.php'); @include_once ($board_skin_path.'/write.head.skin.php'); include_once('./board_head.php'); diff --git a/bbs/write_update.php b/bbs/write_update.php index 1de8a0532..a73b938f6 100644 --- a/bbs/write_update.php +++ b/bbs/write_update.php @@ -555,6 +555,9 @@ for ($i=(int)$row['max_bf_no']; $i>=0; $i--) // 파일의 갯수를 게시물에 업데이트 한다. $row = sql_fetch(" select count(*) as cnt from {$g4['board_file_table']} where bo_table = '{$bo_table}' and wr_id = '{$wr_id}' "); sql_query(" update {$write_table} set wr_file = '{$row['cnt']}' where wr_id = '{$wr_id}' "); + +// 자동저장된 레코드를 삭제한다. +sql_query(" delete from g4s_autosave where as_uid = '{$uid}' "); //------------------------------------------------------------------------------ // 비밀글이라면 세션에 비밀글의 아이디를 저장한다. 자신의 글은 다시 패스워드를 묻지 않기 위함 diff --git a/lib/common.lib.php b/lib/common.lib.php index 130234136..a9885c465 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -1722,7 +1722,7 @@ function get_uniqid() // 년월일시분초에 100분의 1초 두자리를 추가함 (1/100 초 앞에 자리가 모자르면 0으로 채움) $key = date('ymdHis', time()) . str_pad((int)(microtime()*100), 2, "0", STR_PAD_LEFT); - $result = sql_query(" insert into {$g4['uniqid_table']} values ('$key') ", false); + $result = sql_query(" insert into {$g4['uniqid_table']} set uq_id = '$key', uq_ip = '{$_SERVER['REMOTE_ADDR']}' ", false); if ($result) break; // 쿼리가 정상이면 빠진다. // insert 하지 못했으면 일정시간 쉰다음 다시 유일키를 만든다. @@ -2078,4 +2078,18 @@ function googl_short_url($longUrl) return $json->id; } + + +// 임시 저장된 글 갯수 +function autosave_count($mb_id) +{ + global $g4; + + if ($mb_id) { + $row = sql_fetch(" select count(*) as cnt from {$g4['autosave_table']} where mb_id = '$mb_id' "); + return (int)$row['cnt']; + } else { + return 0; + } +} ?> \ No newline at end of file diff --git a/plugin/ckeditor/ckeditor.lib.php b/plugin/ckeditor/ckeditor.lib.php index ed4cf6013..1e7e1a12f 100644 --- a/plugin/ckeditor/ckeditor.lib.php +++ b/plugin/ckeditor/ckeditor.lib.php @@ -57,7 +57,7 @@ function get_editor_js($id, $ckeditor=true) function chk_editor_js($id, $ckeditor=true, $textarea_name="내용을") { if ( $ckeditor ) { - return "if (!{$id}_editor_data) { alert(\"$textarea_name 입력해 주십시오.\"); CKEDITOR.instances.{$id}.focus(); return false; }\n"; + return "if (!{$id}_editor_data) { alert(\"$textarea_name 입력해 주십시오.\"); CKEDITOR.instances.{$id}.focus(); return false; }\nif (typeof(f.wr_content)!=\"undefined\") f.wr_content.value = {$id}_editor_data;\n"; } else { return "if (!{$id}_editor.value) { alert(\"$textarea_name 입력해 주십시오.\"); {$id}_editor.focus(); return false; }\n"; } diff --git a/skin/board/basic/write.skin.php b/skin/board/basic/write.skin.php index cec6ba51b..1b827bac4 100644 --- a/skin/board/basic/write.skin.php +++ b/skin/board/basic/write.skin.php @@ -7,7 +7,8 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가

-
+ + @@ -102,7 +103,12 @@ echo $option_hidden; - + + + + 임시 저장된 글 () + + @@ -211,4 +217,31 @@ function fwrite_submit(f) return true; } - \ No newline at end of file + + + \ No newline at end of file From 6f3c3ff4ebd11402a929fcaaaa08c6a163df7b99 Mon Sep 17 00:00:00 2001 From: whitedot Date: Thu, 4 Jul 2013 18:24:29 +0900 Subject: [PATCH 02/20] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20=EC=9E=84?= =?UTF-8?q?=EC=8B=9C=EC=A0=80=EC=9E=A5=20=EB=A7=88=ED=81=AC=EC=97=85=20?= =?UTF-8?q?=EB=B0=8F=20=EC=8A=A4=ED=83=80=EC=9D=BC=201=EC=B0=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- skin/board/basic/img/btn_close.gif | Bin 0 -> 211 bytes skin/board/basic/style.css | 11 +++++++++++ skin/board/basic/write.skin.php | 25 +++++++++++++++++++++---- 3 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 skin/board/basic/img/btn_close.gif diff --git a/skin/board/basic/img/btn_close.gif b/skin/board/basic/img/btn_close.gif new file mode 100644 index 0000000000000000000000000000000000000000..040b180ac6584ae612ef2886487110f0ad079963 GIT binary patch literal 211 zcmZ?wbhEHbC>lw|Nj2|^XJd+Ki|K7yLIc<@85r}UAy+@_wT|Ns9P2m!^PEMO%%AQEIJ18abSL2rs@7wgh> zI-xzeYYr882T$7a>~-(!J@=MOy}Z$ltNl`73Cq0Bi3wIGB-b=ECVhGFY*&ANIg94( d^Unm859R4|2rw-)wA%9i`(c-qSMQw}tN}eeW+eas literal 0 HcmV?d00001 diff --git a/skin/board/basic/style.css b/skin/board/basic/style.css index 7047ecb95..60927815f 100644 --- a/skin/board/basic/style.css +++ b/skin/board/basic/style.css @@ -33,6 +33,17 @@ #bo_sch {margin-bottom:10px;padding-top:5px;text-align:center} #bo_sch legend {position:absolute;margin:0;padding:0;font-size:0;line-height:0;text-indent:-9999em;overflow:hidden} +/* 게시판 쓰기 */ +#autosave_wrapper {position:relative} +#autosave_pop {z-index:10;position:absolute;top:24px;right:117px;padding:8px;width:300px;border:1px solid #565656;background:#fff} +#autosave_pop div {text-align:right} +#autosave_pop button {margin:0;padding:0;border:0;background:transparent} +#autosave_pop ul {margin:10px 0;padding:0;border-top:1px solid #e9e9e9;list-style:none} +#autosave_pop li {padding:8px 5px;border-bottom:1px solid #e9e9e9;zoom:1} +#autosave_pop li:after {display:block;visibility:hidden;clear:both;content:""} +#autosave_pop a {display:block;float:left} +#autosave_pop span {display:block;float:right} + /* 게시판 읽기 */ #bo_v {margin-bottom:20px;padding-bottom:20px} diff --git a/skin/board/basic/write.skin.php b/skin/board/basic/write.skin.php index 1b827bac4..0ffa3e0c9 100644 --- a/skin/board/basic/write.skin.php +++ b/skin/board/basic/write.skin.php @@ -104,10 +104,27 @@ echo $option_hidden; - - - 임시 저장된 글 () - +
+ + + + + +
+ 임시 저장된 글 목록 +
+ +
+
+
From f5ccad3aec3cb6d501ef178b00f8a79f6a9fa371 Mon Sep 17 00:00:00 2001 From: whitedot Date: Fri, 5 Jul 2013 09:57:02 +0900 Subject: [PATCH 03/20] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20=EC=9E=84?= =?UTF-8?q?=EC=8B=9C=EC=A0=80=EC=9E=A5=20=EB=A0=88=EC=9D=B4=EC=96=B4=20?= =?UTF-8?q?=EC=8A=A4=ED=81=AC=EB=A1=A4=20=EB=B0=8F=20=EC=95=88=EB=93=9C?= =?UTF-8?q?=EB=A1=9C=EC=9D=B4=EB=93=9C=20=EB=8C=80=EC=9D=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- head.sub.php | 1 + js/modernizr.custom.70111.js | 4 ++++ skin/board/basic/style.css | 4 +++- skin/board/basic/write.skin.php | 4 ++-- 4 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 js/modernizr.custom.70111.js diff --git a/head.sub.php b/head.sub.php index fb27950a4..be6cb6823 100644 --- a/head.sub.php +++ b/head.sub.php @@ -75,6 +75,7 @@ if ($is_admin) { set_cookie("device_width", screen.width, 6, g4_cookie_domain); '.PHP_EOL; + echo ''.PHP_EOL; // overflow scroll 감지 } //if(!defined('G4_IS_ADMIN')) echo $config['cf_add_script']; diff --git a/js/modernizr.custom.70111.js b/js/modernizr.custom.70111.js new file mode 100644 index 000000000..1a81489fb --- /dev/null +++ b/js/modernizr.custom.70111.js @@ -0,0 +1,4 @@ +/* Modernizr 2.6.2 (Custom Build) | MIT & BSD + * Build: http://modernizr.com/download/#-cssclasses-testallprops-css_overflow_scrolling + */ +;window.Modernizr=function(a,b,c){function x(a){j.cssText=a}function y(a,b){return x(prefixes.join(a+";")+(b||""))}function z(a,b){return typeof a===b}function A(a,b){return!!~(""+a).indexOf(b)}function B(a,b){for(var d in a){var e=a[d];if(!A(e,"-")&&j[e]!==c)return b=="pfx"?e:!0}return!1}function C(a,b,d){for(var e in a){var f=b[a[e]];if(f!==c)return d===!1?a[e]:z(f,"function")?f.bind(d||b):f}return!1}function D(a,b,c){var d=a.charAt(0).toUpperCase()+a.slice(1),e=(a+" "+n.join(d+" ")+d).split(" ");return z(b,"string")||z(b,"undefined")?B(e,b):(e=(a+" "+o.join(d+" ")+d).split(" "),C(e,b,c))}var d="2.6.2",e={},f=!0,g=b.documentElement,h="modernizr",i=b.createElement(h),j=i.style,k,l={}.toString,m="Webkit Moz O ms",n=m.split(" "),o=m.toLowerCase().split(" "),p={},q={},r={},s=[],t=s.slice,u,v={}.hasOwnProperty,w;!z(v,"undefined")&&!z(v.call,"undefined")?w=function(a,b){return v.call(a,b)}:w=function(a,b){return b in a&&z(a.constructor.prototype[b],"undefined")},Function.prototype.bind||(Function.prototype.bind=function(b){var c=this;if(typeof c!="function")throw new TypeError;var d=t.call(arguments,1),e=function(){if(this instanceof e){var a=function(){};a.prototype=c.prototype;var f=new a,g=c.apply(f,d.concat(t.call(arguments)));return Object(g)===g?g:f}return c.apply(b,d.concat(t.call(arguments)))};return e});for(var E in p)w(p,E)&&(u=E.toLowerCase(),e[u]=p[E](),s.push((e[u]?"":"no-")+u));return e.addTest=function(a,b){if(typeof a=="object")for(var d in a)w(a,d)&&e.addTest(d,a[d]);else{a=a.toLowerCase();if(e[a]!==c)return e;b=typeof b=="function"?b():b,typeof f!="undefined"&&f&&(g.className+=" "+(b?"":"no-")+a),e[a]=b}return e},x(""),i=k=null,e._version=d,e._domPrefixes=o,e._cssomPrefixes=n,e.testProp=function(a){return B([a])},e.testAllProps=D,g.className=g.className.replace(/(^|\s)no-js(\s|$)/,"$1$2")+(f?" js "+s.join(" "):""),e}(this,this.document),Modernizr.addTest("overflowscrolling",function(){return Modernizr.testAllProps("overflowScrolling")}); \ No newline at end of file diff --git a/skin/board/basic/style.css b/skin/board/basic/style.css index 60927815f..f7daa0c95 100644 --- a/skin/board/basic/style.css +++ b/skin/board/basic/style.css @@ -35,7 +35,9 @@ /* 게시판 쓰기 */ #autosave_wrapper {position:relative} -#autosave_pop {z-index:10;position:absolute;top:24px;right:117px;padding:8px;width:300px;border:1px solid #565656;background:#fff} +#autosave_pop {z-index:10;position:absolute;top:24px;right:117px;padding:8px;width:300px;height:auto !important;height:180px;max-height:180px;border:1px solid #565656;background:#fff;overflow-y:scroll} +html.no-overflowscrolling #autosave_pop {height:auto;max-height:10000px !important} /* overflow 미지원 기기 대응 */ +#autosave_pop strong {position:absolute;font-size:0;line-height:0;overflow:hidden} #autosave_pop div {text-align:right} #autosave_pop button {margin:0;padding:0;border:0;background:transparent} #autosave_pop ul {margin:10px 0;padding:0;border-top:1px solid #e9e9e9;list-style:none} diff --git a/skin/board/basic/write.skin.php b/skin/board/basic/write.skin.php index 0ffa3e0c9..2c1d783d9 100644 --- a/skin/board/basic/write.skin.php +++ b/skin/board/basic/write.skin.php @@ -111,13 +111,13 @@ echo $option_hidden;
- 임시 저장된 글 목록 + 임시 저장된 글 목록
    -
  • 저장제목일시
    • +
  • 저장제목일시
    • From aad7b15e98e4716132294bce116d072899f846a8 Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 5 Jul 2013 11:36:02 +0900 Subject: [PATCH 04/20] =?UTF-8?q?=EC=97=AC=EB=9F=AC=20=EA=B0=9C=20?= =?UTF-8?q?=EC=83=81=ED=92=88=EC=9D=84=20=EB=8B=B4=EC=9D=84=20=EB=95=8C=20?= =?UTF-8?q?=EC=98=B5=EC=85=98=20=EC=83=81=ED=92=88=20skip=20=ED=95=98?= =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EB=8A=94=20=EC=98=A4=EB=A5=98=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shop/cartupdate.php | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/shop/cartupdate.php b/shop/cartupdate.php index 3cf26830c..78145a350 100644 --- a/shop/cartupdate.php +++ b/shop/cartupdate.php @@ -22,6 +22,14 @@ if ($member['mb_level'] < $default['de_level_sell']) alert('상품을 구입할 수 있는 권한이 없습니다.'); } +// notax 필드추가 +$sql = " select ct_notax from {$g4['shop_cart_table']} limit 1 "; +$result = sql_query($sql, false); +if(!$result) { + sql_query(" ALTER TABLE `{$g4['shop_cart_table']}` + ADD `ct_notax` TINYINT(4) NOT NULL DEFAULT '0' AFTER `ct_num` ", true); +} + if($act == "buy") { if(!count($_POST['ct_chk'])) @@ -75,6 +83,7 @@ else if ($act == "seldelete") // 선택삭제 else if ($act == "multi") // 여러개의 상품이 한꺼번에 들어옴. { $fldcnt = count($_POST['it_name']); + $arr_item = array(); // 재고등을 검사 $error = ""; @@ -83,15 +92,20 @@ else if ($act == "multi") // 여러개의 상품이 한꺼번에 들어옴. if ($_POST['it_id'][$i] == "" || $_POST['ct_qty'][$i] <= 0) { continue; } //옵션있는 상품은 건너뜀 + $arr_item[$i]['opt_skip'] = 0; $sql = " select count(*) as cnt from {$g4['shop_item_option_table']} where it_id = '{$_POST['it_id'][$i]}' and io_type = '0' "; $tmp = sql_fetch($sql); - if($tmp['cnt']) continue; + if($tmp['cnt']) { + $arr_item[$i]['opt_skip'] = 1; + continue; + } //-------------------------------------------------------- // 변조 검사 //-------------------------------------------------------- $sql = " select * from {$g4['shop_item_table']} where it_id = '{$_POST['it_id'][$i]}' "; $it = sql_fetch($sql); + $arr_item[$i]['notax'] = $it['it_notax']; $price = get_price($it); // 상품가격이 다름 @@ -122,7 +136,7 @@ else if ($act == "multi") // 여러개의 상품이 한꺼번에 들어옴. $ct_count = 0; $comma = ''; $sql = " INSERT INTO {$g4['shop_cart_table']} - ( uq_id, mb_id, it_id, it_name, ct_status, ct_price, ct_point, ct_point_use, ct_stock_use, ct_option, ct_qty, ct_num, io_id, io_type, io_price, ct_time, ct_ip, ct_send_cost, ct_direct, ct_select ) + ( uq_id, mb_id, it_id, it_name, ct_status, ct_price, ct_point, ct_point_use, ct_stock_use, ct_option, ct_qty, ct_num, ct_notax, io_id, io_type, io_price, ct_time, ct_ip, ct_send_cost, ct_direct, ct_select ) VALUES "; $ct_select = 0; if($sw_direct) @@ -132,6 +146,10 @@ else if ($act == "multi") // 여러개의 상품이 한꺼번에 들어옴. { if ($_POST['it_id'][$i] == "" || $_POST['ct_qty'][$i] <= 0) continue; + // 옵션있는 상품이라면 건너뜀 + if($arr_item[$i]['opt_skip']) + continue; + // 포인트 사용하지 않는다면 if (!$config['cf_use_point']) $_POST['it_point'][$i] = 0; @@ -151,7 +169,7 @@ else if ($act == "multi") // 여러개의 상품이 한꺼번에 들어옴. continue; } - $sql .= $comma."( '$tmp_uq_id', '{$member['mb_id']}', '{$_POST['it_id'][$i]}', '{$_POST['it_name'][$i]}', '쇼핑', '{$_POST['it_price'][$i]}', '{$_POST['it_point'][$i]}', '0', '0', '{$_POST['it_name'][$i]}', '{$_POST['ct_qty'][$i]}', '0', '', '0', '0', '".G4_TIME_YMDHIS."', '$REMOTE_ADDR', '$ct_send_cost', '$sw_direct', '$ct_select' )"; + $sql .= $comma."( '$tmp_uq_id', '{$member['mb_id']}', '{$_POST['it_id'][$i]}', '{$_POST['it_name'][$i]}', '쇼핑', '{$_POST['it_price'][$i]}', '{$_POST['it_point'][$i]}', '0', '0', '{$_POST['it_name'][$i]}', '{$_POST['ct_qty'][$i]}', '0', '{$arr_item[$i]['notax']}', '', '0', '0', '".G4_TIME_YMDHIS."', '$REMOTE_ADDR', '$ct_send_cost', '$sw_direct', '$ct_select' )"; $comma = ' , '; $ct_count++; } @@ -252,11 +270,11 @@ else if ($act == "optionmod") // 장바구니에서 옵션변경 // 장바구니에 Insert $comma = ''; $sql = " INSERT INTO {$g4['shop_cart_table']} - ( uq_id, it_id, it_name, ct_status, ct_price, ct_point, ct_point_use, ct_stock_use, ct_option, ct_qty, ct_num, io_id, io_type, io_price, ct_time, ct_ip, ct_direct, ct_send_cost ) + ( uq_id, it_id, it_name, ct_status, ct_price, ct_point, ct_point_use, ct_stock_use, ct_option, ct_qty, ct_num, ct_notax, io_id, io_type, io_price, ct_time, ct_ip, ct_direct, ct_send_cost ) VALUES "; for($i=0; $i<$option_count; $i++) { - $sql .= $comma."( '$tmp_uq_id', '{$_POST['it_id']}', '{$_POST['it_name']}', '쇼핑', '{$_POST['it_price']}', '{$_POST['it_point']}', '0', '0', '{$_POST['io_value'][$i]}', '{$_POST['ct_qty'][$i]}', '$i', '{$_POST['io_id'][$i]}', '{$_POST['io_type'][$i]}', '{$_POST['io_price'][$i]}', '".G4_TIME_YMDHIS."', '$REMOTE_ADDR', '$sw_direct', '$ct_send_cost' )"; + $sql .= $comma."( '$tmp_uq_id', '{$_POST['it_id']}', '{$_POST['it_name']}', '쇼핑', '{$_POST['it_price']}', '{$_POST['it_point']}', '0', '0', '{$_POST['io_value'][$i]}', '{$_POST['ct_qty'][$i]}', '$i', '{$it['it_notax']}', '{$_POST['io_id'][$i]}', '{$_POST['io_type'][$i]}', '{$_POST['io_price'][$i]}', '".G4_TIME_YMDHIS."', '$REMOTE_ADDR', '$sw_direct', '$ct_send_cost' )"; $comma = ' , '; } @@ -379,7 +397,7 @@ else // 장바구니에 담기 $ct_count = 0; $comma = ''; $sql = " INSERT INTO {$g4['shop_cart_table']} - ( uq_id, mb_id, it_id, it_name, ct_status, ct_price, ct_point, ct_point_use, ct_stock_use, ct_option, ct_qty, ct_num, io_id, io_type, io_price, ct_time, ct_ip, ct_send_cost, ct_direct, ct_select ) + ( uq_id, mb_id, it_id, it_name, ct_status, ct_price, ct_point, ct_point_use, ct_stock_use, ct_option, ct_qty, ct_num, ct_notax, io_id, io_type, io_price, ct_time, ct_ip, ct_send_cost, ct_direct, ct_select ) VALUES "; for($i=0; $i<$option_count; $i++) { @@ -400,7 +418,7 @@ else // 장바구니에 담기 continue; } - $sql .= $comma."( '$tmp_uq_id', '{$member['mb_id']}', '{$_POST['it_id']}', '{$_POST['it_name']}', '쇼핑', '{$_POST['it_price']}', '{$_POST['it_point']}', '0', '0', '{$_POST['io_value'][$i]}', '{$_POST['ct_qty'][$i]}', '$ct_num', '{$_POST['io_id'][$i]}', '{$_POST['io_type'][$i]}', '{$_POST['io_price'][$i]}', '".G4_TIME_YMDHIS."', '$REMOTE_ADDR', '$ct_send_cost', '$sw_direct', '$ct_select' )"; + $sql .= $comma."( '$tmp_uq_id', '{$member['mb_id']}', '{$_POST['it_id']}', '{$_POST['it_name']}', '쇼핑', '{$_POST['it_price']}', '{$_POST['it_point']}', '0', '0', '{$_POST['io_value'][$i]}', '{$_POST['ct_qty'][$i]}', '$ct_num', '{$it['it_notax']}', '{$_POST['io_id'][$i]}', '{$_POST['io_type'][$i]}', '{$_POST['io_price'][$i]}', '".G4_TIME_YMDHIS."', '$REMOTE_ADDR', '$ct_send_cost', '$sw_direct', '$ct_select' )"; $comma = ' , '; $ct_num++; $ct_count++; From 9c6a1c30bc6383da8d9783e774ce2cbccc815cf6 Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 5 Jul 2013 17:18:14 +0900 Subject: [PATCH 05/20] =?UTF-8?q?=EB=B9=84=EA=B3=BC=EC=84=B8=20=EC=83=81?= =?UTF-8?q?=ED=92=88=20=ED=91=9C=EC=8B=9C=EB=A5=BC=20=EC=9C=84=ED=95=9C=20?= =?UTF-8?q?ct=5Fnotax=20=ED=95=84=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/shop.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/install/shop.sql b/install/shop.sql index b3e49d8d0..f150a7fbe 100644 --- a/install/shop.sql +++ b/install/shop.sql @@ -69,6 +69,7 @@ CREATE TABLE IF NOT EXISTS `shop_cart` ( `ct_option` varchar(255) NOT NULL DEFAULT '', `ct_qty` int(11) NOT NULL DEFAULT '0', `ct_num` int(11) NOT NULL DEFAULT '0', + `ct_notax` tinyint(4) NOT NULL DEFAULT '0', `io_id` varchar(255) NOT NULL DEFAULT '', `io_type` tinyint(4) NOT NULL DEFAULT '0', `io_price` int(11) NOT NULL DEFAULT '0', From 4036f727696f8d14133c53ad1f5985ecc561e93d Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 5 Jul 2013 17:52:40 +0900 Subject: [PATCH 06/20] =?UTF-8?q?#250=20=EB=B3=B5=ED=95=A9=EA=B3=BC?= =?UTF-8?q?=EC=84=B8=20=EB=B6=80=EB=B6=84=EC=B7=A8=EC=86=8C=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/orderform.php | 27 +++++------ adm/shop_admin/partcancel.php | 70 +++++++++++++++++++++++++++- adm/shop_admin/partcancelupdate.php | 72 +++++++++++++++++------------ 3 files changed, 125 insertions(+), 44 deletions(-) diff --git a/adm/shop_admin/orderform.php b/adm/shop_admin/orderform.php index 1e6395d9f..64361bce8 100644 --- a/adm/shop_admin/orderform.php +++ b/adm/shop_admin/orderform.php @@ -99,14 +99,14 @@ $row = sql_fetch($sql); $total_order = $row['sum_order']; // 상품목록 -$sql = " select a.it_id, - a.it_name, - a.cp_amount, - b.it_notax - from {$g4['shop_cart_table']} a left join {$g4['shop_item_table']} b on ( a.it_id = b.it_id ) - where a.uq_id = '{$od['uq_id']}' - and a.ct_num = '0' - order by a.ct_id "; +$sql = " select it_id, + it_name, + cp_amount, + ct_notax + from {$g4['shop_cart_table']} + where uq_id = '{$od['uq_id']}' + and ct_num = '0' + order by ct_id "; $result = sql_query($sql); $pg_anchor = '
      @@ -153,7 +153,7 @@ $pg_anchor = '

      • - +

        @@ -338,7 +338,7 @@ $pg_anchor = '
        - + @@ -525,10 +525,9 @@ $pg_anchor = '
        - + @@ -598,7 +597,6 @@ $pg_anchor = '
        @@ -667,6 +665,9 @@ $pg_anchor = '
          + + 결제금액 부분취소 +
          diff --git a/adm/shop_admin/partcancel.php b/adm/shop_admin/partcancel.php index 135f79ff6..7ec058001 100644 --- a/adm/shop_admin/partcancel.php +++ b/adm/shop_admin/partcancel.php @@ -7,7 +7,7 @@ auth_check($auth[$sub_menu], "w"); $g4['title'] = $settle_method.' 부분취소 요청'; include_once(G4_PATH.'/head.sub.php'); -$sql = " select od_id, od_settle_case, od_receipt_amount, od_cancel_card, od_tno, od_time +$sql = " select * from {$g4['shop_order_table']} where od_id = '{$_GET['od_id']}' "; $od = sql_fetch($sql); @@ -26,10 +26,44 @@ if($od['od_settle_case'] == '계좌이체') $mod_type = 'STPA'; $available_cancel = $od['od_receipt_amount'] - $od['od_cancel_card']; + +// 복합과세 사용시 각각 취소가능 금액 +if($default['de_tax_flag_use']) { + $sql = " select ct_price, io_price, io_type, ct_qty, ct_notax, cp_amount + from {$g4['shop_cart_table']} + where uq_id = '{$od['uq_id']}' + and ct_status IN ( '주문', '준비', '배송', '완료' ) "; + $result = sql_query($sql); + + $tot_tax_mny = 0; + $tot_free_mny = 0; + + for($i=0; $row=sql_fetch_array($result); $i++) { + if($row['ct_notax']) { + if($row['io_type']) { + $tot_free += ($row['io_priece'] * $row['ct_qty']); + } else { + $tot_free += (($row['ct_price'] + $row['io_price']) * $row['ct_qty']); + } + + $tot_free -= $row['cp_amount']; + } else { + if($row['io_type']) { + $tot_tax += ($row['io_priece'] * $row['ct_qty']); + } else { + $tot_tax += (($row['ct_price'] + $row['io_price']) * $row['ct_qty']); + } + + $tot_tax -= $row['cp_amount']; + } + } + + //$tot_tax -= ($od['od_send_cost'] + $od['od_send_cost2'] - $od['od_coupon'] - $od['od_send_coupon'] - $od['od_receipt_point']); +} ?>
          -
          + @@ -38,6 +72,20 @@ $available_cancel = $od['od_receipt_amount'] - $od['od_cancel_card'];

          + +

          + 과세 취소가능금액 : 원
          + 비과세 취소가능금액 : 원 +

          +

          + + 원 +

          +

          + + 원 +

          +

          취소가능금액 : 원

          @@ -45,6 +93,7 @@ $available_cancel = $od['od_receipt_amount'] - $od['od_cancel_card']; 원

          +

          @@ -56,6 +105,23 @@ $available_cancel = $od['od_receipt_amount'] - $od['od_cancel_card'];

          + + \ No newline at end of file diff --git a/adm/shop_admin/partcancelupdate.php b/adm/shop_admin/partcancelupdate.php index d60cfdf6f..3e6307615 100644 --- a/adm/shop_admin/partcancelupdate.php +++ b/adm/shop_admin/partcancelupdate.php @@ -21,9 +21,12 @@ if($od['od_settle_case'] != '신용카드' && $od['od_settle_case'] != '계좌 if($od['od_settle_case'] == '계좌이체' && substr(0, 10, $od['od_time']) == G4_TIME_YMD) alert('실시간 계좌이체건의 부분취소 요청은 결제일 익일에 가능합니다.'); +if($_POST['mod_type'] != 'RN07' && $_POST['mod_type'] != 'STPA') + alert('취소요청 구분이 올바르지 않습니다.mod_type 값을 확인해 주십시오.'); + // 취소사유의 한글깨짐 방지처리 $def_locale = setlocale(LC_CTYPE, 0); -$_POST['mod_desc'] = iconv("utf-8", "euc-kr", $_POST['mod_desc']); +$_POST = array_map('iconv_euckr', $_POST); $locale_change = false; if(preg_match("/utf[\-]?8/i", $def_locale)) { setlocale(LC_CTYPE, 'ko_KR.euc-kr'); @@ -47,7 +50,8 @@ else { $default['de_kcp_mid'] = "SR".$default['de_kcp_mid']; } -$g_conf_site_cd = $default['de_kcp_mid']; +$g_conf_site_cd = $default['de_kcp_mid']; +$g_conf_site_key = $default['de_kcp_site_key']; $g_conf_home_dir = G4_SHOP_PATH.'/kcp'; $g_conf_key_dir = ''; $g_conf_log_dir = ''; @@ -70,38 +74,55 @@ else { $g_conf_log_level = "3"; $g_conf_gw_port = "8090"; -include_once(G4_SHOP_PATH.'/kcp/pp_ax_hub_lib.php'); +include G4_SHOP_PATH.'/kcp/pp_cli_hub_lib.php'; $tno = $_POST['tno']; $req_tx = $_POST['req_tx']; $mod_type = $_POST['mod_type']; $mod_desc = $_POST['mod_desc']; -$cust_ip = getenv("REMOTE_ADDR"); +$cust_ip = getenv('REMOTE_ADDR'); +$rem_mny = $_POST['rem_mny']; +$mod_mny = $_POST['mod_mny']; +$tax_mny = $_POST['tax_mny']; +$mod_free_mny = $_POST['mod_free_mny']; -$c_PayPlus = new C_PP_CLI; +if($default['de_tax_flag_use']) { + $mod_mny = strval($tax_mny + $mod_free_mny); +} + +$c_PayPlus = new C_PAYPLUS_CLI; $c_PayPlus->mf_clear(); if ( $req_tx == "mod" ) { $tran_cd = "00200000"; - $c_PayPlus->mf_set_modx_data( "tno", $tno ); // KCP 원거래 거래번호 - $c_PayPlus->mf_set_modx_data( "mod_type", $mod_type ); // 원거래 변경 요청 종류 - $c_PayPlus->mf_set_modx_data( "mod_ip", $cust_ip ); // 변경 요청자 IP - $c_PayPlus->mf_set_modx_data( "mod_desc", $mod_desc ); // 변경 사유 + $c_PayPlus->mf_set_modx_data( "tno" , $tno ); // KCP 원거래 거래번호 + $c_PayPlus->mf_set_modx_data( "mod_type" , $mod_type ); // 원거래 변경 요청 종류 + $c_PayPlus->mf_set_modx_data( "mod_ip" , $cust_ip ); // 변경 요청자 IP + $c_PayPlus->mf_set_modx_data( "mod_desc" , $mod_desc ); // 변경 사유 + $c_PayPlus->mf_set_modx_data( "rem_mny" , $rem_mny ); // 취소 가능 잔액 + $c_PayPlus->mf_set_modx_data( "mod_mny" , $mod_mny ); // 취소 요청 금액 - if ( $mod_type == "RN07" || $mod_type == "STPA" ) // 부분취소의 경우 + if($default['de_tax_flag_use']) { - $c_PayPlus->mf_set_modx_data( "mod_mny", $_POST[ "mod_mny" ] ); // 취소요청금액 - $c_PayPlus->mf_set_modx_data( "rem_mny", $_POST[ "rem_mny" ] ); // 취소가능잔액 + $mod_tax_mny = round((int)$tax_mny / 1.1); + $mod_vat_mny = (int)$tax_mny - $mod_tax_mny; + + $c_PayPlus->mf_set_modx_data( "tax_flag" , "TG03" ); // 복합과세 구분 + $c_PayPlus->mf_set_modx_data( "mod_tax_mny" , strval($mod_tax_mny) ); // 공급가 부분 취소 요청 금액 + $c_PayPlus->mf_set_modx_data( "mod_vat_mny" , strval($mod_vat_mny) ); // 부과세 부분 취소 요청 금액 + $c_PayPlus->mf_set_modx_data( "mod_free_mny" , $mod_free_mny ); // 비관세 부분 취소 요청 금액 } } if ( $tran_cd != "" ) { - $c_PayPlus->mf_do_tx( $trace_no, $g_conf_home_dir, $g_conf_site_cd, "", $tran_cd, "", - $g_conf_gw_url, $g_conf_gw_port, "payplus_cli_slib", $ordr_idxx, - $cust_ip, "3" , 0, 0, $g_conf_key_dir, $g_conf_log_dir); // 응답 전문 처리 + $c_PayPlus->mf_do_tx( "", $g_conf_home_dir, $g_conf_site_cd, + $g_conf_site_key, $tran_cd, "", + $g_conf_gw_url, $g_conf_gw_port, "payplus_cli_slib", + $ordr_idxx, $cust_ip, $g_conf_log_level, + "", 0 ); $res_cd = $c_PayPlus->m_res_cd; // 결과 코드 $res_msg = $c_PayPlus->m_res_msg; // 결과 메시지 @@ -128,21 +149,14 @@ if ( $req_tx == "mod" ) if ( $res_cd == "0000" ) { $tno = $c_PayPlus->mf_get_res_data( "tno" ); // KCP 거래 고유 번호 + $amount = $c_PayPlus->mf_get_res_data( "amount" ); // 원 거래금액 + $mod_mny = $c_PayPlus->mf_get_res_data( "panc_mod_mny" ); // 취소요청된 금액 + $rem_mny = $c_PayPlus->mf_get_res_data( "panc_rem_mny" ); // 취소요청후 잔액 -/* = -------------------------------------------------------------------------- = */ -/* = 부분취소 결과 처리 = */ -/* = -------------------------------------------------------------------------- = */ - if ( $mod_type == "RN07" || $mod_type == "STPA" ) // 부분취소의 경우 - { - $amount = $c_PayPlus->mf_get_res_data( "amount" ); // 원 거래금액 - $mod_mny = $c_PayPlus->mf_get_res_data( "panc_mod_mny" ); // 취소요청된 금액 - $rem_mny = $c_PayPlus->mf_get_res_data( "panc_rem_mny" ); // 취소요청후 잔액 - - $sql = " update {$g4['shop_order_table']} - set od_cancel_card = od_cancel_card + '$mod_mny' - where od_id = '{$od['od_id']}' "; - sql_query($sql); - } + $sql = " update {$g4['shop_order_table']} + set od_cancel_card = od_cancel_card + '$mod_mny' + where od_id = '{$od['od_id']}' "; + sql_query($sql); } // End of [res_cd = "0000"] /* = -------------------------------------------------------------------------- = */ From c120d092c71b478c79b8681b2d60de0f1ea34a3a Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 5 Jul 2013 17:59:51 +0900 Subject: [PATCH 07/20] =?UTF-8?q?#250=20=EC=B7=A8=EC=86=8C=EA=B0=80?= =?UTF-8?q?=EB=8A=A5=20=EA=B8=88=EC=95=A1=EC=9D=84=20=EC=B4=9D=EC=95=A1?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=EB=A7=8C=20=ED=91=9C=EC=8B=9C=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 --- adm/shop_admin/partcancel.php | 42 ++--------------------------------- 1 file changed, 2 insertions(+), 40 deletions(-) diff --git a/adm/shop_admin/partcancel.php b/adm/shop_admin/partcancel.php index 7ec058001..3ccd89bb5 100644 --- a/adm/shop_admin/partcancel.php +++ b/adm/shop_admin/partcancel.php @@ -26,40 +26,6 @@ if($od['od_settle_case'] == '계좌이체') $mod_type = 'STPA'; $available_cancel = $od['od_receipt_amount'] - $od['od_cancel_card']; - -// 복합과세 사용시 각각 취소가능 금액 -if($default['de_tax_flag_use']) { - $sql = " select ct_price, io_price, io_type, ct_qty, ct_notax, cp_amount - from {$g4['shop_cart_table']} - where uq_id = '{$od['uq_id']}' - and ct_status IN ( '주문', '준비', '배송', '완료' ) "; - $result = sql_query($sql); - - $tot_tax_mny = 0; - $tot_free_mny = 0; - - for($i=0; $row=sql_fetch_array($result); $i++) { - if($row['ct_notax']) { - if($row['io_type']) { - $tot_free += ($row['io_priece'] * $row['ct_qty']); - } else { - $tot_free += (($row['ct_price'] + $row['io_price']) * $row['ct_qty']); - } - - $tot_free -= $row['cp_amount']; - } else { - if($row['io_type']) { - $tot_tax += ($row['io_priece'] * $row['ct_qty']); - } else { - $tot_tax += (($row['ct_price'] + $row['io_price']) * $row['ct_qty']); - } - - $tot_tax -= $row['cp_amount']; - } - } - - //$tot_tax -= ($od['od_send_cost'] + $od['od_send_cost2'] - $od['od_coupon'] - $od['od_send_coupon'] - $od['od_receipt_point']); -} ?>
          @@ -72,11 +38,10 @@ if($default['de_tax_flag_use']) {

          -

          - 과세 취소가능금액 : 원
          - 비과세 취소가능금액 : 원 + 취소가능금액 : 원

          +

          원 @@ -86,9 +51,6 @@ if($default['de_tax_flag_use']) { 원

          -

          - 취소가능금액 : 원 -

          원 From f7fe04357c8fd9ec66e515bf030f90e07fd6fcc3 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Mon, 8 Jul 2013 11:32:29 +0900 Subject: [PATCH 08/20] =?UTF-8?q?=EC=9D=B4=EB=AF=B8=20HTML=20Entity=20?= =?UTF-8?q?=ED=98=95=EC=8B=9D=EC=9C=BC=EB=A1=9C=20=EC=A0=80=EC=9E=A5?= =?UTF-8?q?=EB=90=98=EB=AF=80=EB=A1=9C=20conv=5Fcontent()=20=ED=95=A8?= =?UTF-8?q?=EC=88=98=EB=A5=BC=20=EC=A0=9C=EA=B1=B0=ED=95=98=EC=97=AC=20?= =?UTF-8?q?=EC=9C=84=EC=B9=98=EB=A5=BC=20=EC=B6=9C=EB=A0=A5=ED=95=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- skin/connect/basic/current_connect.skin.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/skin/connect/basic/current_connect.skin.php b/skin/connect/basic/current_connect.skin.php index 4913abe9d..db1159605 100644 --- a/skin/connect/basic/current_connect.skin.php +++ b/skin/connect/basic/current_connect.skin.php @@ -16,7 +16,8 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가

        ".$location.""; From d5983f284277b27e80ce013c222bff3527cf9e19 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Mon, 8 Jul 2013 15:19:33 +0900 Subject: [PATCH 09/20] =?UTF-8?q?=EC=9E=84=EC=8B=9C=EC=A0=80=EC=9E=A5=20js?= =?UTF-8?q?on=20=EB=B2=84=EC=A0=84=20=EA=B0=9C=EB=B0=9C=20=EC=99=84?= =?UTF-8?q?=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/ajax.autosave.php | 26 ++++---- bbs/ajax.autosavelist.php | 16 +++++ bbs/ajax.autosaveload.php | 15 +++++ skin/board/basic/style.css | 4 +- skin/board/basic/write.skin.php | 101 +++++++++++++++++++++++--------- 5 files changed, 120 insertions(+), 42 deletions(-) create mode 100644 bbs/ajax.autosavelist.php create mode 100644 bbs/ajax.autosaveload.php diff --git a/bbs/ajax.autosave.php b/bbs/ajax.autosave.php index 635d962a5..8adbd21e2 100644 --- a/bbs/ajax.autosave.php +++ b/bbs/ajax.autosave.php @@ -4,21 +4,19 @@ include_once('./_common.php'); if (!$is_member) die('0'); $uid = escape_trim($_REQUEST['uid']); -$subject = escape_trim($_REQUEST['subject']); -$content = escape_trim($_REQUEST['content']); +$subject = escape_trim(stripslashes($_REQUEST['subject'])); +$content = escape_trim(stripslashes($_REQUEST['content'])); +//$subject = escape_trim(htmlentities($_REQUEST['subject'], ENT_QUOTES)); +//$content = escape_trim($_REQUEST['content']); -/* -$uid = get_session("ss_autosave_uid"); -if (!$uid) { - $uid = get_uniqid(); - set_session("ss_autosave_uid", $uid); -} -*/ +if ($subject && $content) { + $sql = " select count(*) as cnt from {$g4['autosave_table']} where mb_id = '{$member['mb_id']}' and as_subject = '$subject' and as_content = '$content' "; + $row = sql_fetch($sql); + if (!$row['cnt']) { + $sql = " insert into {$g4['autosave_table']} set mb_id = '{$member['mb_id']}', as_uid = '{$uid}', as_subject = '$subject', as_content = '$content', as_datetime = '".G4_TIME_YMDHIS."' on duplicate key update as_subject = '$subject', as_content = '$content', as_datetime = '".G4_TIME_YMDHIS."' "; + $result = sql_query($sql, false); -if ($content) { - $sql = " insert into {$g4['autosave_table']} set mb_id = '{$member['mb_id']}', as_uid = '{$uid}', as_subject = '$subject', as_content = '$content', as_datetime = '".G4_TIME_YMDHIS."' on duplicate key update as_subject = '$subject', as_content = '$content', as_datetime = '".G4_TIME_YMDHIS."' "; - $result = sql_query($sql, false); - - echo autosave_count($member['mb_id']); + echo autosave_count($member['mb_id']); + } } ?> \ No newline at end of file diff --git a/bbs/ajax.autosavelist.php b/bbs/ajax.autosavelist.php new file mode 100644 index 000000000..c0b9871c3 --- /dev/null +++ b/bbs/ajax.autosavelist.php @@ -0,0 +1,16 @@ + \ No newline at end of file diff --git a/bbs/ajax.autosaveload.php b/bbs/ajax.autosaveload.php new file mode 100644 index 000000000..1cf047765 --- /dev/null +++ b/bbs/ajax.autosaveload.php @@ -0,0 +1,15 @@ + \ No newline at end of file diff --git a/skin/board/basic/style.css b/skin/board/basic/style.css index f7daa0c95..53edf8163 100644 --- a/skin/board/basic/style.css +++ b/skin/board/basic/style.css @@ -35,7 +35,7 @@ /* 게시판 쓰기 */ #autosave_wrapper {position:relative} -#autosave_pop {z-index:10;position:absolute;top:24px;right:117px;padding:8px;width:300px;height:auto !important;height:180px;max-height:180px;border:1px solid #565656;background:#fff;overflow-y:scroll} +#autosave_pop {display:none;z-index:10;position:absolute;top:24px;right:117px;padding:8px;width:350px;height:auto !important;height:180px;max-height:180px;border:1px solid #565656;background:#fff;overflow-y:scroll} html.no-overflowscrolling #autosave_pop {height:auto;max-height:10000px !important} /* overflow 미지원 기기 대응 */ #autosave_pop strong {position:absolute;font-size:0;line-height:0;overflow:hidden} #autosave_pop div {text-align:right} @@ -45,6 +45,8 @@ html.no-overflowscrolling #autosave_pop {height:auto;max-height:10000px !importa #autosave_pop li:after {display:block;visibility:hidden;clear:both;content:""} #autosave_pop a {display:block;float:left} #autosave_pop span {display:block;float:right} +.autosave_close {cursor:pointer;} +.autosave_content {display:none;} /* 게시판 읽기 */ #bo_v {margin-bottom:20px;padding-bottom:20px} diff --git a/skin/board/basic/write.skin.php b/skin/board/basic/write.skin.php index 2c1d783d9..57f4e62b4 100644 --- a/skin/board/basic/write.skin.php +++ b/skin/board/basic/write.skin.php @@ -7,7 +7,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가

        -
        + @@ -107,23 +107,18 @@ echo $option_hidden;
        - - - +
        임시 저장된 글 목록
        +
        @@ -238,27 +233,79 @@ function fwrite_submit(f) \ No newline at end of file + From 841b0942549532e099883aeea1840392d35dba74 Mon Sep 17 00:00:00 2001 From: chicpro Date: Mon, 8 Jul 2013 17:19:29 +0900 Subject: [PATCH 10/20] =?UTF-8?q?#251=20=EC=A3=BC=EB=AC=B8=EC=B7=A8?= =?UTF-8?q?=EC=86=8C=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mobile/shop/orderinquiryview.php | 22 +++++++++++++--- shop/orderinquirycancel.php | 43 +++++++++++++++++++++++++++++--- shop/orderinquiryview.php | 29 ++++++++++++++++++--- 3 files changed, 84 insertions(+), 10 deletions(-) diff --git a/mobile/shop/orderinquiryview.php b/mobile/shop/orderinquiryview.php index f0043a721..48e5a171f 100644 --- a/mobile/shop/orderinquiryview.php +++ b/mobile/shop/orderinquiryview.php @@ -530,18 +530,18 @@ include_once(G4_MSHOP_PATH.'/_head.php'); 0 && $od['od_receipt_amount'] == 0) { + if ($od_count1 == $od_count2 && ($od['od_settle_case'] != '가상계좌' || $od['od_receipt_amount'] == 0)) { ?>
        - + - + @@ -574,6 +574,22 @@ include_once(G4_MSHOP_PATH.'/_head.php');
        + + \ No newline at end of file diff --git a/shop/orderinquirycancel.php b/shop/orderinquirycancel.php index 6d141bd7c..b61e99d60 100644 --- a/shop/orderinquirycancel.php +++ b/shop/orderinquirycancel.php @@ -15,10 +15,45 @@ if (!$od['od_id']) { alert("존재하는 주문이 아닙니다."); } -if ($od['od_temp_amount'] > 0 && $od['od_receipt_amount'] == 0) { - ; -} else { +// 주문상품의 상태가 주문인지 체크 +$sql = " select SUM(IF(ct_status = '주문', 1, 0)) as od_count2, + COUNT(*) as od_count1 + from {$g4['shop_cart_table']} + where uq_id = '$uq_id' "; +$ct = sql_fetch($sql); + +if($ct['od_count1'] != $ct['od_count2'] || ($od['od_settle_case'] == '가상계좌' && $od['od_receipt_amount'] > 0)) alert("취소할 수 있는 주문이 아닙니다.", G4_SHOP_URL."/orderinquiryview.php?od_id=$od_id&uq_id=$uq_id"); + +// PG 결제 취소 +if($od['od_tno']) { + if (file_exists('./settle_'.$default['de_card_pg'].'.inc.php')) { + include './settle_'.$default['de_card_pg'].'.inc.php'; + } + $_POST['tno'] = $od['od_tno']; + $_POST['req_tx'] = 'mod'; + $_POST['mod_type'] = 'STSC'; + if($od['od_escrow']) { + $_POST['req_tx'] = 'mod_escrow'; + $_POST['mod_type'] = 'STE2'; + if($od['od_settle_case'] == '가상계좌') + $_POST['mod_type'] = 'STE5'; + } + $_POST['mod_desc'] = iconv("utf-8", "euc-kr", '주문자 본인 취소-'.$cancel_memo); + $_POST['site_cd'] = $default['de_kcp_mid']; + + // 취소내역 한글깨짐방지 + $def_locale = setlocale(LC_CTYPE, 0); + $locale_change = false; + if(preg_match("/utf[\-]?8/i", $def_locale)) { + setlocale(LC_CTYPE, 'ko_KR.euc-kr'); + $locale_change = true; + } + + include G4_SHOP_PATH.'/kcp/pp_ax_hub.php'; + + if($locale_change) + setlocale(LC_CTYPE, $def_locale); } // 장바구니 자료 취소 @@ -27,7 +62,7 @@ sql_query(" update {$g4['shop_cart_table']} set ct_status = '취소' where uq_id // 주문 취소 $cancel_memo = addslashes($cancel_memo); //sql_query(" update $g4[shop_order_table] set od_temp_point = '0', od_receipt_point = '0', od_shop_memo = concat(od_shop_memo,\"\\n주문자 본인 직접 취소 - {$g4['time_ymdhis']} (취소이유 : {$cancel_memo})\") where uq_id = '$uq_id' "); -sql_query(" update {$g4['shop_order_table']} set od_send_cost = '0', od_send_cost2 = '0', od_temp_point = '0', od_receipt_point = '0', od_shop_memo = concat(od_shop_memo,\"\\n주문자 본인 직접 취소 - ".G4_TIME_YMDHIS." (취소이유 : {$cancel_memo})\") where uq_id = '$uq_id' "); +sql_query(" update {$g4['shop_order_table']} set od_send_cost = '0', od_send_cost2 = '0', od_temp_point = '0', od_receipt_amount = '0', od_receipt_point = '0', od_shop_memo = concat(od_shop_memo,\"\\n주문자 본인 직접 취소 - ".G4_TIME_YMDHIS." (취소이유 : {$cancel_memo})\") where uq_id = '$uq_id' "); // 주문취소 회원의 포인트를 되돌려 줌 if ($od['od_receipt_point'] > 0) { diff --git a/shop/orderinquiryview.php b/shop/orderinquiryview.php index bf59646c4..e82bce128 100644 --- a/shop/orderinquiryview.php +++ b/shop/orderinquiryview.php @@ -57,6 +57,8 @@ if(openwin != null) {
        상품 배송이 완료되었습니다.
         @@ -541,18 +548,18 @@ if(openwin != null) { 0 && $od['od_receipt_amount'] == 0) { + if ($od_count1 == $od_count2 && ($od['od_settle_case'] != '가상계좌' || $od['od_receipt_amount'] == 0)) { ?>
        -
        + - + @@ -586,6 +593,22 @@ if(openwin != null) {
        + + \ No newline at end of file From 965a73c9dcc09841cf9b9d0abc3738db207452e5 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Mon, 8 Jul 2013 17:57:58 +0900 Subject: [PATCH 11/20] =?UTF-8?q?=EC=9E=84=EC=8B=9C=EC=A0=80=EC=9E=A5=20xm?= =?UTF-8?q?l=20=EB=B2=84=EC=A0=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/ajax.autosave.php | 2 - bbs/ajax.autosavedel.php | 15 ++++++++ bbs/ajax.autosavelist.php | 15 +++++--- bbs/ajax.autosaveload.php | 13 ++++--- skin/board/basic/write.skin.php | 65 ++++++++++++++++++++------------- 5 files changed, 73 insertions(+), 37 deletions(-) create mode 100644 bbs/ajax.autosavedel.php diff --git a/bbs/ajax.autosave.php b/bbs/ajax.autosave.php index 8adbd21e2..f497d0bb1 100644 --- a/bbs/ajax.autosave.php +++ b/bbs/ajax.autosave.php @@ -6,8 +6,6 @@ if (!$is_member) die('0'); $uid = escape_trim($_REQUEST['uid']); $subject = escape_trim(stripslashes($_REQUEST['subject'])); $content = escape_trim(stripslashes($_REQUEST['content'])); -//$subject = escape_trim(htmlentities($_REQUEST['subject'], ENT_QUOTES)); -//$content = escape_trim($_REQUEST['content']); if ($subject && $content) { $sql = " select count(*) as cnt from {$g4['autosave_table']} where mb_id = '{$member['mb_id']}' and as_subject = '$subject' and as_content = '$content' "; diff --git a/bbs/ajax.autosavedel.php b/bbs/ajax.autosavedel.php new file mode 100644 index 000000000..30395b04d --- /dev/null +++ b/bbs/ajax.autosavedel.php @@ -0,0 +1,15 @@ + \ No newline at end of file diff --git a/bbs/ajax.autosavelist.php b/bbs/ajax.autosavelist.php index c0b9871c3..68b214e75 100644 --- a/bbs/ajax.autosavelist.php +++ b/bbs/ajax.autosavelist.php @@ -3,14 +3,19 @@ include_once('./_common.php'); if (!$is_member) die(''); -$sql = " select as_id, as_subject, as_datetime from {$g4['autosave_table']} where mb_id = '{$member['mb_id']}' order by as_id desc "; +$sql = " select as_id, as_uid, as_subject, as_datetime from {$g4['autosave_table']} where mb_id = '{$member['mb_id']}' order by as_id desc "; $result = sql_query($sql); -$arr = array(); +echo "\n"; +echo "\n"; for ($i=0; $row=sql_fetch_array($result); $i++) { - //$subject = utf8_strcut(stripslashes($row['as_subject']), 25); $subject = htmlspecialchars(utf8_strcut($row['as_subject'], 25), ENT_QUOTES); $datetime = substr($row['as_datetime'],2,14); - $arr[] = "{\"id\": \"{$row['as_id']}\", \"subject\": \"{$subject}\", \"datetime\": \"{$datetime}\"}"; + echo "\n"; + echo "{$row['as_id']}\n"; + echo "{$row['as_uid']}\n"; + echo "\n"; + echo "{$datetime}\n"; + echo "\n"; } -echo "{\"autosave\":[".implode(", ", $arr)."]}"; +echo ""; ?> \ No newline at end of file diff --git a/bbs/ajax.autosaveload.php b/bbs/ajax.autosaveload.php index 1cf047765..2d90ab45c 100644 --- a/bbs/ajax.autosaveload.php +++ b/bbs/ajax.autosaveload.php @@ -7,9 +7,12 @@ $as_id = (int)$_REQUEST['as_id']; $sql = " select as_subject, as_content from {$g4['autosave_table']} where mb_id = '{$member['mb_id']}' and as_id = {$as_id} "; $row = sql_fetch($sql); -//$subject = stripslashes($row['as_subject']); -//$content = stripslashes($row['as_content']); -$subject = str_replace("\'", "\\\'", addslashes($row['as_subject'])); -$content = stripslashes($row['as_content']); -echo "{\"subject\":\"{$subject}\", \"content\":\"{$content}\"}"; +$subject = $row['as_subject']; +$content = $row['as_content']; + +echo "\n"; +echo "\n"; +echo "\n"; +echo "\n"; +echo "\n"; ?> \ No newline at end of file diff --git a/skin/board/basic/write.skin.php b/skin/board/basic/write.skin.php index 57f4e62b4..5f60e0dcf 100644 --- a/skin/board/basic/write.skin.php +++ b/skin/board/basic/write.skin.php @@ -234,8 +234,8 @@ function fwrite_submit(f) From a1fab9775384afd00628449f301a524746e61148 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Mon, 8 Jul 2013 18:15:10 +0900 Subject: [PATCH 12/20] =?UTF-8?q?uniqid=20table=20=EC=97=90=20uq=5Fip=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/config_form.php | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/adm/config_form.php b/adm/config_form.php index 6bb587a95..32a6f7bfa 100644 --- a/adm/config_form.php +++ b/adm/config_form.php @@ -63,13 +63,34 @@ if(!isset($config['cf_facebook_appid'])) { } // uniqid 테이블이 없을 경우 생성 -if(!sql_query(" select uq_id from {$g4['uniqid_table']} limit 1 ", false)) { +if(!sql_query(" DESC {$g4['uniqid_table']} ", false)) { sql_query(" CREATE TABLE IF NOT EXISTS `{$g4['uniqid_table']}` ( `uq_id` bigint(20) unsigned NOT NULL, + `uq_ip` varchar(255) NOT NULL, PRIMARY KEY (`uq_id`) ) ", false); } +if(!sql_query(" SELECT uq_ip from {$g4['uniqid_table']} limit 1 ", false)) { + sql_query(" ALTER TABLE {$g4['uniqid_table']} ADD `uq_ip` VARCHAR(255) NOT NULL "); +} + + +// 임시저장 테이블이 없을 경우 생성 +if(!sql_query(" DESC {$g4['autosave_table']} ", false)) { + sql_query(" CREATE TABLE IF NOT EXISTS `{$g4['autosave_table']}` ( + `as_id` int(11) NOT NULL AUTO_INCREMENT, + `mb_id` varchar(20) NOT NULL, + `as_uid` bigint(20) unsigned NOT NULL, + `as_subject` varchar(255) NOT NULL, + `as_content` text NOT NULL, + `as_datetime` datetime NOT NULL, + PRIMARY KEY (`as_id`), + UNIQUE KEY `as_uid` (`as_uid`), + KEY `mb_id` (`mb_id`) + ) ", false); +} + $g4['title'] = '환경설정'; include_once ('./admin.head.php'); From b7d9285305b7d3ad7b8816d171c24237ae71f7e5 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Mon, 8 Jul 2013 18:15:31 +0900 Subject: [PATCH 13/20] =?UTF-8?q?autosave(=EC=9E=84=EC=8B=9C=EC=A0=80?= =?UTF-8?q?=EC=9E=A5)=20table=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- install/gnuboard4s.sql | 21 ++++++++++++++++++++- install/install_db.php | 1 + 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/install/gnuboard4s.sql b/install/gnuboard4s.sql index da7695538..ee3bf8f63 100644 --- a/install/gnuboard4s.sql +++ b/install/gnuboard4s.sql @@ -646,4 +646,23 @@ CREATE TABLE IF NOT EXISTS `g4s_syndi_log` ( PRIMARY KEY (`content_id`,`bbs_id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; --- -------------------------------------------------------- \ No newline at end of file +-- -------------------------------------------------------- + +-- +-- Table structure for table `g4s_autosave` +-- + +DROP TABLE IF EXISTS `g4s_autosave`; +CREATE TABLE IF NOT EXISTS `g4s_autosave` ( + `as_id` int(11) NOT NULL AUTO_INCREMENT, + `mb_id` varchar(20) NOT NULL, + `as_uid` bigint(20) unsigned NOT NULL, + `as_subject` varchar(255) NOT NULL, + `as_content` text NOT NULL, + `as_datetime` datetime NOT NULL, + PRIMARY KEY (`as_id`), + UNIQUE KEY `as_uid` (`as_uid`), + KEY `mb_id` (`mb_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + +-- -------------------------------------------------------- diff --git a/install/install_db.php b/install/install_db.php index 7a2e9a0b1..936042d37 100644 --- a/install/install_db.php +++ b/install/install_db.php @@ -206,6 +206,7 @@ fwrite($f, "\$g4['visit_table'] = G4_TABLE_PREFIX.'visit'; // 방문자 테이 fwrite($f, "\$g4['visit_sum_table'] = G4_TABLE_PREFIX.'visit_sum'; // 방문자 합계 테이블\n"); fwrite($f, "\$g4['uniqid_table'] = G4_TABLE_PREFIX.'uniqid'; // 유니크한 값을 만드는 테이블\n"); fwrite($f, "\$g4['syndi_log_table'] = G4_TABLE_PREFIX.'syndi_log'; // 네이버 신디케이션 컨텐츠 삭제 로그 테이블\n"); +fwrite($f, "\$g4['autosave_table'] = G4_TABLE_PREFIX.'autosave'; // 게시글 작성시 일정시간마다 글을 임시 저장하는 테이블\n"); fwrite($f, " ?>"); fclose($f); From 7b3d5e883118ddae6d73227e33ad632df4a3304d Mon Sep 17 00:00:00 2001 From: gnuboard Date: Tue, 9 Jul 2013 14:19:12 +0900 Subject: [PATCH 14/20] =?UTF-8?q?=EC=9E=84=EC=8B=9C=EC=A0=80=EC=9E=A5=20?= =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20js=20=ED=8C=8C=EC=9D=BC=EB=A1=9C=20?= =?UTF-8?q?=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/autosave.js | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) create mode 100644 js/autosave.js diff --git a/js/autosave.js b/js/autosave.js new file mode 100644 index 000000000..f9684db1a --- /dev/null +++ b/js/autosave.js @@ -0,0 +1,98 @@ +// 임시 저장하는 시간을 초단위로 설정한다. +var AUTOSAVE_INTERVAL = 60; // 초 + +// 글의 제목과 내용을 바뀐 부분이 있는지 비교하기 위하여 저장해 놓는 변수 +var save_wr_subject = null; +var save_wr_content = null; + +function autosave() { + $("form#fwrite").each(function() { + if (typeof(CKEDITOR.instances.wr_content)!="undefined") + this.wr_content.value = CKEDITOR.instances.wr_content.getData(); + // 변수에 저장해 놓은 값과 다를 경우에만 임시 저장함 + if (save_wr_subject != this.wr_subject.value || save_wr_content != this.wr_content.value) { + $.ajax({ + url: g4_bbs_url+"/ajax.autosave.php", + data: { + "uid" : this.uid.value, + "subject": this.wr_subject.value, + "content": this.wr_content.value + }, + type: "POST", + success: function(data){ + if (data) { + $("#autosave_count").html(data); + } + } + }); + save_wr_subject = this.wr_subject.value; + save_wr_content = this.wr_content.value; + } + }); +} + +$(function(){ + + if (g4_is_member) { + setInterval(autosave, AUTOSAVE_INTERVAL * 1000); + } + + // 임시저장된 글목록을 가져옴 + $("#btn_autosave").click(function(){ + if ($("#autosave_pop").is(":hidden")) { + $.get(g4_bbs_url+"/ajax.autosavelist.php", function(data){ + //alert(data); + //console.log( "Data: " + data); + $("#autosave_pop ul").empty(); + if ($(data).find("list").find("item").length > 0) { + $(data).find("list").find("item").each(function(i) { + var id = $(this).find("id").text(); + var uid = $(this).find("uid").text(); + var subject = $(this).find("subject").text(); + var datetime = $(this).find("datetime").text(); + $("#autosave_pop ul").append('
      • '+subject+''+datetime+'
        • '); + $.data(document.body, "autosave_id"+i, id); + $.data(document.body, "autosave_uid"+i, uid); + }); + } + }, "xml"); + $("#autosave_pop").show(); + } else { + $("#autosave_pop").hide(); + } + }); + + // 임시저장된 글 제목과 내용을 가져와서 제목과 내용 입력박스에 노출해 줌 + $(".autosave_load").live("click", function(){ + var i = $(this).parents("li").index(); + var as_id = $.data(document.body, "autosave_id"+i); + var as_uid = $.data(document.body, "autosave_uid"+i); + $("#fwrite input[name='uid']").val(as_uid); + $.get(g4_bbs_url+"/ajax.autosaveload.php", {"as_id":as_id}, function(data){ + var subject = $(data).find("item").find("subject").text(); + var content = $(data).find("item").find("content").text(); + $("#wr_subject").val(subject); + if (typeof(CKEDITOR.instances.wr_content)!="undefined") { + CKEDITOR.instances.wr_content.setData(content); + } else { + $("#fwrite #wr_content").val(content); + } + }, "xml"); + $("#autosave_pop").hide(); + }); + + $(".autosave_del").live("click", function(){ + var i = $(this).parents("li").index(); + var as_id = $.data(document.body, "autosave_id"+i); + $.get(g4_bbs_url+"/ajax.autosavedel.php", {"as_id":as_id}, function(data){ + if (data == -1) { + alert("임시 저장된글을 삭제중에 오류가 발생하였습니다."); + } else { + $("#autosave_count").html(data); + $("#autosave_pop ul > li").eq(i).remove(); + } + }); + }); + + $(".autosave_close").click(function(){ $("#autosave_pop").hide(); }); +}); From 5c6daebb3775c543a915e1dc78c9d7f315d74f3e Mon Sep 17 00:00:00 2001 From: gnuboard Date: Tue, 9 Jul 2013 14:19:45 +0900 Subject: [PATCH 15/20] =?UTF-8?q?=EC=9E=84=EC=8B=9C=EC=A0=80=EC=9E=A5=20?= =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20js=20=ED=8C=8C=EC=9D=BC=EB=A1=9C=20?= =?UTF-8?q?=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- skin/board/basic/write.skin.php | 103 +----------------------------- skin/board/gallery/write.skin.php | 14 +++- 2 files changed, 16 insertions(+), 101 deletions(-) diff --git a/skin/board/basic/write.skin.php b/skin/board/basic/write.skin.php index 5f60e0dcf..2122dd611 100644 --- a/skin/board/basic/write.skin.php +++ b/skin/board/basic/write.skin.php @@ -106,16 +106,13 @@ echo $option_hidden;         - + From 7e21174d2780f74390faf8f5158dfe6d5a308b25 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Tue, 9 Jul 2013 14:27:42 +0900 Subject: [PATCH 16/20] =?UTF-8?q?=ED=95=84=EC=9A=94=EC=97=86=EB=8A=94=20?= =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugin/gcaptcha/info.php | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 plugin/gcaptcha/info.php diff --git a/plugin/gcaptcha/info.php b/plugin/gcaptcha/info.php deleted file mode 100644 index ded7f9648..000000000 --- a/plugin/gcaptcha/info.php +++ /dev/null @@ -1,17 +0,0 @@ - \ No newline at end of file From c02513cc05976e4b0c2aa23e85373166ff7623aa Mon Sep 17 00:00:00 2001 From: chicpro Date: Tue, 9 Jul 2013 17:18:58 +0900 Subject: [PATCH 17/20] =?UTF-8?q?=EC=A3=BC=EB=AC=B8=EC=83=81=EC=84=B8?= =?UTF-8?q?=EB=B3=B4=EA=B8=B0=EC=9D=98=20=EC=A3=BC=EB=AC=B8=EC=B4=9D?= =?UTF-8?q?=EC=95=A1=20od=5Ftemp=5Famount=20=EB=A1=9C=20=EB=8C=80=EC=B2=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/orderform.php | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/adm/shop_admin/orderform.php b/adm/shop_admin/orderform.php index 64361bce8..6a72c3f1a 100644 --- a/adm/shop_admin/orderform.php +++ b/adm/shop_admin/orderform.php @@ -91,13 +91,6 @@ if ($default['de_card_test']) { $g4['shop_cardpg']['kcp'] = "http://testadmin8.kcp.co.kr"; } -// 주문총액 -$sql = " select SUM(IF(io_type = 1, io_price * ct_qty, (ct_price + io_price) * ct_qty)) as sum_order - from {$g4['shop_cart_table']} - where uq_id = '{$od['uq_id']}' "; -$row = sql_fetch($sql); -$total_order = $row['sum_order']; - // 상품목록 $sql = " select it_id, it_name, @@ -123,7 +116,7 @@ $pg_anchor = '

          주문상품 목록

          -

          주문일시 () / 주문총액 원

          +

          주문일시 () / 주문총액 원

          희망배송일은 () 입니다.

          모바일 쇼핑몰의 주문입니다.

          From bfc4b14de1c1d3403081d456bc4408408af9c93c Mon Sep 17 00:00:00 2001 From: gnuboard Date: Tue, 9 Jul 2013 17:42:18 +0900 Subject: [PATCH 18/20] =?UTF-8?q?=EB=8F=99=EC=9D=BC=EA=B7=B8=EB=A3=B9=20?= =?UTF-8?q?=EA=B2=8C=EC=8B=9C=ED=8C=90=EB=AA=A9=EB=A1=9D=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EB=B3=B5=EC=9B=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/board_form.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adm/board_form.php b/adm/board_form.php index f7cd0c245..6b42b17d5 100644 --- a/adm/board_form.php +++ b/adm/board_form.php @@ -185,7 +185,7 @@ $pg_anchor = '
         From 29835f5bb6049375bb3efc54f9e9f64c197b8cd2 Mon Sep 17 00:00:00 2001 From: whitedot Date: Wed, 10 Jul 2013 16:30:54 +0900 Subject: [PATCH 19/20] =?UTF-8?q?font-family=20=EC=A7=80=EC=A0=95=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 --- css/admin.css | 10 +++++----- css/default.css | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/css/admin.css b/css/admin.css index 13cdd831e..4f84f3ddb 100644 --- a/css/admin.css +++ b/css/admin.css @@ -3,13 +3,13 @@ /* 초기화 */ html {overflow-y:scroll} -body {margin:0;padding:0;background:#f5f6fa;color:#000;font-size:0.75em;font-family:"dotum"} +body {margin:0;padding:0;background:#f5f6fa;color:#000;font-size:0.75em;font-family:dotum} html, h1, h2, h3, h4, h5, h6, form, fieldset, img {margin:0;padding:0;border:0} -h1, h2, h3, h4, h5, h6 {font-size:1em;font-family:"dotum"} +h1, h2, h3, h4, h5, h6 {font-size:1em;font-family:dotum} article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section {display:block} header ul, nav ul, aside ul, footer ul {margin:0;padding:0;list-style:none} label, input, select, img {vertical-align:middle} -input {margin:0;padding:0;border-radius:0;font-family:"dotum"} +input {margin:0;padding:0;border-radius:0;font-family:dotum} input[type=text], input[type=password], input[type=submit], input[type=image] {-webkit-appearance:none} button {border-radius:0;font-size:1em;-webkit-appearance:none} p {margin:0;padding:10px 0;line-height:1.7em;word-break:break-all} @@ -18,7 +18,7 @@ pre {overflow-x:scroll;font-size:1.1em} a {color:#000;text-decoration:none} a:focus, a:hover, a:active {text-decoration:underline} /* 헤딩 */ -h1 {margin-bottom:20px;color:#333;font-size:1.5em;font-family:"dotum";letter-spacing:-0.1em} +h1 {margin-bottom:20px;color:#333;font-size:1.5em;font-family:dotum;letter-spacing:-0.1em} h2 {font-size:1.2em} /* 레이아웃 */ @@ -304,7 +304,7 @@ td {padding:8px 5px 6px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9 .new_win_ul {margin:-20px 0 20px 0;padding:0 0 0 20px;border-bottom:1px solid #515151;background:#484848;list-style:none;zoom:1} .new_win_ul:after {display:block;visibility:hidden;clear:both;content:""} .new_win_ul li {float:left;margin-left:-1px} -.new_win_ul a {display:block;padding:10px 10px 8px;border-right:1px solid #595959;border-left:1px solid #595959;color:#fff;font-family:"dotum";font-weight:bold;text-decoration:none} +.new_win_ul a {display:block;padding:10px 10px 8px;border-right:1px solid #595959;border-left:1px solid #595959;color:#fff;font-family:dotum;font-weight:bold;text-decoration:none} .new_win_desc {margin:0 auto;width:93%} /* 자바스크립트 alert 대안 */ diff --git a/css/default.css b/css/default.css index 2390370f3..dfdc7adb1 100644 --- a/css/default.css +++ b/css/default.css @@ -3,13 +3,13 @@ /* 초기화 */ html {overflow-y:scroll} -body {margin:0;padding:0;background:#f9fafe;color:#000;font-size:0.75em;font-family:"dotum"} +body {margin:0;padding:0;background:#f9fafe;color:#000;font-size:0.75em;font-family:dotum} html, h1, h2, h3, h4, h5, h6, form, fieldset, img {margin:0;padding:0;border:0} -h1, h2, h3, h4, h5, h6 {font-size:1em;font-family:"dotum"} +h1, h2, h3, h4, h5, h6 {font-size:1em;font-family:dotum} article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section {display:block} header ul, nav ul, footer ul {margin:0;padding:0;list-style:none} label, input, select, img {vertical-align:middle} -input {margin:0;padding:0;border-radius:0;font-family:"dotum"} +input {margin:0;padding:0;border-radius:0;font-family:dotum} button {border-radius:0;font-size:1em} p {margin:0;padding:10px 0;line-height:1.7em;word-break:break-all} hr {display:none} @@ -206,7 +206,7 @@ td.empty_table {padding:85px 0;text-align:center} .new_win_ul {margin:-20px 0 20px 0;padding:0 0 0 20px;border-bottom:1px solid #455255;background:#484848;list-style:none;zoom:1} .new_win_ul:after {display:block;visibility:hidden;clear:both;content:""} .new_win_ul li {float:left;margin-left:-1px} -.new_win_ul a {display:block;padding:10px 10px 8px;border-right:1px solid #455255;border-left:1px solid #455255;color:#fff;font-family:"dotum";font-weight:bold;text-decoration:none} +.new_win_ul a {display:block;padding:10px 10px 8px;border-right:1px solid #455255;border-left:1px solid #455255;color:#fff;font-family:dotum;font-weight:bold;text-decoration:none} .new_win_desc {margin:0 auto;width:93%} /* 자바스크립트 alert 대안 */ From e454a7f0b7846dafb4ed00e1251c2659f5dd3408 Mon Sep 17 00:00:00 2001 From: whitedot Date: Wed, 10 Jul 2013 17:57:51 +0900 Subject: [PATCH 20/20] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20input=20fo?= =?UTF-8?q?cus=20hover=20style=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/default.css | 10 +++------- skin/outlogin/basic/style.css | 2 -- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/css/default.css b/css/default.css index dfdc7adb1..0d48aad09 100644 --- a/css/default.css +++ b/css/default.css @@ -14,11 +14,8 @@ button {border-radius:0;font-size:1em} p {margin:0;padding:10px 0;line-height:1.7em;word-break:break-all} hr {display:none} pre {overflow-x:scroll;font-size:1.1em} -a:link, -a:visited {color:#000;text-decoration:none} -a:hover, -a:focus, -a:active {color:#000;text-decoration:underline} +a:link, a:visited {color:#000;text-decoration:none} +a:hover, a:focus, a:active {color:#000;text-decoration:underline} /* 상단 레이아웃 */ #hd {z-index:10;position:relative;border-top:3px solid #151515;background:#fff} @@ -174,8 +171,7 @@ td.empty_table {padding:85px 0;text-align:center} .frm_tbl caption {padding:10px 0;font-weight:bold;text-align:left} .frm_tbl th {width:100px;padding:7px 13px;border:1px solid #e9e9e9;border-left:0;background:#f7f7f7;text-align:left} .frm_tbl td {padding:7px 10px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9;background:transparent} -.frm_tbl textarea, .frm_input {padding:2px 2px 3px;border:1px solid #b8c9c2;background:#f7f7f7;vertical-align:middle} -.frm_input:focus, input.required:focus {padding:3px 3px 4px;border:0;background:#21272e !important;color:#fff} +.frm_tbl textarea, .frm_input {padding:2px 2px 3px;border:1px solid #b8c9c2;background:#f7f7f7;color:#000;vertical-align:middle} .frm_tbl textarea {width:98%;height:100px} .frm_address {display:block;margin-top:5px} .frm_file {display:block;margin-bottom:5px} diff --git a/skin/outlogin/basic/style.css b/skin/outlogin/basic/style.css index 8f9d777aa..075a1a215 100644 --- a/skin/outlogin/basic/style.css +++ b/skin/outlogin/basic/style.css @@ -6,10 +6,8 @@ #ol_before {} #ol_before fieldset {position:relative} #ol_id {display:block;margin:0 0 5px !important;margin:0 0 3px;padding:0 5px;width:168px;height:22px;border:1px solid #b8c9c2;background:#f7f7f7;line-height:1.6em} -#ol_id:focus {border-color:#333;background:#21272e;color:#fff} .ol_idlabel {position:absolute;top:6px;left:5px;color:#333;font-size:0.95em} #ol_pw {display:block;margin:0 0 5px !important;margin:0 0 3px;padding:0 5px;width:168px;height:22px;border:1px solid #b8c9c2;background:#f7f7f7;vertical-align:top;line-height:1.6em} -#ol_pw:focus {border-color:#333;background:#21272e;color:#fff} .ol_pwlabel {position:absolute;top:35px;left:5px;color:#333;font-size:0.95em} #auto_login {} #auto_login_label {letter-spacing:-0.1em}
        결제 취소금액결제 취소금액
        원 - 결제부분취소
        원 - 결제부분취소
        - + +
        임시 저장된 글 목록
        -
          - - - -
        +
          @@ -230,97 +227,3 @@ function fwrite_submit(f) } - - diff --git a/skin/board/gallery/write.skin.php b/skin/board/gallery/write.skin.php index cec6ba51b..cab5d12a2 100644 --- a/skin/board/gallery/write.skin.php +++ b/skin/board/gallery/write.skin.php @@ -102,7 +102,19 @@ echo $option_hidden;
          + + + + +
          + 임시 저장된 글 목록 +
          +
            +
            +
            + +
            - + 동일그룹 게시판목록