From 373c98017bf73312b804e9aa0e659a2045be2dbd Mon Sep 17 00:00:00 2001 From: gnuboard Date: Wed, 6 Nov 2013 10:11:05 +0900 Subject: [PATCH 1/4] =?UTF-8?q?#319=20=EC=83=81=ED=92=88=ED=85=8C=EC=9D=B4?= =?UTF-8?q?=EB=B8=94=EC=97=90=20=EA=B2=80=EC=83=89=EC=9D=84=20=EC=9C=84?= =?UTF-8?q?=ED=95=98=EC=97=AC=20=ED=83=9C=EA=B7=B8=EC=97=86=EB=8A=94=20?= =?UTF-8?q?=EC=83=81=ED=92=88=EC=84=A4=EB=AA=85=20=EC=A0=80=EC=9E=A5?= =?UTF-8?q?=EC=9A=A9=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 --- extend/shop.extend2.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/extend/shop.extend2.php b/extend/shop.extend2.php index 1107521c0..fb6913d03 100644 --- a/extend/shop.extend2.php +++ b/extend/shop.extend2.php @@ -373,6 +373,7 @@ if(!$result) { } */ +/* // 쇼핑몰 스킨 필드 추가 if (!isset($default['de_shop_skin'])) { sql_query(" ALTER TABLE `{$g5['g5_shop_default_table']}` @@ -645,4 +646,12 @@ if(stripos($row['Type'], 'enum') !== false) { sql_query(" ALTER TABLE `{$g5['g5_shop_cart_table']}` CHANGE `ct_status` `ct_status` varchar(255) NOT NULL DEFAULT '' ", true); } +*/ + + +// 상품테이블에 검색을 위하여 태그없는 상품설명 저장용 필드 추가 +if(!sql_query(" select it_explan_strip_tags from {$g5['g5_shop_item_table']} limit 1 ", false)) { + sql_query(" ALTER TABLE `{$g5['g5_shop_item_table']}` + ADD `it_explan_strip_tags` TEXT NOT NULL AFTER `it_explan` ", true); +} ?> From 89a43977c353ce8fc0fcf0e5da4ef0efb867df7f Mon Sep 17 00:00:00 2001 From: gnuboard Date: Wed, 6 Nov 2013 10:17:43 +0900 Subject: [PATCH 2/4] =?UTF-8?q?it=5Fexplan=5Fstrip=5Ftags=20=EC=9D=98=20?= =?UTF-8?q?=ED=95=84=EB=93=9C=ED=98=95=EC=9D=84=20TEXT=20=EC=97=90?= =?UTF-8?q?=EC=84=9C=20MEDIUMTEXT=20=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- extend/shop.extend2.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extend/shop.extend2.php b/extend/shop.extend2.php index fb6913d03..8b3e81de4 100644 --- a/extend/shop.extend2.php +++ b/extend/shop.extend2.php @@ -652,6 +652,6 @@ if(stripos($row['Type'], 'enum') !== false) { // 상품테이블에 검색을 위하여 태그없는 상품설명 저장용 필드 추가 if(!sql_query(" select it_explan_strip_tags from {$g5['g5_shop_item_table']} limit 1 ", false)) { sql_query(" ALTER TABLE `{$g5['g5_shop_item_table']}` - ADD `it_explan_strip_tags` TEXT NOT NULL AFTER `it_explan` ", true); + ADD `it_explan_strip_tags` METIUMTEXT NOT NULL AFTER `it_explan` ", true); } ?> From f50e86744723fdf53a25fac20c5817a8385a075d Mon Sep 17 00:00:00 2001 From: gnuboard Date: Wed, 6 Nov 2013 10:38:38 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=EC=A0=84=EC=8B=9C=EC=83=81=ED=92=88=20?= =?UTF-8?q?=ED=95=AD=EB=AA=A9=20=EC=82=AD=EC=A0=9C=20it=5Fgallery?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/Excel/itemexcel.xls | Bin 33280 -> 33280 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/lib/Excel/itemexcel.xls b/lib/Excel/itemexcel.xls index d4def68a7ff109c948dab872dfe12eda5b5ac84b..08cd80eff8fbd0be89b086cc66f2d74c6b3693d3 100644 GIT binary patch delta 757 zcmaJkCf*_%Sph6WrRZ0)mTQ5Bo1ZmN4rdpaD++p9$y!YmPvojlv%V1p2 zn=*4X`zii$Q6Lrv)*vw-eai^^;P*PJYJAHhPu?J3Mrm3;79c;8YQlRBj7>|C7VWUR z5~vA|ij2V!Utjz0+wuM7;a47xVHE;r@kSMkj5!=?C+vS_hummNICO;(G^~*g^gPVGsT!)xU7ib?Rv0cAmz_-V9Pbq|p?K}A}&73I@Xg!TQUmxHLOLOYP)96_5i?6_>^leAFm6>YRpoM>I< z@4U#{w$VjX1O39JwSk@!jo-JkcU_8MqZoRnnU?eu$6(2fja_8 z#0VrZd$O`YFuNg}Do{doa;-t-cCq4?&%2HmW(OV0jh&|=_V zXwYL|-~p=5(Pv=z0i?4G7#O}yUTRjVh#WKAOd=qQzyK6rnxPB~-J7k=AImGM0J$7Y z0$?c>hG2FO!-0_>ECvdBmC5$uqVmc>);R7XQx z1yl?MvXPT*%;!v=7j;b*pR%=^Cq_FkO^WMfG@jfSr_CDTUv3t&d0*TKen!5@{dtm` Z7v!B0oE&SxF}VbohP9(N|7u`k1OV#Yr+WYZ From 1c08308981cbe7b0350f0f762a5080db18a3a3d3 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Wed, 6 Nov 2013 10:45:11 +0900 Subject: [PATCH 4/4] =?UTF-8?q?#319=20it=5Fexplan=5Fstrip=5Ftags=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=20=EB=B0=8F=20it=5Fexplan=5Fhtml=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/itemexcelupdate.php | 2 +- adm/shop_admin/itemform.php | 14 -------------- adm/shop_admin/itemformupdate.php | 4 +++- install/gnuboard5shop.sql | 2 +- 4 files changed, 5 insertions(+), 17 deletions(-) diff --git a/adm/shop_admin/itemexcelupdate.php b/adm/shop_admin/itemexcelupdate.php index bb6061140..b0a5dde5b 100644 --- a/adm/shop_admin/itemexcelupdate.php +++ b/adm/shop_admin/itemexcelupdate.php @@ -73,7 +73,7 @@ if($_FILES['excelfile']['tmp_name']) { $comma = ''; $sql = " INSERT INTO {$g5['g5_shop_item_table']} - ( it_id, ca_id, ca_id2, ca_id3, it_name, it_maker, it_origin, it_brand, it_model, it_type1, it_type2, it_type3, it_type4, it_type5, it_basic, it_explan, it_mobile_explan, it_explan_html, it_cust_price, it_price, it_point, it_sell_email, it_use, it_stock_qty, it_time, it_ip, it_order, it_tel_inq, it_img1, it_img2, it_img3, it_img4, it_img5, it_img6, it_img7, it_img8, it_img9, it_img10 ) + ( it_id, ca_id, ca_id2, ca_id3, it_name, it_maker, it_origin, it_brand, it_model, it_type1, it_type2, it_type3, it_type4, it_type5, it_basic, it_explan, it_mobile_explan, it_cust_price, it_price, it_point, it_sell_email, it_use, it_stock_qty, it_time, it_ip, it_order, it_tel_inq, it_img1, it_img2, it_img3, it_img4, it_img5, it_img6, it_img7, it_img8, it_img9, it_img10 ) VALUES "; for ($i = 3; $i <= $data->sheets[0]['numRows']; $i++) { diff --git a/adm/shop_admin/itemform.php b/adm/shop_admin/itemform.php index b3520689f..6e7cc0f43 100644 --- a/adm/shop_admin/itemform.php +++ b/adm/shop_admin/itemform.php @@ -59,13 +59,6 @@ else alert(); } -if (!$it['it_explan_html']) -{ - $it['it_explan'] = get_text($it['it_explan'], 1); -} - -//$qstr1 = 'sel_ca_id='.$sel_ca_id.'&sel_field='.$sel_field.'&search='.$search; -//$qstr = $qstr1.'&sort1='.$sort1.'&sort2='.$sort2.'&page='.$page; $qstr = $qstr.'&sca='.$sca.'&page='.$page; $g5['title'] = $html_title; @@ -114,18 +107,12 @@ $pg_anchor ='
    - -

    상품분류

    @@ -1613,7 +1600,6 @@ function categorychange(f) if (f.w.value == "" && idx) { f.it_use.checked = ca_use[idx] ? true : false; - //f.it_explan_html[ca_explan_html[idx]].checked = true; f.it_stock_qty.value = ca_stock_qty[idx]; f.it_sell_email.value = ca_sell_email[idx]; } diff --git a/adm/shop_admin/itemformupdate.php b/adm/shop_admin/itemformupdate.php index 03108ecd7..19b0ad922 100644 --- a/adm/shop_admin/itemformupdate.php +++ b/adm/shop_admin/itemformupdate.php @@ -260,6 +260,8 @@ $it_name = strip_tags(trim($_POST['it_name'])); if ($it_name == "") alert("상품명을 입력해 주십시오."); +$it_explan_strip_tags = strip_tags(trim($_POST['it_explan'])); + $sql_common = " ca_id = '$ca_id', ca_id2 = '$ca_id2', ca_id3 = '$ca_id3', @@ -278,7 +280,7 @@ $sql_common = " ca_id = '$ca_id', it_type5 = '$it_type5', it_basic = '$it_basic', it_explan = '$it_explan', - it_explan_html = '$it_explan_html', + it_explan_strip_tags= '$it_explan_strip_tags', it_mobile_explan = '$it_mobile_explan', it_cust_price = '$it_cust_price', it_price = '$it_price', diff --git a/install/gnuboard5shop.sql b/install/gnuboard5shop.sql index bc4105295..7fe0e06fc 100644 --- a/install/gnuboard5shop.sql +++ b/install/gnuboard5shop.sql @@ -426,8 +426,8 @@ CREATE TABLE IF NOT EXISTS `g5_shop_item` ( `it_type5` tinyint(4) NOT NULL DEFAULT '0', `it_basic` text NOT NULL, `it_explan` mediumtext NOT NULL, + `it_explan_strip_tags` mediumtext NOT NULL, `it_mobile_explan` mediumtext NOT NULL, - `it_explan_html` tinyint(4) NOT NULL DEFAULT '0', `it_cust_price` int(11) NOT NULL DEFAULT '0', `it_price` int(11) NOT NULL DEFAULT '0', `it_point` int(11) NOT NULL DEFAULT '0',