diff --git a/adm/admin.menu999.eyoom.php b/adm/admin.menu999.eyoom.php index 8cc01014..61aa3465 100644 --- a/adm/admin.menu999.eyoom.php +++ b/adm/admin.menu999.eyoom.php @@ -11,7 +11,7 @@ /** * 최고관리자 메뉴 */ - if ($is_admin == 'super') { + if ($is_admin == 'super' || $is_auth) { $menu['menu999'] = array ( array('999000', '테마설정관리', G5_ADMIN_URL.'/eyoom_admin/theme_list.php', 'eyoom_theme'), array('999100', '테마관리', G5_ADMIN_URL.'/eyoom_admin/theme_list.php', 'eyb_theme'), @@ -24,6 +24,7 @@ array('999600', 'EB슬라이더관리', G5_ADMIN_URL.'/eyoom_admin/ebslider_list.php', 'eyb_ebslider'), array('999610', 'EB콘텐츠관리', G5_ADMIN_URL.'/eyoom_admin/ebcontents.php', 'eyb_ebcontents'), array('999620', 'EB최신글관리', G5_ADMIN_URL.'/eyoom_admin/eblatest_list.php', 'eyb_eblatest'), + //array('999630', 'EB배너관리', G5_ADMIN_URL.'/eyoom_admin/ebbanner_list.php', 'eyb_ebbanner'), array('999700', '태그관리', G5_ADMIN_URL.'/eyoom_admin/tag_list.php', 'eyb_tag'), array('999800', '이윰레벨 환경설정', G5_ADMIN_URL.'/eyoom_admin/level_config.php', 'eyb_level') ); diff --git a/adm/admin.mode.php b/adm/admin.mode.php new file mode 100644 index 00000000..a7d5172f --- /dev/null +++ b/adm/admin.mode.php @@ -0,0 +1,33 @@ +get_goods_category($fields, $w); + $qstr .= "&cate_a={$cate_a}"; } if ($cate_a && $cate_b) { $sql_cate = " and (a.ca_id like '{$cate_b}%' or a.ca_id2 like '{$cate_b}%' or a.ca_id3 like '{$cate_b}%') "; $w = " (1) and ca_id like '{$cate_b}%' and length(ca_id)=6"; $cate3 = $shop->get_goods_category($fields, $w); + $qstr .= "&cate_b={$cate_b}"; } if ($cate_a && $cate_b && $cate_c) { $sql_cate = " and (a.ca_id like '{$cate_c}%' or a.ca_id2 like '{$cate_c}%' or a.ca_id3 like '{$cate_c}%') "; $w = " (1) and ca_id like '{$cate_c}%' and length(ca_id)=8"; $cate4 = $shop->get_goods_category($fields, $w); + $qstr .= "&cate_c={$cate_c}"; } $sql_search .= $sql_cate; diff --git a/adm/eyoom_admin/core/shopetc/itemeventformupdate.php b/adm/eyoom_admin/core/shopetc/itemeventformupdate.php index 42162a12..2770372a 100644 --- a/adm/eyoom_admin/core/shopetc/itemeventformupdate.php +++ b/adm/eyoom_admin/core/shopetc/itemeventformupdate.php @@ -21,6 +21,11 @@ if ($ev_himg_del) @unlink(G5_DATA_PATH."/event/{$ev_id}_h"); if ($ev_timg_del) @unlink(G5_DATA_PATH."/event/{$ev_id}_t"); +$skin_regex_patten = "^list.[0-9]+\.skin\.php"; + +$ev_skin = (preg_match("/$pattern/", $ev_skin) && G5_SHOP_SKIN_PATH.'/'.file_exists($ev_skin)) ? $ev_skin : ''; +$ev_mobile_skin = (preg_match("/$pattern/", $ev_mobile_skin) && G5_MSHOP_SKIN_PATH.'/'.file_exists($ev_mobile_skin)) ? $ev_mobile_skin : ''; + $sql_common = " set ev_skin = '$ev_skin', ev_mobile_skin = '$ev_mobile_skin', ev_img_width = '$ev_img_width', diff --git a/adm/eyoom_admin/core/shopetc/sale1date.php b/adm/eyoom_admin/core/shopetc/sale1date.php index 27792086..e6856769 100644 --- a/adm/eyoom_admin/core/shopetc/sale1date.php +++ b/adm/eyoom_admin/core/shopetc/sale1date.php @@ -36,6 +36,7 @@ if (!$sale_data) $sale_data = array(); +$i=0; foreach($sale_data as $od_date => $data) { $sale_info = get_sale_info($data); @@ -44,6 +45,7 @@ $list[$i]['count'] = $sale_info['count']; $i++; } +$cnt = count($list); function get_sale_info($row_array) { global $tot; diff --git a/adm/eyoom_admin/core/shopetc/sale1month.php b/adm/eyoom_admin/core/shopetc/sale1month.php index a8653c71..96cd36de 100644 --- a/adm/eyoom_admin/core/shopetc/sale1month.php +++ b/adm/eyoom_admin/core/shopetc/sale1month.php @@ -37,6 +37,7 @@ if (!$sale_data) $sale_data = array(); +$i=0; foreach($sale_data as $od_date => $data) { $sale_info = get_sale_info($data); @@ -45,6 +46,7 @@ $list[$i]['count'] = $sale_info['count']; $i++; } +$cnt = count($list); function get_sale_info($row_array) { global $tot; diff --git a/adm/eyoom_admin/core/shopetc/sale1year.php b/adm/eyoom_admin/core/shopetc/sale1year.php index 1af3c0fe..ab4bbae3 100644 --- a/adm/eyoom_admin/core/shopetc/sale1year.php +++ b/adm/eyoom_admin/core/shopetc/sale1year.php @@ -34,6 +34,7 @@ if (!$sale_data) $sale_data = array(); +$i=0; foreach($sale_data as $od_date => $data) { $sale_info = get_sale_info($data); @@ -42,6 +43,7 @@ $list[$i]['count'] = $sale_info['count']; $i++; } +$cnt = count($list); function get_sale_info($row_array) { global $tot; diff --git a/adm/eyoom_admin/core/theme/ebbanner_list.php b/adm/eyoom_admin/core/theme/ebbanner_list.php new file mode 100644 index 00000000..c8b196be --- /dev/null +++ b/adm/eyoom_admin/core/theme/ebbanner_list.php @@ -0,0 +1,78 @@ +set_paging('./?dir=theme&pid=ebbanner_list&'.$qstr.'&page='); \ No newline at end of file diff --git a/adm/eyoom_admin/core/theme/theme_form.php b/adm/eyoom_admin/core/theme/theme_form.php index 4b5bac39..f6cff076 100644 --- a/adm/eyoom_admin/core/theme/theme_form.php +++ b/adm/eyoom_admin/core/theme/theme_form.php @@ -21,6 +21,23 @@ */ $hostname = $eb->eyoom_host(); +/** + * 테마 설정 폴더 업로드 체크 + */ +$tmp_dir = G5_PATH.'/tmp'; + +/** + * 유료테마 출처 + */ +$is_cmall = false; // sir 콘텐츠몰 +$cmall_check_file = $tmp_dir.'/g5_cmall.txt'; +if (file_exists($cmall_check_file) && !is_dir($cmall_check_file)) { + $g5_cmall = file($cmall_check_file); + $it_id = $g5_cmall[0]; + $is_cmall = $it_id ? true: false; +} +unset($cmall_check_file); + /** * submit 버튼 */ diff --git a/adm/eyoom_admin/core/theme/theme_form_update.php b/adm/eyoom_admin/core/theme/theme_form_update.php index f6078341..639f4ec7 100644 --- a/adm/eyoom_admin/core/theme/theme_form_update.php +++ b/adm/eyoom_admin/core/theme/theme_form_update.php @@ -15,7 +15,7 @@ $eyoom_config = $eb->decrypt_md5(trim($_POST['eyoom_config'])); if (!$tm_name) alert('잘못된 접근입니다.'); -if (!$tm_key || strlen($tm_key) != 50) alert('잘못된 접근입니다.'); +if (!$tm_key) alert('잘못된 접근입니다.'); if (!$cm_key) alert('잘못된 접근입니다.'); if (!$cm_salt) alert('잘못된 접근입니다.'); if (!$eyoom_config) alert('잘못된 접근입니다.'); diff --git a/adm/eyoom_admin/theme/basic/admin.head.html.php b/adm/eyoom_admin/theme/basic/admin.head.html.php index 7bcd814b..40dfb25f 100644 --- a/adm/eyoom_admin/theme/basic/admin.head.html.php +++ b/adm/eyoom_admin/theme/basic/admin.head.html.php @@ -76,7 +76,7 @@
설치된 이윰빌더 버전