From f7aac7c46746f86a0162c361d603e388c9bbfc05 Mon Sep 17 00:00:00 2001 From: loves2tu Date: Tue, 21 Dec 2021 04:40:23 +0000 Subject: [PATCH 01/27] =?UTF-8?q?=EA=B5=AC=EA=B8=80=20=ED=8C=90=EB=A7=A4?= =?UTF-8?q?=EC=9E=90=EC=84=BC=ED=84=B0=20=ED=94=BC=EB=93=9C=20=20-=20?= =?UTF-8?q?=EC=83=81=ED=92=88=20=EA=B4=80=EB=A0=A8=20query=20=EC=9E=91?= =?UTF-8?q?=EC=97=85=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shop/price/feedtest.xml | 23 +++++++++++++++++++++++ shop/price/google_feed.php | 30 ++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 shop/price/feedtest.xml create mode 100644 shop/price/google_feed.php diff --git a/shop/price/feedtest.xml b/shop/price/feedtest.xml new file mode 100644 index 000000000..e955cdd2c --- /dev/null +++ b/shop/price/feedtest.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/shop/price/google_feed.php b/shop/price/google_feed.php new file mode 100644 index 000000000..77e0314f9 --- /dev/null +++ b/shop/price/google_feed.php @@ -0,0 +1,30 @@ + '0' order by ca_id"; +$result = sql_query($sql); + +$xml = array(); +$xml['rss'] = "version=\"2.0\" xmlns:g=\"http:base.google.com/ns/1.0\""; +$xml['channel'] = array( + "title" => "타이틀", + "link" => "링크", + "description" => "몰?루" +); + +$items = array(); +while($row = sql_fetch_array($result)) { + $items['title'] = $row['it_name']; + $items['link'] = G5_SHOP_URL.'/item.php?it_id='.$row['it_id']; + $items['description'] = $row['it_basic']; + // $items['g:image_link'] = G5_DATA_PATH.'/item/'.$row[''] +} + +header('Content-type: text/xml'); +echo "\n"; + +?> \ No newline at end of file From 8faa9ba9a2c49d30384bce510da4c2a15fb8643f Mon Sep 17 00:00:00 2001 From: loves2tu Date: Tue, 21 Dec 2021 07:58:42 +0000 Subject: [PATCH 02/27] =?UTF-8?q?=EA=B5=AC=EA=B8=80=20=ED=8C=90=EB=A7=A4?= =?UTF-8?q?=EC=9E=90=EC=84=BC=ED=84=B0=20=ED=94=BC=EB=93=9C=20=20-=20echo?= =?UTF-8?q?=20xml=20=EC=83=9D=EC=84=B1=20=EA=B4=80=EB=A0=A8=20=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=EC=A0=81=EC=9A=A9=20=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shop/price/google_feed.php | 43 +++++++++++++++++++++++++++++--------- 1 file changed, 33 insertions(+), 10 deletions(-) diff --git a/shop/price/google_feed.php b/shop/price/google_feed.php index 77e0314f9..3578a7be4 100644 --- a/shop/price/google_feed.php +++ b/shop/price/google_feed.php @@ -1,6 +1,19 @@ $val) { + if(is_numeric($key)) { + $result .= array_xml($val); + } else { + $result .= "<{$key}>".array_xml($val).""; + } + } + return $result; +} + ob_end_clean(); ob_start(); @@ -8,23 +21,33 @@ ob_start(); $sql =" select * from {$g5['g5_shop_item_table']} where it_use = '1' and it_soldout = '0' and it_tel_inq = '0' and it_price > '0' order by ca_id"; $result = sql_query($sql); -$xml = array(); -$xml['rss'] = "version=\"2.0\" xmlns:g=\"http:base.google.com/ns/1.0\""; -$xml['channel'] = array( +$xml = array( "channel" => array( "title" => "타이틀", "link" => "링크", "description" => "몰?루" -); +)); $items = array(); -while($row = sql_fetch_array($result)) { - $items['title'] = $row['it_name']; - $items['link'] = G5_SHOP_URL.'/item.php?it_id='.$row['it_id']; - $items['description'] = $row['it_basic']; - // $items['g:image_link'] = G5_DATA_PATH.'/item/'.$row[''] +for ($i = 0; $row = sql_fetch_array($result); $i++ ) { + if(empty($row['it_img1'])) continue; + if(!file_exists(G5_DATA_PATH.'/item/'.$row['it_img1'])) continue; + + $xml['channel']['item'][$i]['title'] = $row['it_name']; + $xml['channel']['item'][$i]['link'] = G5_SHOP_URL.'/item.php?it_id='.$row['it_id']; + $xml['channel']['item'][$i]['description'] = $row['it_basic']; + $xml['channel']['item'][$i]['g:image_link'] = G5_DATA_URL.'/item/'.$row['it_img1']; + $xml['channel']['item'][$i]['g:condition'] = "new"; + $xml['channel']['item'][$i]['g:id'] = $row['it_id']; } header('Content-type: text/xml'); -echo "\n"; +echo ""; +echo ""; + +foreach($xml as $key => $var) { + echo array_xml($var); +} + +echo ""; ?> \ No newline at end of file From 98b085e73e081ed7d9b10ce90e7996b3a48b7436 Mon Sep 17 00:00:00 2001 From: loves2tu Date: Thu, 23 Dec 2021 02:09:11 +0000 Subject: [PATCH 03/27] =?UTF-8?q?=EA=B5=AC=EA=B8=80=20=ED=8C=90=EB=A7=A4?= =?UTF-8?q?=EC=9E=90=EC=84=BC=ED=84=B0=20=ED=94=BC=EB=93=9C=20=20-=20query?= =?UTF-8?q?=20=EC=88=98=EC=A0=95=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shop/price/google_feed.php | 78 +++++++++++++++++++------------------- 1 file changed, 40 insertions(+), 38 deletions(-) diff --git a/shop/price/google_feed.php b/shop/price/google_feed.php index 3578a7be4..2fecac52b 100644 --- a/shop/price/google_feed.php +++ b/shop/price/google_feed.php @@ -1,53 +1,55 @@ $val) { - if(is_numeric($key)) { - $result .= array_xml($val); - } else { - $result .= "<{$key}>".array_xml($val).""; - } - } - return $result; -} - -ob_end_clean(); - -ob_start(); - -$sql =" select * from {$g5['g5_shop_item_table']} where it_use = '1' and it_soldout = '0' and it_tel_inq = '0' and it_price > '0' order by ca_id"; +$sql =" select *, if((SELECT io_stock_qty FROM `{$g5['g5_shop_item_option_table']}` WHERE it_id = a.it_id GROUP BY it_id HAVING io_stock_qty < 1) != null, 0, 1) as in_stock + from `{$g5['g5_shop_item_table']}` as a + where it_use = '1' and it_soldout = '0' and it_tel_inq = '0' and it_price > '0' order by ca_id"; $result = sql_query($sql); -$xml = array( "channel" => array( - "title" => "타이틀", - "link" => "링크", - "description" => "몰?루" -)); +// $xml = new SimpleXMLElement(""); +$xml = new SimpleXMLElement(""); +$xml->addAttribute("xmlns:xmlns:g", "http://base.google.com/ns/1.0"); +$xml->addAttribute("version", "2.0"); +$channel = $xml->addChild("channel"); +$title = $channel->addChild("title", "타이틀"); +$link = $channel->addChild("link", "링크"); +$description = $channel->addChild("description", "몰?루"); -$items = array(); for ($i = 0; $row = sql_fetch_array($result); $i++ ) { + $item = $channel->addChild("item"); if(empty($row['it_img1'])) continue; if(!file_exists(G5_DATA_PATH.'/item/'.$row['it_img1'])) continue; - $xml['channel']['item'][$i]['title'] = $row['it_name']; - $xml['channel']['item'][$i]['link'] = G5_SHOP_URL.'/item.php?it_id='.$row['it_id']; - $xml['channel']['item'][$i]['description'] = $row['it_basic']; - $xml['channel']['item'][$i]['g:image_link'] = G5_DATA_URL.'/item/'.$row['it_img1']; - $xml['channel']['item'][$i]['g:condition'] = "new"; - $xml['channel']['item'][$i]['g:id'] = $row['it_id']; + $item->addChild("title", $row['it_name']); + $item->addChild("link", G5_SHOP_URL.'/item.php?it_id='.urlencode($row['it_id'])); + $item->addChild("description", strip_tags($row['it_basic'])); + + $ext = explode('.', $row['it_img1'])[1]; + + switch($ext) { + case "jpg": + case "jpeg": + case "webp": + case "png": + case "gif": + case "bmp": + case "tif": + case "tiff": + $ext_check = true; + break; + default: + $ext_check = false; + break; + } + + if($ext_check == false) continue; + $item->addChild("xmlns:g:image_link", G5_DATA_URL.'/item/'.$row['it_img1']); + + $item->addChild("xmlns:g:condition", "new"); + $item->addChild("xmlns:g:id", $row['it_id']); } header('Content-type: text/xml'); -echo ""; -echo ""; - -foreach($xml as $key => $var) { - echo array_xml($var); -} - -echo ""; +echo $xml->asXML(); ?> \ No newline at end of file From 7a2c29f19255e1e6c699e481f364f4ff9fbd4307 Mon Sep 17 00:00:00 2001 From: loves2tu Date: Mon, 27 Dec 2021 05:56:08 +0000 Subject: [PATCH 04/27] =?UTF-8?q?=EA=B5=AC=EA=B8=80=20=ED=8C=90=EB=A7=A4?= =?UTF-8?q?=EC=9E=90=EC=84=BC=ED=84=B0=20=ED=94=BC=EB=93=9C=20=20-=20query?= =?UTF-8?q?=20=EC=88=98=EC=A0=95=20=20-=20=EC=98=88=EC=99=B8=EC=B2=98?= =?UTF-8?q?=EB=A6=AC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shop/price/google_feed.php | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/shop/price/google_feed.php b/shop/price/google_feed.php index 2fecac52b..effef0f7c 100644 --- a/shop/price/google_feed.php +++ b/shop/price/google_feed.php @@ -1,29 +1,26 @@ '0' order by ca_id"; +$sql =" SELECT *, (SELECT MIN(`io_stock_qty`) FROM `g5_shop_item_option` WHERE `it_id` = a.`it_id` GROUP BY `it_id`) AS in_stock + FROM `{$g5['g5_shop_item_table']}` as a + where a.`it_use` = '1' and a.`it_soldout` = '0' and a.`it_tel_inq` = '0' and a.`it_price` > '0' order by a.`ca_id`"; $result = sql_query($sql); -// $xml = new SimpleXMLElement(""); $xml = new SimpleXMLElement(""); $xml->addAttribute("xmlns:xmlns:g", "http://base.google.com/ns/1.0"); $xml->addAttribute("version", "2.0"); $channel = $xml->addChild("channel"); -$title = $channel->addChild("title", "타이틀"); -$link = $channel->addChild("link", "링크"); +$title = $channel->addChild("title", "쇼핑몰피드"); +$link = $channel->addChild("link", G5_URL); $description = $channel->addChild("description", "몰?루"); for ($i = 0; $row = sql_fetch_array($result); $i++ ) { - $item = $channel->addChild("item"); + if($row['in_stock'] != null) { + if($row['in_stock'] <= 0) continue; + } if(empty($row['it_img1'])) continue; if(!file_exists(G5_DATA_PATH.'/item/'.$row['it_img1'])) continue; - $item->addChild("title", $row['it_name']); - $item->addChild("link", G5_SHOP_URL.'/item.php?it_id='.urlencode($row['it_id'])); - $item->addChild("description", strip_tags($row['it_basic'])); - $ext = explode('.', $row['it_img1'])[1]; switch($ext) { @@ -43,10 +40,14 @@ for ($i = 0; $row = sql_fetch_array($result); $i++ ) { } if($ext_check == false) continue; - $item->addChild("xmlns:g:image_link", G5_DATA_URL.'/item/'.$row['it_img1']); - - $item->addChild("xmlns:g:condition", "new"); - $item->addChild("xmlns:g:id", $row['it_id']); + + $item = $channel->addChild("item"); + $item->addChild("title", $row['it_name']); + $item->addChild("link", G5_SHOP_URL.'/item.php?it_id='.urlencode($row['it_id'])); + $item->addChild("description", strip_tags($row['it_basic'])); + $item->addChild("g:g:image_link", G5_DATA_URL.'/item/'.$row['it_img1']); + $item->addChild("g:g:condition", "new"); + $item->addChild("g:g:id", $row['it_id']); } header('Content-type: text/xml'); From 322e5cf83a84183bc3d02225dd8a2c0c2cfe2a61 Mon Sep 17 00:00:00 2001 From: loves2tu Date: Tue, 28 Dec 2021 03:08:28 +0000 Subject: [PATCH 05/27] =?UTF-8?q?=EA=B5=AC=EA=B8=80=20=ED=8C=90=EB=A7=A4?= =?UTF-8?q?=EC=9E=90=EC=84=BC=ED=84=B0=20=ED=94=BC=EB=93=9C=20=20-=20?= =?UTF-8?q?=EC=84=B1=EC=9D=B8=EC=9D=B8=EC=A6=9D=EA=B4=80=EB=A0=A8=20catego?= =?UTF-8?q?ry=20=EC=A1=B0=ED=9A=8C=20query=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shop/price/google_feed.php | 51 ++++++++++++++++++++++++++++++++------ 1 file changed, 43 insertions(+), 8 deletions(-) diff --git a/shop/price/google_feed.php b/shop/price/google_feed.php index effef0f7c..10b06752c 100644 --- a/shop/price/google_feed.php +++ b/shop/price/google_feed.php @@ -1,7 +1,25 @@ '0' order by a.`ca_id`"; $result = sql_query($sql); @@ -15,9 +33,10 @@ $link = $channel->addChild("link", G5_URL); $description = $channel->addChild("description", "몰?루"); for ($i = 0; $row = sql_fetch_array($result); $i++ ) { + $stock = "in_stock"; if($row['in_stock'] != null) { - if($row['in_stock'] <= 0) continue; - } + if($row['in_stock'] <= 0) $stock = "out_of_stock"; + } if(empty($row['it_img1'])) continue; if(!file_exists(G5_DATA_PATH.'/item/'.$row['it_img1'])) continue; @@ -42,12 +61,28 @@ for ($i = 0; $row = sql_fetch_array($result); $i++ ) { if($ext_check == false) continue; $item = $channel->addChild("item"); - $item->addChild("title", $row['it_name']); - $item->addChild("link", G5_SHOP_URL.'/item.php?it_id='.urlencode($row['it_id'])); - $item->addChild("description", strip_tags($row['it_basic'])); - $item->addChild("g:g:image_link", G5_DATA_URL.'/item/'.$row['it_img1']); - $item->addChild("g:g:condition", "new"); + // 필수 입력 항목 $item->addChild("g:g:id", $row['it_id']); + $item->addChild("title", $row['it_name']); + $item->addChild("description", strip_tags($row['it_basic'])); + $item->addChild("link", G5_SHOP_URL.'/item.php?it_id='.urlencode($row['it_id'])); + $item->addChild("g:g:image_link", G5_DATA_URL.'/item/'.$row['it_img1']); + $item->addChild("availability", $stock); + + if($row['it_cust_price'] != null && $row['it_cust_price'] > 0) { + $item->addChild("g:g:price", sprintf('%.2fKRW', $row['it_cust_price'])); + $item->addChild("g:g:sale_price", sprintf('%.2fKRW', $row['it_price'])); + } else { + $item->addChild("g:g:price", sprintf('%.2fKRW', $row['it_price'])); + } + + // 선택적 입력 항목 + $item->addChild("g:g:condition", "new"); + $item->addChild("adult", "no"); + if(in_array(1, $category_array[$row['ca_id']])) { + $item->addChild("adult", "yes"); + } + } header('Content-type: text/xml'); From daffdcbfcee8a313510c21488a660570939496fd Mon Sep 17 00:00:00 2001 From: loves2tu Date: Tue, 28 Dec 2021 05:16:19 +0000 Subject: [PATCH 06/27] =?UTF-8?q?=EA=B5=AC=EA=B8=80=20=ED=8C=90=EB=A7=A4?= =?UTF-8?q?=EC=9E=90=EC=84=BC=ED=84=B0=20=ED=94=BC=EB=93=9C=20=20-=20?= =?UTF-8?q?=EB=8B=A4=EC=A4=91=EC=B9=B4=ED=85=8C=EB=8F=84=EB=A6=AC=20?= =?UTF-8?q?=EA=B4=80=EB=A0=A8=20=EC=84=B1=EC=9D=B8=EC=9D=B8=EC=A6=9D=20?= =?UTF-8?q?=EC=B2=98=EB=A6=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shop/price/google_feed.php | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/shop/price/google_feed.php b/shop/price/google_feed.php index 10b06752c..14a360217 100644 --- a/shop/price/google_feed.php +++ b/shop/price/google_feed.php @@ -78,11 +78,17 @@ for ($i = 0; $row = sql_fetch_array($result); $i++ ) { // 선택적 입력 항목 $item->addChild("g:g:condition", "new"); - $item->addChild("adult", "no"); - if(in_array(1, $category_array[$row['ca_id']])) { - $item->addChild("adult", "yes"); + + $cate_array = array($row['ca_id'], $row['ca_id2'], $row['ca_id3']); + + $adult = "no"; + foreach($cate_array as $key => $var) { + if(in_array(1, $category_array[$var])) { + $adult = "yes"; + } } - + + $item->addChild("adult", $adult); } header('Content-type: text/xml'); From f25354b1b22174c8794dce5142b2d7147f192a43 Mon Sep 17 00:00:00 2001 From: loves2tu Date: Tue, 28 Dec 2021 05:46:48 +0000 Subject: [PATCH 07/27] =?UTF-8?q?=EA=B5=AC=EA=B8=80=20=ED=8C=90=EB=A7=A4?= =?UTF-8?q?=EC=9E=90=EC=84=BC=ED=84=B0=20=ED=94=BC=EB=93=9C=20=20-=20?= =?UTF-8?q?=EC=98=88=EC=99=B8=EC=B2=98=EB=A6=AC=20=EC=B6=94=EA=B0=80=20(it?= =?UTF-8?q?=5Fid,=20it=5Fname)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shop/price/google_feed.php | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/shop/price/google_feed.php b/shop/price/google_feed.php index 14a360217..0ba4e8589 100644 --- a/shop/price/google_feed.php +++ b/shop/price/google_feed.php @@ -10,9 +10,9 @@ $sql = "SELECT a.ca_id, FROM `g5_shop_category` AS a"; $result = sql_query($sql); -$category_array = array(); +$category_adult_array = array(); for ($i = 0; $row = sql_fetch_array($result); $i++ ) { - $category_array[$row['ca_id']] = array( $row['ca_adult'], // 자기자신 성인인증판단 + $category_adult_array[$row['ca_id']] = array( $row['ca_adult'], // 자기자신 성인인증판단 $row['ca_adult_parent1'], // 1depth 성인인증 $row['ca_adult_parent2'], // 2depth 성인인증 $row['ca_adult_parent3'], // 3depth 성인인증 @@ -33,13 +33,10 @@ $link = $channel->addChild("link", G5_URL); $description = $channel->addChild("description", "몰?루"); for ($i = 0; $row = sql_fetch_array($result); $i++ ) { - $stock = "in_stock"; - if($row['in_stock'] != null) { - if($row['in_stock'] <= 0) $stock = "out_of_stock"; - } + if(empty($row['it_id'])) continue; + if(empty($row['it_name'])) continue; if(empty($row['it_img1'])) continue; if(!file_exists(G5_DATA_PATH.'/item/'.$row['it_img1'])) continue; - $ext = explode('.', $row['it_img1'])[1]; switch($ext) { @@ -59,6 +56,11 @@ for ($i = 0; $row = sql_fetch_array($result); $i++ ) { } if($ext_check == false) continue; + + $stock = "in_stock"; + if($row['in_stock'] != null) { + if($row['in_stock'] <= 0) $stock = "out_of_stock"; + } $item = $channel->addChild("item"); // 필수 입력 항목 @@ -83,7 +85,7 @@ for ($i = 0; $row = sql_fetch_array($result); $i++ ) { $adult = "no"; foreach($cate_array as $key => $var) { - if(in_array(1, $category_array[$var])) { + if(in_array(1, $category_adult_array[$var])) { $adult = "yes"; } } From c82c33fc59dfcf42e1482e3c3081ceecaccb995a Mon Sep 17 00:00:00 2001 From: loves2tu Date: Wed, 29 Dec 2021 06:29:16 +0000 Subject: [PATCH 08/27] =?UTF-8?q?=EA=B5=AC=EA=B8=80=20=ED=8C=90=EB=A7=A4?= =?UTF-8?q?=EC=9E=90=EC=84=BC=ED=84=B0=20=ED=94=BC=EB=93=9C=20=20-=20?= =?UTF-8?q?=EC=9D=B4=EB=AF=B8=EC=A7=80=20img1~10=20=EC=A1=B4=EC=9E=AC?= =?UTF-8?q?=EC=97=AC=EB=B6=80=20=ED=99=95=EC=9D=B8=20=ED=9B=84=20=20image?= =?UTF-8?q?=5Flink=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shop/price/google_feed.php | 45 +++++++++++++++----------------------- 1 file changed, 18 insertions(+), 27 deletions(-) diff --git a/shop/price/google_feed.php b/shop/price/google_feed.php index 0ba4e8589..42b37a606 100644 --- a/shop/price/google_feed.php +++ b/shop/price/google_feed.php @@ -30,33 +30,24 @@ $xml->addAttribute("version", "2.0"); $channel = $xml->addChild("channel"); $title = $channel->addChild("title", "쇼핑몰피드"); $link = $channel->addChild("link", G5_URL); -$description = $channel->addChild("description", "몰?루"); +$description = $channel->addChild("description", ""); for ($i = 0; $row = sql_fetch_array($result); $i++ ) { - if(empty($row['it_id'])) continue; - if(empty($row['it_name'])) continue; - if(empty($row['it_img1'])) continue; - if(!file_exists(G5_DATA_PATH.'/item/'.$row['it_img1'])) continue; - $ext = explode('.', $row['it_img1'])[1]; + $it_id = $row['it_id']; + $it_title = $row['it_name']; + $it_link = shop_item_url($row['it_id']); + $it_basic = strip_tags($row['it_basic']); - switch($ext) { - case "jpg": - case "jpeg": - case "webp": - case "png": - case "gif": - case "bmp": - case "tif": - case "tiff": - $ext_check = true; - break; - default: - $ext_check = false; - break; + $it_image = ""; + for($i=1; $i<=10; $i++) { + $img = $row['it_img'.$i]; + + if(empty($img)) continue; + + $it_image = G5_DATA_URL."/item/".$img; + break; } - if($ext_check == false) continue; - $stock = "in_stock"; if($row['in_stock'] != null) { if($row['in_stock'] <= 0) $stock = "out_of_stock"; @@ -64,11 +55,11 @@ for ($i = 0; $row = sql_fetch_array($result); $i++ ) { $item = $channel->addChild("item"); // 필수 입력 항목 - $item->addChild("g:g:id", $row['it_id']); - $item->addChild("title", $row['it_name']); - $item->addChild("description", strip_tags($row['it_basic'])); - $item->addChild("link", G5_SHOP_URL.'/item.php?it_id='.urlencode($row['it_id'])); - $item->addChild("g:g:image_link", G5_DATA_URL.'/item/'.$row['it_img1']); + $item->addChild("g:g:id", $it_id); + $item->addChild("title", $it_title); + $item->addChild("description", $it_basic); + $item->addChild("link", $it_link); + $item->addChild("g:g:image_link", $it_image); $item->addChild("availability", $stock); if($row['it_cust_price'] != null && $row['it_cust_price'] > 0) { From 4c297a1e5364bc74cde627178993f1e231c0220a Mon Sep 17 00:00:00 2001 From: loves2tu Date: Thu, 30 Dec 2021 05:04:36 +0000 Subject: [PATCH 09/27] =?UTF-8?q?=EA=B5=AC=EA=B8=80=20=ED=8C=90=EB=A7=A4?= =?UTF-8?q?=EC=9E=90=EC=84=BC=ED=84=B0=20=ED=94=BC=EB=93=9C=20=20-=20?= =?UTF-8?q?=EB=B0=98=EB=B3=B5=EB=AC=B8=20=EB=B3=80=EC=88=98=20=EC=98=A4?= =?UTF-8?q?=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shop/price/google_feed.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/shop/price/google_feed.php b/shop/price/google_feed.php index 42b37a606..e9d3ef1b2 100644 --- a/shop/price/google_feed.php +++ b/shop/price/google_feed.php @@ -32,15 +32,15 @@ $title = $channel->addChild("title", "쇼핑몰피드"); $link = $channel->addChild("link", G5_URL); $description = $channel->addChild("description", ""); -for ($i = 0; $row = sql_fetch_array($result); $i++ ) { +for ($i = 0; $row = sql_fetch_array($result); $i++) { $it_id = $row['it_id']; $it_title = $row['it_name']; $it_link = shop_item_url($row['it_id']); $it_basic = strip_tags($row['it_basic']); $it_image = ""; - for($i=1; $i<=10; $i++) { - $img = $row['it_img'.$i]; + for($j = 1; $j <= 10; $j++) { + $img = $row['it_img'.$j]; if(empty($img)) continue; From bddbcd5cddefd81627cfe33862d5b5e16e2fc9c2 Mon Sep 17 00:00:00 2001 From: loves2tu Date: Thu, 30 Dec 2021 05:42:30 +0000 Subject: [PATCH 10/27] =?UTF-8?q?=EA=B5=AC=EA=B8=80=20=ED=8C=90=EB=A7=A4?= =?UTF-8?q?=EC=9E=90=EC=84=BC=ED=84=B0=20=ED=94=BC=EB=93=9C=20=20-=20query?= =?UTF-8?q?=20=EC=88=98=EC=A0=95=20(table=20=EC=A1=B0=ED=9A=8C=20=EC=98=A4?= =?UTF-8?q?=EB=A5=98)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shop/price/google_feed.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/shop/price/google_feed.php b/shop/price/google_feed.php index e9d3ef1b2..8e395652e 100644 --- a/shop/price/google_feed.php +++ b/shop/price/google_feed.php @@ -3,11 +3,11 @@ include_once("./_common.php"); $sql = "SELECT a.ca_id, a.ca_adult_use AS ca_adult, - IF( SUBSTR(a.ca_id, 3) != \"\", (SELECT ca_adult_use FROM `g5_shop_category` WHERE ca_id = SUBSTR(a.ca_id, 3)), 0) AS ca_adult_parent1, - IF( SUBSTR(a.ca_id, 5) != \"\", (SELECT ca_adult_use FROM `g5_shop_category` WHERE ca_id = SUBSTR(a.ca_id, 5)), 0) AS ca_adult_parent2, - IF( SUBSTR(a.ca_id, 7) != \"\", (SELECT ca_adult_use FROM `g5_shop_category` WHERE ca_id = SUBSTR(a.ca_id, 7)), 0) AS ca_adult_parent3, - IF( SUBSTR(a.ca_id, 9) != \"\", (SELECT ca_adult_use FROM `g5_shop_category` WHERE ca_id = SUBSTR(a.ca_id, 9)), 0) AS ca_adult_parent4 - FROM `g5_shop_category` AS a"; + IF( SUBSTR(a.ca_id, 3) != \"\", (SELECT ca_adult_use FROM `{$g5['g5_shop_category_table']}` WHERE ca_id = SUBSTR(a.ca_id, 3)), 0) AS ca_adult_parent1, + IF( SUBSTR(a.ca_id, 5) != \"\", (SELECT ca_adult_use FROM `{$g5['g5_shop_category_table']}` WHERE ca_id = SUBSTR(a.ca_id, 5)), 0) AS ca_adult_parent2, + IF( SUBSTR(a.ca_id, 7) != \"\", (SELECT ca_adult_use FROM `{$g5['g5_shop_category_table']}` WHERE ca_id = SUBSTR(a.ca_id, 7)), 0) AS ca_adult_parent3, + IF( SUBSTR(a.ca_id, 9) != \"\", (SELECT ca_adult_use FROM `{$g5['g5_shop_category_table']}` WHERE ca_id = SUBSTR(a.ca_id, 9)), 0) AS ca_adult_parent4 + FROM `{$g5['g5_shop_category_table']}` AS a"; $result = sql_query($sql); $category_adult_array = array(); @@ -19,7 +19,7 @@ for ($i = 0; $row = sql_fetch_array($result); $i++ ) { $row['ca_adult_parent4']); // 4depth 성인인증 } -$sql =" SELECT a.*, (SELECT MIN(`io_stock_qty`) FROM `g5_shop_item_option` WHERE `it_id` = a.`it_id` GROUP BY `it_id`) AS in_stock +$sql =" SELECT a.*, (SELECT MIN(`io_stock_qty`) FROM `{$g5['g5_shop_item_option_table']}` WHERE `it_id` = a.`it_id` GROUP BY `it_id`) AS in_stock FROM `{$g5['g5_shop_item_table']}` as a where a.`it_use` = '1' and a.`it_soldout` = '0' and a.`it_tel_inq` = '0' and a.`it_price` > '0' order by a.`ca_id`"; $result = sql_query($sql); From d97f27f2fad7db258a4964f0d9fc52fa5803b0a0 Mon Sep 17 00:00:00 2001 From: loves2tu Date: Thu, 30 Dec 2021 08:37:12 +0000 Subject: [PATCH 11/27] =?UTF-8?q?=EA=B5=AC=EA=B8=80=20=ED=8C=90=EB=A7=A4?= =?UTF-8?q?=EC=9E=90=EC=84=BC=ED=84=B0=20=ED=94=BC=EB=93=9C=20=20-=20?= =?UTF-8?q?=EC=83=81=ED=92=88=20=EC=9E=AC=EA=B3=A0=EC=97=90=20=EB=94=B0?= =?UTF-8?q?=EB=A5=B8=20out=5Fof=5Fstock=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shop/price/google_feed.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/shop/price/google_feed.php b/shop/price/google_feed.php index 8e395652e..cd919fd9e 100644 --- a/shop/price/google_feed.php +++ b/shop/price/google_feed.php @@ -19,7 +19,7 @@ for ($i = 0; $row = sql_fetch_array($result); $i++ ) { $row['ca_adult_parent4']); // 4depth 성인인증 } -$sql =" SELECT a.*, (SELECT MIN(`io_stock_qty`) FROM `{$g5['g5_shop_item_option_table']}` WHERE `it_id` = a.`it_id` GROUP BY `it_id`) AS in_stock +$sql =" SELECT a.*, IFNULL((SELECT MIN(`io_stock_qty`) FROM `{$g5['g5_shop_item_option_table']}` WHERE `it_id` = a.`it_id` GROUP BY `it_id`), a.`it_stock_qty`) AS in_stock FROM `{$g5['g5_shop_item_table']}` as a where a.`it_use` = '1' and a.`it_soldout` = '0' and a.`it_tel_inq` = '0' and a.`it_price` > '0' order by a.`ca_id`"; $result = sql_query($sql); @@ -49,7 +49,9 @@ for ($i = 0; $row = sql_fetch_array($result); $i++) { } $stock = "in_stock"; - if($row['in_stock'] != null) { + if($row['it_stock_qty'] <= 0) { + $stock = "out_of_stock"; + } else { if($row['in_stock'] <= 0) $stock = "out_of_stock"; } From 8fbbae488beccdc17207ae935a6a39bd7a424fae Mon Sep 17 00:00:00 2001 From: loves2tu Date: Fri, 31 Dec 2021 06:03:15 +0000 Subject: [PATCH 12/27] =?UTF-8?q?=EA=B5=AC=EA=B8=80=20=ED=8C=90=EB=A7=A4?= =?UTF-8?q?=EC=9E=90=EC=84=BC=ED=84=B0=20=ED=94=BC=EB=93=9C=20=20-=20?= =?UTF-8?q?=EC=83=81=ED=92=88=EC=9D=98=20=EC=9E=AC=EA=B3=A0=20&=20?= =?UTF-8?q?=EC=83=81=ED=92=88=EC=98=B5=EC=85=98=EC=9D=98=20=EC=9E=AC?= =?UTF-8?q?=EA=B3=A0=EC=97=90=20=EB=94=B0=EB=A5=B8=20=EC=9E=AC=EA=B3=A0?= =?UTF-8?q?=EA=B0=92=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shop/price/google_feed.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/shop/price/google_feed.php b/shop/price/google_feed.php index cd919fd9e..f7c5efa90 100644 --- a/shop/price/google_feed.php +++ b/shop/price/google_feed.php @@ -50,7 +50,11 @@ for ($i = 0; $row = sql_fetch_array($result); $i++) { $stock = "in_stock"; if($row['it_stock_qty'] <= 0) { - $stock = "out_of_stock"; + if($row['in_stock'] > 0) { + $stock = "in_stock"; + } else { + $stock = "out_of_stock"; + } } else { if($row['in_stock'] <= 0) $stock = "out_of_stock"; } From 754b25191f5c10829ef9cd3a15ebfcd64a28194d Mon Sep 17 00:00:00 2001 From: loves2tu Date: Fri, 31 Dec 2021 06:18:08 +0000 Subject: [PATCH 13/27] =?UTF-8?q?Revert=20"=EA=B5=AC=EA=B8=80=20=ED=8C=90?= =?UTF-8?q?=EB=A7=A4=EC=9E=90=EC=84=BC=ED=84=B0=20=ED=94=BC=EB=93=9C"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 8fbbae488beccdc17207ae935a6a39bd7a424fae. --- shop/price/google_feed.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/shop/price/google_feed.php b/shop/price/google_feed.php index f7c5efa90..cd919fd9e 100644 --- a/shop/price/google_feed.php +++ b/shop/price/google_feed.php @@ -50,11 +50,7 @@ for ($i = 0; $row = sql_fetch_array($result); $i++) { $stock = "in_stock"; if($row['it_stock_qty'] <= 0) { - if($row['in_stock'] > 0) { - $stock = "in_stock"; - } else { - $stock = "out_of_stock"; - } + $stock = "out_of_stock"; } else { if($row['in_stock'] <= 0) $stock = "out_of_stock"; } From 42270398111300ab18e2e478c6c0d4be29eccffc Mon Sep 17 00:00:00 2001 From: loves2tu Date: Fri, 31 Dec 2021 06:32:14 +0000 Subject: [PATCH 14/27] =?UTF-8?q?=EA=B5=AC=EA=B8=80=20=ED=8C=90=EB=A7=A4?= =?UTF-8?q?=EC=9E=90=EC=84=BC=ED=84=B0=20=ED=94=BC=EB=93=9C=20=20-=20?= =?UTF-8?q?=EB=AA=A8=EB=93=A0=20=EC=98=B5=EC=85=98=EC=9E=AC=EA=B3=A0=20?= =?UTF-8?q?=EC=A4=91=201=EC=9D=B4=EC=83=81=EC=9D=98=20=EC=9E=AC=EA=B3=A0?= =?UTF-8?q?=EA=B0=80=20=EC=A1=B4=EC=9E=AC=ED=95=98=EB=8A=94=20=EA=B2=BD?= =?UTF-8?q?=EC=9A=B0=20:=20in=5Fstock?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shop/price/google_feed.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shop/price/google_feed.php b/shop/price/google_feed.php index cd919fd9e..7f238b763 100644 --- a/shop/price/google_feed.php +++ b/shop/price/google_feed.php @@ -19,7 +19,7 @@ for ($i = 0; $row = sql_fetch_array($result); $i++ ) { $row['ca_adult_parent4']); // 4depth 성인인증 } -$sql =" SELECT a.*, IFNULL((SELECT MIN(`io_stock_qty`) FROM `{$g5['g5_shop_item_option_table']}` WHERE `it_id` = a.`it_id` GROUP BY `it_id`), a.`it_stock_qty`) AS in_stock +$sql =" SELECT a.*, IFNULL((SELECT MAX(`io_stock_qty`) FROM `{$g5['g5_shop_item_option_table']}` WHERE `it_id` = a.`it_id` GROUP BY `it_id`), a.`it_stock_qty`) AS in_stock FROM `{$g5['g5_shop_item_table']}` as a where a.`it_use` = '1' and a.`it_soldout` = '0' and a.`it_tel_inq` = '0' and a.`it_price` > '0' order by a.`ca_id`"; $result = sql_query($sql); From ebdd3b43903b2b810ff2b7c0f38e986899653c1a Mon Sep 17 00:00:00 2001 From: loves2tu Date: Fri, 31 Dec 2021 06:44:44 +0000 Subject: [PATCH 15/27] =?UTF-8?q?=EA=B5=AC=EA=B8=80=20=ED=8C=90=EB=A7=A4?= =?UTF-8?q?=EC=9E=90=EC=84=BC=ED=84=B0=20=ED=94=BC=EB=93=9C=20=20-=20avail?= =?UTF-8?q?ability,=20adult=20=EB=84=A4=EC=9E=84=EC=8A=A4=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=8A=A4(g)=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shop/price/google_feed.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shop/price/google_feed.php b/shop/price/google_feed.php index 7f238b763..642a97e2a 100644 --- a/shop/price/google_feed.php +++ b/shop/price/google_feed.php @@ -62,7 +62,7 @@ for ($i = 0; $row = sql_fetch_array($result); $i++) { $item->addChild("description", $it_basic); $item->addChild("link", $it_link); $item->addChild("g:g:image_link", $it_image); - $item->addChild("availability", $stock); + $item->addChild("g:g:availability", $stock); if($row['it_cust_price'] != null && $row['it_cust_price'] > 0) { $item->addChild("g:g:price", sprintf('%.2fKRW', $row['it_cust_price'])); @@ -83,7 +83,7 @@ for ($i = 0; $row = sql_fetch_array($result); $i++) { } } - $item->addChild("adult", $adult); + $item->addChild("g:g:adult", $adult); } header('Content-type: text/xml'); From 2fc24b0746c5e82871f10c8747ca3024dc3f0c85 Mon Sep 17 00:00:00 2001 From: seeoya Date: Mon, 3 Jan 2022 03:16:32 +0000 Subject: [PATCH 16/27] =?UTF-8?q?=EA=B5=AC=EA=B8=80=20=ED=8C=90=EB=A7=A4?= =?UTF-8?q?=EC=9E=90=EC=84=BC=ED=84=B0=20=ED=94=BC=EB=93=9C=20=ED=95=AD?= =?UTF-8?q?=EB=AA=A9=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/price.php | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/adm/shop_admin/price.php b/adm/shop_admin/price.php index 067852bba..6dfb45c34 100644 --- a/adm/shop_admin/price.php +++ b/adm/shop_admin/price.php @@ -33,7 +33,7 @@ $pg_anchor = '

    사이트 명을 클릭하시면 해당 사이트로 이동합니다.

    -
    네이버 지식쇼핑
    +
    네이버쇼핑
    + +
    구글 쇼핑
    +
    + +
    +
    Feed 설명
    +
    +
      +
    • 판매국가 대한민국, 언어 한국어 설정 기준입니다.
      • +
    • 기본 피드 이름 : 쇼핑몰피드
      • +
    • 상품 설명 : it_basic (상품기본설명을 필수 입력해주세요. HTML 태그는 자동 제거됩니다.)
      • +
    +
    +
    다음 쇼핑하우
      From 57fc5353f1fefd78e772d6e95bff44d8421bb454 Mon Sep 17 00:00:00 2001 From: loves2tu Date: Tue, 4 Jan 2022 06:12:21 +0000 Subject: [PATCH 17/27] =?UTF-8?q?=EA=B5=AC=EA=B8=80=20=ED=8C=90=EB=A7=A4?= =?UTF-8?q?=EC=9E=90=EC=84=BC=ED=84=B0=20=ED=94=BC=EB=93=9C=20=20-=20?= =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=EC=9A=A9=20=ED=94=BC=EB=93=9C=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shop/price/feedtest.xml | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 shop/price/feedtest.xml diff --git a/shop/price/feedtest.xml b/shop/price/feedtest.xml deleted file mode 100644 index e955cdd2c..000000000 --- a/shop/price/feedtest.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From d9307915040ab0a556f02c88be8267b4673713fb Mon Sep 17 00:00:00 2001 From: loves2tu Date: Tue, 4 Jan 2022 07:41:39 +0000 Subject: [PATCH 18/27] =?UTF-8?q?=EA=B5=AC=EA=B8=80=20=ED=8C=90=EB=A7=A4?= =?UTF-8?q?=EC=9E=90=EC=84=BC=ED=84=B0=20=ED=94=BC=EB=93=9C=20=20-=20?= =?UTF-8?q?=EA=B5=AC=EA=B8=80=20=EC=87=BC=ED=95=91=20=ED=8C=8C=EC=9D=BC?= =?UTF-8?q?=EC=9D=B4=EB=A6=84,=20=ED=8C=8C=EC=9D=BC=20URL=20=EA=B4=80?= =?UTF-8?q?=EB=A0=A8=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/price.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adm/shop_admin/price.php b/adm/shop_admin/price.php index 6dfb45c34..fdc29ea4e 100644 --- a/adm/shop_admin/price.php +++ b/adm/shop_admin/price.php @@ -46,8 +46,8 @@ $pg_anchor = '
        Feed 설명
        From 36baa2a6ab2d77eb6ba99c841004a60739056a5e Mon Sep 17 00:00:00 2001 From: kagla Date: Wed, 23 Feb 2022 16:47:33 +0900 Subject: [PATCH 19/27] =?UTF-8?q?PHP8=EC=97=90=EC=84=9C=20Undefined=20arra?= =?UTF-8?q?y=20key=20"code"=20=EC=98=A4=EB=A5=98=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/menu_list_update.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adm/menu_list_update.php b/adm/menu_list_update.php index 7c5e03141..2e3e3e4f8 100644 --- a/adm/menu_list_update.php +++ b/adm/menu_list_update.php @@ -15,7 +15,7 @@ sql_query($sql); $group_code = null; $primary_code = null; -$count = count($_POST['code']); +$count = isset($_POST['code']) ? count($_POST['code']) : 0; for ($i=0; $i<$count; $i++) { From 3247ae2388611f126306d56ece1b8a6e4ff31648 Mon Sep 17 00:00:00 2001 From: kagla Date: Wed, 23 Feb 2022 16:48:41 +0900 Subject: [PATCH 20/27] =?UTF-8?q?mysqli=5Fconnect=20=EC=98=A4=EB=A5=98?= =?UTF-8?q?=EC=8B=9C=20"MySQL=20Host,=20User,=20Password,=20DB=20=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=EC=97=90=20=EC=98=A4=EB=A5=98=EA=B0=80=20=EC=9E=88?= =?UTF-8?q?=EC=8A=B5=EB=8B=88=EB=8B=A4."=20=EB=A9=94=EC=8B=9C=EC=A7=80=20?= =?UTF-8?q?=EC=B6=9C=EB=A0=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/common.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/common.lib.php b/lib/common.lib.php index a92f05929..4ab8e9014 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -1527,7 +1527,7 @@ function sql_connect($host, $user, $pass, $db=G5_MYSQL_DB) global $g5; if(function_exists('mysqli_connect') && G5_MYSQLI_USE) { - $link = mysqli_connect($host, $user, $pass, $db); + $link = @mysqli_connect($host, $user, $pass, $db) or die('MySQL Host, User, Password, DB 정보에 오류가 있습니다.'); // 연결 오류 발생 시 스크립트 종료 if (mysqli_connect_errno()) { From ff2421df5b2f55788ec51e428436a802c775ecc1 Mon Sep 17 00:00:00 2001 From: kagla Date: Wed, 23 Feb 2022 16:49:56 +0900 Subject: [PATCH 21/27] =?UTF-8?q?=EB=A9=94=EB=89=B4=20=EC=82=AD=EC=A0=9C?= =?UTF-8?q?=EC=8B=9C=20=EB=A9=94=EB=89=B4=EC=84=A4=EC=A0=95=EC=9D=98=20?= =?UTF-8?q?=ED=99=95=EC=9D=B8=20=EB=B2=84=ED=8A=BC=EC=9D=84=20=EB=88=8C?= =?UTF-8?q?=EB=9F=AC=20=EC=A0=80=EC=9E=A5=ED=95=B4=EC=95=BC=20=ED=95=9C?= =?UTF-8?q?=EB=8B=A4=EB=8A=94=20=EB=A9=94=EC=84=B8=EC=A7=80=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/menu_list.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adm/menu_list.php b/adm/menu_list.php index e15c50724..c9c77feec 100644 --- a/adm/menu_list.php +++ b/adm/menu_list.php @@ -140,7 +140,7 @@ $(function() { }); $(document).on("click", ".btn_del_menu", function() { - if(!confirm("메뉴를 삭제하시겠습니까?")) + if(!confirm("메뉴를 삭제하시겠습니까?\n메뉴 삭제후 메뉴설정의 확인 버튼을 눌러 메뉴를 저장해 주세요.")) return false; var $tr = $(this).closest("tr"); From 3d57480fef587e51695da8719601a505e7dfded4 Mon Sep 17 00:00:00 2001 From: kagla Date: Mon, 28 Feb 2022 11:24:58 +0900 Subject: [PATCH 22/27] =?UTF-8?q?=EC=84=A4=EC=B9=98=EC=8B=9C=20=EB=88=84?= =?UTF-8?q?=EB=9D=BD=EB=90=98=EC=96=B4=20=EC=9E=88=EB=8D=98=20=ED=95=84?= =?UTF-8?q?=EC=88=98=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/gnuboard5.sql | 1 + install/gnuboard5shop.sql | 1 + 2 files changed, 2 insertions(+) diff --git a/install/gnuboard5.sql b/install/gnuboard5.sql index d9785a35c..15509446c 100644 --- a/install/gnuboard5.sql +++ b/install/gnuboard5.sql @@ -303,6 +303,7 @@ CREATE TABLE IF NOT EXISTS `g5_config` ( `cf_icode_pw` varchar(255) NOT NULL DEFAULT '', `cf_icode_server_ip` varchar(50) NOT NULL DEFAULT '', `cf_icode_server_port` varchar(50) NOT NULL DEFAULT '', + `cf_icode_token_key` varchar(100) NOT NULL DEFAULT '', `cf_googl_shorturl_apikey` varchar(50) NOT NULL DEFAULT '', `cf_social_login_use` tinyint(4) NOT NULL DEFAULT '0', `cf_social_servicelist` varchar(255) NOT NULL DEFAULT '', diff --git a/install/gnuboard5shop.sql b/install/gnuboard5shop.sql index 826eff668..74b2d23f8 100644 --- a/install/gnuboard5shop.sql +++ b/install/gnuboard5shop.sql @@ -353,6 +353,7 @@ CREATE TABLE IF NOT EXISTS `g5_shop_default` ( `de_inicis_sign_key` varchar(255) NOT NULL DEFAULT '', `de_iche_use` tinyint(4) NOT NULL DEFAULT '0', `de_easy_pay_use` tinyint(4) NOT NULL DEFAULT '0', + `de_easy_pay_services` varchar(255) NOT NULL DEFAULT '', `de_samsung_pay_use` tinyint(4) NOT NULL DEFAULT '0', `de_inicis_lpay_use` tinyint(4) NOT NULL DEFAULT '0', `de_inicis_kakaopay_use` tinyint(4) NOT NULL DEFAULT '0', From e0bc3cce81a5c20f72183b4c7f8377ef31d93ca8 Mon Sep 17 00:00:00 2001 From: kagla Date: Mon, 28 Feb 2022 12:25:58 +0900 Subject: [PATCH 23/27] =?UTF-8?q?=ED=86=A0=EC=8A=A4=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EB=A8=BC=EC=B8=A0=20=ED=9C=B4=EB=8C=80=ED=8F=B0=20=EB=B3=B8?= =?UTF-8?q?=EC=9D=B8=ED=99=95=EC=9D=B8=20=EC=84=9C=EB=B9=84=EC=8A=A4=20?= =?UTF-8?q?=EC=A2=85=EB=A3=8C=EC=97=90=20=EB=94=B0=EB=A5=B8=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/config_form.php | 16 ---------------- adm/config_form_update.php | 4 +--- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/adm/config_form.php b/adm/config_form.php index 73c8d13b7..1137f5d77 100644 --- a/adm/config_form.php +++ b/adm/config_form.php @@ -883,7 +883,6 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) { - @@ -926,21 +925,6 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) { NHN KCP 휴대폰 본인확인 서비스 신청페이지 - - - - 서비스에 가입되어 있지 않다면, 본인확인 서비스 신청페이지에서 서비스 신청 후 상점아이디를 발급 받으실 수 있습니다.
        LG유플러스 휴대폰본인확인은 ActiveX 설치가 필요하므로 Internet Explorer 에서만 사용할 수 있습니다.') ?> - si_ - LG유플러스 본인확인 서비스 신청페이지 - - - - - - 계약정보 -> 상점정보관리에서 확인하실 수 있습니다.') ?> - - - diff --git a/adm/config_form_update.php b/adm/config_form_update.php index c5d08a35f..13707c88c 100644 --- a/adm/config_form_update.php +++ b/adm/config_form_update.php @@ -22,7 +22,7 @@ check_admin_token(); $cf_social_servicelist = !empty($_POST['cf_social_servicelist']) ? implode(',', $_POST['cf_social_servicelist']) : ''; -$check_keys = array('cf_lg_mid', 'cf_lg_mert_key', 'cf_cert_kcb_cd', 'cf_cert_kcp_cd', 'cf_editor', 'cf_recaptcha_site_key', 'cf_recaptcha_secret_key', 'cf_naver_clientid', 'cf_naver_secret', 'cf_facebook_appid', 'cf_facebook_secret', 'cf_twitter_key', 'cf_twitter_secret', 'cf_google_clientid', 'cf_google_secret', 'cf_googl_shorturl_apikey', 'cf_kakao_rest_key', 'cf_kakao_client_secret', 'cf_kakao_js_apikey', 'cf_payco_clientid', 'cf_payco_secret','cf_cert_kg_cd','cf_cert_kg_mid'); +$check_keys = array('cf_cert_kcb_cd', 'cf_cert_kcp_cd', 'cf_editor', 'cf_recaptcha_site_key', 'cf_recaptcha_secret_key', 'cf_naver_clientid', 'cf_naver_secret', 'cf_facebook_appid', 'cf_facebook_secret', 'cf_twitter_key', 'cf_twitter_secret', 'cf_google_clientid', 'cf_google_secret', 'cf_googl_shorturl_apikey', 'cf_kakao_rest_key', 'cf_kakao_client_secret', 'cf_kakao_js_apikey', 'cf_payco_clientid', 'cf_payco_secret','cf_cert_kg_cd','cf_cert_kg_mid'); foreach( $check_keys as $key ){ if ( isset($_POST[$key]) && $_POST[$key] ){ @@ -285,8 +285,6 @@ $sql = " update {$g5['config_table']} cf_cert_kg_mid = '".trim($_POST['cf_cert_kg_mid'])."', cf_cert_kcb_cd = '{$_POST['cf_cert_kcb_cd']}', cf_cert_kcp_cd = '{$_POST['cf_cert_kcp_cd']}', - cf_lg_mid = '{$_POST['cf_lg_mid']}', - cf_lg_mert_key = '{$_POST['cf_lg_mert_key']}', cf_cert_limit = '{$_POST['cf_cert_limit']}', cf_cert_req = '{$_POST['cf_cert_req']}', cf_sms_use = '{$_POST['cf_sms_use']}', From 53b3308019876f4ce79f23ca4049d1a3866e5b69 Mon Sep 17 00:00:00 2001 From: kagla Date: Mon, 28 Feb 2022 16:02:13 +0900 Subject: [PATCH 24/27] =?UTF-8?q?=EC=BD=94=EB=A6=AC=EC=95=84=ED=81=AC?= =?UTF-8?q?=EB=A0=88=EB=94=A7=EB=B7=B0=EB=A1=9C=20KCB=20=EC=84=9C=EB=B9=84?= =?UTF-8?q?=EC=8A=A4=20=EC=8B=A0=EC=B2=AD=20=EC=A4=91=EB=8B=A8,=20?= =?UTF-8?q?=EA=B8=B0=EC=A1=B4=20=EC=82=AC=EC=9A=A9=EC=9E=90=EB=8B=98?= =?UTF-8?q?=EB=93=A4=EC=9D=84=20=EC=9C=84=ED=95=B4=20=ED=9A=8C=EC=9B=90?= =?UTF-8?q?=EC=82=ACID=20=EC=9E=85=EB=A0=A5=20=EB=B0=95=EC=8A=A4=EB=A7=8C?= =?UTF-8?q?=20=EC=9C=A0=EC=A7=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/config_form.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/adm/config_form.php b/adm/config_form.php index 1137f5d77..b55c55c61 100644 --- a/adm/config_form.php +++ b/adm/config_form.php @@ -913,8 +913,7 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) { 서비스에 가입되어 있지 않다면, KCB와 계약체결 후 회원사ID를 발급 받으실 수 있습니다.
        이용하시려는 서비스에 대한 계약을 아이핀, 휴대폰 본인확인 각각 체결해주셔야 합니다.
        아이핀 본인확인 테스트의 경우에는 KCB 회원사ID가 필요 없으나,
        휴대폰 본인확인 테스트의 경우 KCB 에서 따로 발급 받으셔야 합니다.') ?> - KCB 아이핀 서비스 신청페이지 - KCB 휴대폰 본인확인 서비스 신청페이지 + From 430586e490341a09d005c7abeb552c94020267c5 Mon Sep 17 00:00:00 2001 From: kagla Date: Thu, 3 Mar 2022 16:27:42 +0900 Subject: [PATCH 25/27] =?UTF-8?q?=EC=A3=BC=EB=AC=B8=EB=82=B4=EC=97=AD?= =?UTF-8?q?=EC=88=98=EC=A0=95=EC=9D=98=20=EA=B2=B0=EC=A0=9C=EB=8C=80?= =?UTF-8?q?=ED=96=89=EC=82=AC=20=EB=A7=81=ED=81=AC=EC=97=90=20=ED=91=9C?= =?UTF-8?q?=EC=8B=9C=EB=90=98=EB=8A=94=20LG=EC=9C=A0=ED=94=8C=EB=9F=AC?= =?UTF-8?q?=EC=8A=A4=EB=A5=BC=20=ED=86=A0=EC=8A=A4=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EB=A8=BC=EC=B8=A0=EB=A1=9C=20=EC=88=98=EC=A0=95=20(=ED=95=B4?= =?UTF-8?q?=ED=94=BC=EC=A0=95=EB=8B=98,220303)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/orderform.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adm/shop_admin/orderform.php b/adm/shop_admin/orderform.php index 44c890d3e..eff46e977 100644 --- a/adm/shop_admin/orderform.php +++ b/adm/shop_admin/orderform.php @@ -505,7 +505,7 @@ add_javascript(G5_POSTCODE_JS, 0); //다음 주소 js switch($od['od_pg']) { case 'lg': $pg_url = 'http://pgweb.uplus.co.kr'; - $pg_test = 'LG유플러스'; + $pg_test = '토스페이먼츠'; if ($default['de_card_test']) { $pg_url = 'http://pgweb.uplus.co.kr/tmert'; $pg_test .= ' 테스트 '; From 432bf47757f23b24f7c4dfd6b25fe3d4fa8c5661 Mon Sep 17 00:00:00 2001 From: kagla Date: Thu, 3 Mar 2022 16:56:46 +0900 Subject: [PATCH 26/27] =?UTF-8?q?=EC=98=81=EC=B9=B4=ED=8A=B8=20=EC=87=BC?= =?UTF-8?q?=ED=95=91=EB=AA=B0=20=EC=84=A4=EC=A0=95=20=EC=97=85=EB=8D=B0?= =?UTF-8?q?=EC=9D=B4=ED=8A=B8=EC=8B=9C=20=EB=88=84=EB=9D=BD=EB=90=98?= =?UTF-8?q?=EC=97=88=EB=8B=A4=EA=B3=A0=20=EC=B6=94=EC=A0=95=EB=90=98?= =?UTF-8?q?=EB=8A=94=20=EA=B3=B3=EC=97=90=20HOOK=20=EC=BD=94=EB=93=9C=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=20(=EB=93=9C=EB=A0=81=ED=81=AC=EC=88=98?= =?UTF-8?q?=EB=8B=AC=EB=8B=98,220303?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/configformupdate.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/adm/shop_admin/configformupdate.php b/adm/shop_admin/configformupdate.php index ae621cbf0..be2128bef 100644 --- a/adm/shop_admin/configformupdate.php +++ b/adm/shop_admin/configformupdate.php @@ -458,6 +458,8 @@ $sql = " update {$g5['config_table']} cf_lg_mert_key = '{$cf_lg_mert_key}' "; sql_query($sql); +run_event('shop_admin_configformupdate'); + if( $warning_msg ){ alert($warning_msg, "./configform.php"); } else { From 694e039b039a1d318bdf70aa13861a7095101f21 Mon Sep 17 00:00:00 2001 From: kagla Date: Fri, 4 Mar 2022 10:47:51 +0900 Subject: [PATCH 27/27] =?UTF-8?q?1:1=EB=AC=B8=EC=9D=98=20=EB=93=B1?= =?UTF-8?q?=EC=97=90=EC=84=9C=20url=20=EC=98=A4=EB=A5=98=EA=B0=80=20?= =?UTF-8?q?=EB=B0=9C=EC=83=9D=ED=95=98=EC=97=AC=20=EC=82=AC=EC=9A=A9?= =?UTF-8?q?=ED=95=98=EC=A7=80=20=EC=95=8A=EB=8A=94=20=EA=B2=83=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EC=B6=94=EC=A0=95=EB=90=98=EB=8A=94=20=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=EC=A3=BC=EC=84=9D=20=EC=B2=98=EB=A6=AC=20(?= =?UTF-8?q?=EC=9E=91=EC=9D=80=EB=B3=84=EB=8B=98,220304)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/common.lib.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/common.lib.php b/lib/common.lib.php index 4ab8e9014..b8315e2ca 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -3358,10 +3358,10 @@ function check_url_host($url, $msg='', $return_url=G5_URL, $is_redirect=false) } } - if(stripos($url, 'http:') !== false) { - if(!isset($p['scheme']) || !$p['scheme'] || !isset($p['host']) || !$p['host']) - alert('url 정보가 올바르지 않습니다.', $return_url); - } + // if(stripos($url, 'http:') !== false) { + // if(!isset($p['scheme']) || !$p['scheme'] || !isset($p['host']) || !$p['host']) + // alert('url 정보가 올바르지 않습니다.', $return_url); + // } //php 5.6.29 이하 버전에서는 parse_url 버그가 존재함 //php 7.0.1 ~ 7.0.5 버전에서는 parse_url 버그가 존재함