firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

Merge branch 'master' of github.com:gnuboard/g4s

Browse Source
This commit is contained in:
whitedot
2013-02-12 11:45:01 +09:00
parent c4c16359c6 2d7e7b18b6
commit 5248b3e654
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
bbs/search.php
View File

@ -1,7 +1,7 @@
<?
include_once('./_common.php');
$g4['title'] = "전체검색 결과";
$g4['title'] = '전체검색 결과';
include_once('./_head.php');
$search_table = Array();
@ -10,9 +10,10 @@ $write_pages = "";
$text_stx = "";
$srows = 0;
$stx = strip_tags($stx);
$stx = preg_replace('/[[:punct:]]/', '', $stx); // 특수문자 제거
if ($stx) {
$stx = preg_replace("/\//", "\/", trim($stx));
$stx = preg_replace('/\//', '\/', trim($stx));
$sop = strtolower($sop);
if (!$sop || !($sop == 'and' || $sop == 'or')) $sop = 'and'; // 연산자 and , or
$srows = isset($_GET['srows']) ? $_GET['srows'] : 10;
@ -100,7 +101,7 @@ if ($stx) {
$op1 = " {$sop} ";
// 인기검색어
$sql = " insert into {$g4['popular_table']} set pp_word = '{$search_str}', pp_date = '{$g4['time_ymd']}', pp_ip = '{$_SERVER['REMOTE_ADDR']}' ";
$sql = " insert into {$g4['popular_table']} set pp_word = '{$search_str}', pp_date = '".G4_TIME_YMD."', pp_ip = '{$_SERVER['REMOTE_ADDR']}' ";
sql_query($sql, FALSE);
}
$str .= ")";

7
extend/shop.extend.php
View File

@ -78,13 +78,14 @@ $g4['shop_item_info_table'] = G4_TABLE_PREFIX.'shop_item_info';
//------------------------------------------------------------------------------
// 절대 수정하시면 안됩니다.
//------------------------------------------------------------------------------
define('G4_STATUS_CART', '장바구니');
define('G4_STATUS_SHOPPING', '쇼핑중');
define('G4_STATUS_STANDBY', '입금대기');
define('G4_STATUS_PAYMENT', '결제완료');
define('G4_STATUS_READY', '배송준비중');
define('G4_STATUS_DELIVERY', '배송중');
define('G4_STATUS_COMPLETE', '배송완료');
define('G4_STATUS_END', '구매확정');
// 대형쇼핑몰 들과는 달리 배송사와의 정보 연동이 되지 않으므로 "구매확정" 으로만 사용한다.
//define('G4_STATUS_COMPLETE', '배송완료');
define('G4_STATUS_PURCHASE', '구매확정');
define('G4_STATUS_CANCEL', '취소');
define('G4_STATUS_RETURN', '반품');
define('G4_STATUS_EXCHANGE', '교환');