diff --git a/adm/boardgroupmember_form.php b/adm/boardgroupmember_form.php index f3bf434dc..dd58da23b 100644 --- a/adm/boardgroupmember_form.php +++ b/adm/boardgroupmember_form.php @@ -34,7 +34,6 @@ $colspan = 4;
메일인증을 받지 못한 경우 회원정보의 메일주소를 변경 할 수 있습니다.
+ + + + + +include_once('./_tail.php'); +?> diff --git a/bbs/register_email_update.php b/bbs/register_email_update.php new file mode 100644 index 000000000..db5e309dc --- /dev/null +++ b/bbs/register_email_update.php @@ -0,0 +1,44 @@ + '' "; +$mb = sql_fetch($sql); +if (!$mb) { + alert("이미 메일인증 하신 회원입니다.", G4_URL); +} + +if (!chk_captcha()) { + alert('자동등록방지 숫자가 틀렸습니다.'); +} + +$sql = " select count(*) as cnt from {$g4['member_table']} where mb_id <> '{$mb_id}' and mb_email = '$mb_email' "; +$row = sql_fetch($sql); +if ($row['cnt']) { + alert("{$mb_email} 메일은 이미 존재하는 메일주소 입니다.\\n\\n다른 메일주소를 입력해 주십시오."); +} + +// 인증메일 발송 +$subject = '['.$config['cf_title'].'] 인증확인 메일입니다.'; + +$mb_datetime = $mb['mb_datetime'] ? $mb['mb_datetime'] : G4_TIME_YMDHIS; +$mb_md5 = md5($mb_id.$mb_email.$mb_datetime); +$certify_href = G4_BBS_URL.'/email_certify.php?mb_id='.$mb_id.'&mb_md5='.$mb_md5; + +ob_start(); +include_once ('./register_form_update_mail3.php'); +$content = ob_get_contents(); +ob_end_clean(); + +$admin = get_admin('super'); +mailer($admin['mb_nick'], $admin['mb_email'], $mb_email, $subject, $content, 1); + +$sql = " update {$g4['member_table']} set mb_email = '$mb_email' where mb_id = '$mb_id' "; +sql_query($sql); + +alert("인증메일을 {$mb_email} 메일로 다시 보내 드렸습니다.\\n\\n{$mb_email} 메일을 확인하여 주십시오.", G4_URL); +?> \ No newline at end of file diff --git a/bbs/register_form_update.php b/bbs/register_form_update.php index 6c0a36097..347970dbc 100644 --- a/bbs/register_form_update.php +++ b/bbs/register_form_update.php @@ -321,21 +321,23 @@ if ($w == '') { {$sql_hp_certify} where mb_id = '$mb_id' "; sql_query($sql); +} - // 인증메일 발송 - if ($old_email != $mb_email && $config['cf_use_email_certify']) { - $subject = '['.$config['cf_title'].'] 인증확인 메일입니다.'; - $mb_md5 = md5($mb_id.$mb_email.$member['mb_datetime']); - $certify_href = G4_BBS_URL.'/email_certify.php?mb_id='.$mb_id.'&mb_md5='.$mb_md5; +// 인증메일 발송 +if ($config['cf_use_email_certify'] && $old_email != $mb_email) { + $subject = '['.$config['cf_title'].'] 인증확인 메일입니다.'; - ob_start(); - include_once ('./register_form_update_mail3.php'); - $content = ob_get_contents(); - ob_end_clean(); + $mb_datetime = $member['mb_datetime'] ? $member['mb_datetime'] : G4_TIME_YMDHIS; + $mb_md5 = md5($mb_id.$mb_email.$mb_datetime); + $certify_href = G4_BBS_URL.'/email_certify.php?mb_id='.$mb_id.'&mb_md5='.$mb_md5; - mailer($admin['mb_nick'], $admin['mb_email'], $mb_email, $subject, $content, 1); - } + ob_start(); + include_once ('./register_form_update_mail3.php'); + $content = ob_get_contents(); + ob_end_clean(); + + mailer($admin['mb_nick'], $admin['mb_email'], $mb_email, $subject, $content, 1); } diff --git a/lib/common.lib.php b/lib/common.lib.php index d94bd0dda..2930b57ac 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -570,6 +570,7 @@ function html_purifier($html) $config->set('HTML.SafeObject', true); $config->set('HTML.SafeIframe', true); $config->set('URI.SafeIframeRegexp','%^(https?:)?//('.$safeiframe.')%'); + $config->set('Attr.AllowedFrameTargets', array('_blank')); $purifier = new HTMLPurifier($config); return $purifier->purify($html); } diff --git a/lib/shop.lib.php b/lib/shop.lib.php index 53ff9460c..9c2388d30 100644 --- a/lib/shop.lib.php +++ b/lib/shop.lib.php @@ -281,7 +281,7 @@ class item_list if ($this->ca_id3) { $where_ca_id[] = " ca_id3 like '{$this->ca_id3}%' "; } - $where[] = implode(" or ", $where_ca_id); + $where[] = "( ".implode(" or ", $where_ca_id)." )"; } if ($this->order_by) { diff --git a/mobile/shop/item.php b/mobile/shop/item.php index 50fe94071..1a39e8197 100644 --- a/mobile/shop/item.php +++ b/mobile/shop/item.php @@ -604,32 +604,12 @@ else이 상품과 관련된 상품이 없습니다.
'; - */ ?>등록된 상품이 없습니다.
'; // 리스트 유형별로 출력 $list_file = G4_MSHOP_SKIN_PATH.'/'.$ca['ca_mobile_skin']; if (file_exists($list_file)) { - /* - $list_row = $ca['ca_mobile_list_row']; - $img_width = $ca['ca_mobile_img_width']; - $img_height = $ca['ca_mobile_img_height']; - - include G4_MSHOP_PATH.'/list.sub.php'; - - $sql = $sql_list1 . $sql_common . $sql_list2 . " limit $from_record, $items "; - $result = sql_query($sql); - - echo '
';
if (!$skin)
- $skin = "list.skin.10.php";
-
-$td_width = (int)($mod / 100);
+ $skin = "list.10.skin.php";
// 리스트 유형별로 출력
-$list_file = G4_MSHOP_PATH.'/'.$skin;
+$list_file = G4_SHOP_SKIN_PATH.'/'.$skin;
if (file_exists($list_file)) {
+ // 총몇개 = 한줄에 몇개 * 몇줄
+ $items = $list_mod * $list_row;
+ // 페이지가 없으면 첫 페이지 (1 페이지)
+ if ($page == "") $page = 1;
+ // 시작 레코드 구함
+ $from_record = ($page - 1) * $items;
- include G4_MSHOP_PATH."/list.sub.php";
- //include "$cart_dir/list.sort.php";
-
- $sql = $sql_list1 . $sql_common . $sql_list2 . " limit $from_record, $items ";
- $result = sql_query($sql);
-
- include $list_file;
+ $list = new item_list();
+ $list->set_type($type);
+ $list->set_list_skin('list.10.skin.php');
+ $list->set_list_mod($list_mod);
+ $list->set_list_row($list_row);
+ $list->set_img_size($img_width, $img_height);
+ $list->set_is_page(true);
+ $list->set_mobile(true);
+ $list->set_order_by($order_by);
+ $list->set_from_record($from_record);
+ echo $list->run();
+ // where 된 전체 상품수
+ $total_count = $list->total_count;
+ // 전체 페이지 계산
+ $total_page = ceil($total_count / $items);
}
else
{
@@ -71,26 +73,7 @@ if ($i==0)
-
-$row2[ca_name]";
- $bar = " | ";
-}
-*/
+echo get_paging($config['cf_mobile_pages'], $page, $total_page, "{$_SERVER['PHP_SELF']}?$qstr&page=");
?>
+
+
+
+
+list_mod >= 2) { // 1줄 이미지 : 2개 이상
+ if ($i%$this->list_mod == 0) $sct_last = ' sct_last'; // 줄 마지막
+ else if ($i%$this->list_mod == 1) $sct_last = ' sct_clear'; // 줄 첫번째
+ else $sct_last = '';
+ } else { // 1줄 이미지 : 1개
+ $sct_last = ' sct_clear';
+ }
+
+ if ($i == 1) {
+ if ($this->css) {
+ echo "등록된 상품이 없습니다.
\n"; +?> + \ No newline at end of file diff --git a/shop/event.php b/shop/event.php index 2c30c7a52..702ebbb37 100644 --- a/shop/event.php +++ b/shop/event.php @@ -37,25 +37,6 @@ if ($skin) $list_file = G4_SHOP_SKIN_PATH."/{$ev['ev_skin']}"; if (file_exists($list_file)) { - /* - $list_mod = $ev['ev_list_mod']; - $list_row = $ev['ev_list_row']; - $img_width = $ev['ev_img_width']; - $img_height = $ev['ev_img_height']; - - include G4_SHOP_PATH.'/list.sub.php'; - include G4_SHOP_PATH.'/list.sort.php'; - - $sql = $sql_list1 . $sql_common . $sql_list2 . " limit $from_record, $items "; - $result = sql_query($sql); - - include $list_file; - */ - - $list_mod = $ev['ev_list_mod']; - $list_row = $ev['ev_list_row']; - - include G4_SHOP_PATH.'/list.sub.php'; include G4_SHOP_PATH.'/list.sort.php'; // 총몇개 = 한줄에 몇개 * 몇줄 @@ -65,7 +46,7 @@ if (file_exists($list_file)) // 시작 레코드 구함 $from_record = ($page - 1) * $items; - $list = new item_list($ev['ev_skin'], $list_mod, $list_row, $ev['ev_img_width'], $ev['ev_img_height']); + $list = new item_list($ev['ev_skin'], $ev['ev_list_mod'], $ev['ev_list_row'], $ev['ev_img_width'], $ev['ev_img_height']); $list->set_event($ev['ev_id']); $list->set_is_page(true); $list->set_order_by($order_by); diff --git a/shop/index.php b/shop/index.php index 6ca7ffacb..4632b1ce0 100644 --- a/shop/index.php +++ b/shop/index.php @@ -51,7 +51,7 @@ exit;히트상품 모음
- set_type(1); echo $list->run(); @@ -65,7 +65,7 @@ exit;추천상품 모음
- set_type(2); echo $list->run(); @@ -79,7 +79,7 @@ exit;최신상품 모음
- set_type(3); echo $list->run(); @@ -93,7 +93,7 @@ exit;인기상품 모음
- set_type(4); echo $list->run(); @@ -107,7 +107,7 @@ exit;할인상품 모음
- set_type(5); echo $list->run(); diff --git a/shop/item.php b/shop/item.php index bb479d82f..1d4a9de4e 100644 --- a/shop/item.php +++ b/shop/item.php @@ -615,25 +615,11 @@ else이 상품과 관련된 상품이 없습니다.
'; - */ ?>등록된 상품이 없습니다.
'; // 리스트 유형별로 출력 $list_file = G4_SHOP_SKIN_PATH.'/'.$ca['ca_skin']; if (file_exists($list_file)) { - //display_type(2, "maintype10.inc.php", 4, 2, 100, 100, $ca[ca_id]); - - /* - $list_mod = $ca['ca_list_mod']; - $list_row = $ca['ca_list_row']; - $img_width = $ca['ca_img_width']; - $img_height = $ca['ca_img_height']; - - include G4_SHOP_PATH.'/list.sub.php'; include G4_SHOP_PATH.'/list.sort.php'; - $sql = $sql_list1 . $sql_common . $sql_list2 . " limit $from_record, $items "; - $result = sql_query($sql); - - echo '
';
if (!$skin)
- $skin = "list.skin.10.php";
-
-$td_width = (int)($mod / 100);
+ $skin = "list.10.skin.php";
// 리스트 유형별로 출력
-$list_file = G4_SHOP_PATH.'/'.$skin;
+$list_file = G4_SHOP_SKIN_PATH.'/'.$skin;
if (file_exists($list_file)) {
+ // 총몇개 = 한줄에 몇개 * 몇줄
+ $items = $list_mod * $list_row;
+ // 페이지가 없으면 첫 페이지 (1 페이지)
+ if ($page == "") $page = 1;
+ // 시작 레코드 구함
+ $from_record = ($page - 1) * $items;
- include G4_SHOP_PATH."/list.sub.php";
- //include "$cart_dir/list.sort.php";
-
- $sql = $sql_list1 . $sql_common . $sql_list2 . " limit $from_record, $items ";
- $result = sql_query($sql);
-
- include $list_file;
+ $list = new item_list();
+ $list->set_type($type);
+ $list->set_list_skin('list.10.skin.php');
+ $list->set_list_mod($list_mod);
+ $list->set_list_row($list_row);
+ $list->set_img_size($img_width, $img_height);
+ $list->set_is_page(true);
+ $list->set_order_by($order_by);
+ $list->set_from_record($from_record);
+ echo $list->run();
+ // where 된 전체 상품수
+ $total_count = $list->total_count;
+ // 전체 페이지 계산
+ $total_page = ceil($total_count / $items);
}
else
{
@@ -77,21 +80,6 @@ $qstr .= '&type='.$type.'&sort='.$sort;
echo get_paging($config['cf_write_pages'], $page, $total_page, "{$_SERVER['PHP_SELF']}?$qstr&page=");
?>
-$row2[ca_name]";
- $bar = " | ";
-}
-*/
-?>
-
diff --git a/skin/shop/basic/main.10.skin.php b/skin/shop/basic/main.10.skin.php
new file mode 100644
index 000000000..070d6ecd2
--- /dev/null
+++ b/skin/shop/basic/main.10.skin.php
@@ -0,0 +1,75 @@
+
+
+
+
+
+list_mod >= 2) { // 1줄 이미지 : 2개 이상
+ if ($i%$this->list_mod == 0) $sct_last = 'sct_last'; // 줄 마지막
+ else if ($i%$this->list_mod == 1) $sct_last = 'sct_clear'; // 줄 첫번째
+ else $sct_last = '';
+ } else { // 1줄 이미지 : 1개
+ $sct_last = 'sct_clear';
+ }
+
+ if ($i == 1) {
+ if ($this->css) {
+ echo "등록된 상품이 없습니다.
\n"; +?> + \ No newline at end of file diff --git a/skin/shop/basic/main.20.skin.php b/skin/shop/basic/main.20.skin.php new file mode 100644 index 000000000..914ad2a9d --- /dev/null +++ b/skin/shop/basic/main.20.skin.php @@ -0,0 +1,146 @@ + + + + + +type; + +for ($i=1; $row=sql_fetch_array($result); $i++) { + $sct_last = ''; + if($i>1 && $i%$this->list_mod == 0) + $sct_last = ' sct_last'; // 줄 마지막 + + if ($i == 1) { + if ($this->css) { + echo "등록된 상품이 없습니다.
\n"; +?> + + + \ No newline at end of file diff --git a/skin/shop/basic/main.30.skin.php b/skin/shop/basic/main.30.skin.php new file mode 100644 index 000000000..11f51a56e --- /dev/null +++ b/skin/shop/basic/main.30.skin.php @@ -0,0 +1,142 @@ + + + + + +type; + +for ($i=1; $row=sql_fetch_array($result); $i++) { + if ($i == 1) { + if ($this->css) { + echo "등록된 상품이 없습니다.
\n"; +?> + + + \ No newline at end of file diff --git a/skin/shop/basic/main.40.skin.php b/skin/shop/basic/main.40.skin.php new file mode 100644 index 000000000..a3a66bde2 --- /dev/null +++ b/skin/shop/basic/main.40.skin.php @@ -0,0 +1,135 @@ + + + + + +type; + +for ($i=1; $row=sql_fetch_array($result); $i++) { + $sct_last = ''; + if($i>1 && $i%$this->list_mod == 0) + $sct_last = ' sct_last'; // 줄 마지막 + + if ($i == 1) { + if ($this->css) { + echo "등록된 상품이 없습니다.
\n"; +?> + + + \ No newline at end of file diff --git a/skin/shop/basic/main.50.skin.php b/skin/shop/basic/main.50.skin.php new file mode 100644 index 000000000..41bd3c934 --- /dev/null +++ b/skin/shop/basic/main.50.skin.php @@ -0,0 +1,160 @@ + + + + + +type; + +for ($i=1; $row=sql_fetch_array($result); $i++) { + $sct_last = ''; + if($i>1 && $i%$this->list_mod == 0) + $sct_last = ' sct_last'; // 줄 마지막 + + if ($i == 1) { + if ($this->css) { + echo "등록된 상품이 없습니다.
\n"; +?> + + + \ No newline at end of file diff --git a/skin/shop/basic/style.css b/skin/shop/basic/style.css index 395ff62ed..2123333ed 100644 --- a/skin/shop/basic/style.css +++ b/skin/shop/basic/style.css @@ -1,5 +1,5 @@ -/* ##### maintype(nn).inc.php, list.skin.(nn).php 공통 적용 시작 ##### */ +/* ##### main(nn).skin.php, list.(nn).skin..php 공통 적용 시작 ##### */ /* 공통 */ .sct_wrap {margin:0 0 30px;zoom:1} .sct_wrap:after {display:block;visibility:hidden;clear:both;content:""} @@ -76,4 +76,68 @@ .sct_13 .sct_rel_ul {margin:0;padding:0;list-style:none} .sct_13 .sct_rel_li {float:left;margin:0 0 0 10px} .sct_13 .sct_sns {position:absolute;top:20px;right:20px} -/* ##### maintype(nn).inc.php, list.skin.(nn).php 공통 적용 끝 ##### */ + +/* 메인 상품 목록 스킨 20 */ +.smt_20 {position:relative;height:306px;overflow-y:hidden} +.smt_20 .sct_li {position:absolute;top:306px;left:0;display:none} +.smt_20 .sct_li_first {top:0;display:block} +.smt_20 .sct_div {float:left;margin:0 25px 15px 0;} +.smt_20 .sct_last {margin:0 0 15px !important} +.smt_20 .sct_a {display:block;position:relative;text-decoration:none} +.smt_20 .sct_a:focus, .smt_20 .sct_a:hover {text-decoration:none} +.smt_20 .sct_img {display:block;margin:0 0 15px} +.smt_20 b {display:block;margin:0 0 8px;font-weight:normal} +.smt_20 s {display:block} +.smt_20 .sct_cost {display:block;margin:0 0 10px;font-weight:bold} +.smt_20 .sct_icon {} +.smt_20 .sct_icon img {} +.smt_20 .sct_sns {position:absolute;top:190px;right:20px} + +/* 메인 상품 목록 스킨 30 */ +.smt_30 {position:relative;width:740px;height:308px;overflow-x:hidden} +.smt_30 .sct_li {position:absolute;top:0;left:765px;width:765px;display:none} +.smt_30 .sct_li_first {left:0;display:block} +.smt_30 .sct_div {float:left;margin:0 25px 15px 0;} +.smt_30 .sct_a {display:block;position:relative;text-decoration:none} +.smt_30 .sct_a:focus, .smt_30 .sct_a:hover {text-decoration:none} +.smt_30 .sct_img {display:block;margin:0 0 15px} +.smt_30 b {display:block;margin:0 0 8px;font-weight:normal} +.smt_30 s {display:block} +.smt_30 .sct_cost {display:block;margin:0 0 10px;font-weight:bold} +.smt_30 .sct_icon {} +.smt_30 .sct_icon img {} +.smt_30 .sct_sns {position:absolute;top:190px;right:20px} + +/* 메인 상품 목록 스킨 40 */ +.smt_40 {position:relative;height:306px} +.smt_40 .sct_li {position:absolute;top:0;left:0;display:none} +.smt_40 .sct_li_first {display:block} +.smt_40 .sct_div {float:left;margin:0 25px 15px 0;} +.smt_40 .sct_last {margin:0 0 15px !important} +.smt_40 .sct_a {display:block;position:relative;text-decoration:none} +.smt_40 .sct_a:focus, .smt_40 .sct_a:hover {text-decoration:none} +.smt_40 .sct_img {display:block;margin:0 0 15px} +.smt_40 b {display:block;margin:0 0 8px;font-weight:normal} +.smt_40 s {display:block} +.smt_40 .sct_cost {display:block;margin:0 0 10px;font-weight:bold} +.smt_40 .sct_icon {} +.smt_40 .sct_icon img {} +.smt_40 .sct_sns {position:absolute;top:190px;right:20px} + +/* 메인 상품 목록 스킨 50 */ +.smt_50 {position:relative;height:306px} +.smt_50 .sct_li {position:absolute;top:0;left:0;height:306px;display:none;overflow-y:hidden} +.smt_50 .sct_li_first {display:block} +.smt_50 .sct_div {float:left;position:relative;top:-306px;margin:0 25px 15px 0} +.smt_50 .sct_last {margin:0 0 15px} +.smt_50 .sct_a {display:block;position:relative;text-decoration:none} +.smt_50 .sct_a:focus, .smt_50 .sct_a:hover {text-decoration:none} +.smt_50 .sct_img {display:block;margin:0 0 15px} +.smt_50 b {display:block;margin:0 0 8px;font-weight:normal} +.smt_50 s {display:block} +.smt_50 .sct_cost {display:block;margin:0 0 10px;font-weight:bold} +.smt_50 .sct_icon {} +.smt_50 .sct_icon img {} +.smt_50 .sct_sns {position:absolute;top:190px;right:20px} + +/* ##### main(nn).skin.php, list.(nn).skin..php 공통 적용 끝 ##### */