From b75fa666e5a7ccc1625151022429379fccf0d1f5 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Fri, 3 May 2013 18:21:33 +0900 Subject: [PATCH 1/5] =?UTF-8?q?=EC=B6=9C=EB=A0=A5=20=ED=95=AD=EB=AA=A9=20?= =?UTF-8?q?=EC=9C=84=EC=B9=98=20=EB=B3=80=EA=B2=BD=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/member_list.php | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/adm/member_list.php b/adm/member_list.php index 6f389e89d..f292b59f4 100644 --- a/adm/member_list.php +++ b/adm/member_list.php @@ -120,25 +120,25 @@ $colspan = 15; 회원아이디 - 이름/권한 - 최종접속 + 이름 휴대폰 주소 + 최종접속 포인트 관리 - 상태 별명 - 가입일 + 상태/권한 전화번호 - 본인
확인 - 성인
인증 메일
수신 정보
공개 메일
인증 + 본인
확인 + 성인
인증 접근
차단 - 그룹 + 가입일 + 접근그룹 @@ -183,6 +183,8 @@ $colspan = 15; } if ($intercept_title == '') $intercept_title = '차단하기'; + + $address = $row['mb_zip1'] ? $row['mb_addr1'].' '.$row['mb_addr2'] : ''; ?> @@ -194,34 +196,34 @@ $colspan = 15; - - - 전화번호 - 주소 + + +
+
+ -
- - 휴대폰번호 - 본인 - 성인 + Yes':'No'; ?> Yes':'No'; ?> Yes':'No'; ?> + Yes':'No'; ?> + Yes':'No'; ?> value="" id="mb_intercept_date_" title=""> + From 9500bfeaeffab389cc6517b25781a345c641df42 Mon Sep 17 00:00:00 2001 From: whitedot Date: Fri, 3 May 2013 18:30:04 +0900 Subject: [PATCH 2/5] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90:=20=EB=8B=A4?= =?UTF-8?q?=EC=A4=91=ED=96=89=20=ED=85=8C=EC=9D=B4=EB=B8=94=20=EB=B0=B0?= =?UTF-8?q?=EA=B2=BD=EC=83=89=20=EA=B5=AC=EB=B6=84=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/member_list.php | 33 ++++++++++++++++++--------------- css/admin.css | 4 +++- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/adm/member_list.php b/adm/member_list.php index f292b59f4..94a389c2f 100644 --- a/adm/member_list.php +++ b/adm/member_list.php @@ -185,10 +185,13 @@ $colspan = 15; $intercept_title = '차단하기'; $address = $row['mb_zip1'] ? $row['mb_addr1'].' '.$row['mb_addr2'] : ''; + + $tr_bg = ''; + if ($i%2 == 0) $tr_bg = 'class="tr_bg"'; ?> - - + > + @@ -201,30 +204,30 @@ $colspan = 15; -
+
- -
- + > +
+ - - Yes':'No'; ?> - Yes':'No'; ?> - Yes':'No'; ?> - Yes':'No'; ?> - Yes':'No'; ?> - + + Yes':'No'; ?> + Yes':'No'; ?> + Yes':'No'; ?> + Yes':'No'; ?> + Yes':'No'; ?> + value="" id="mb_intercept_date_" title=""> - - + + Date: Mon, 6 May 2013 09:30:20 +0900 Subject: [PATCH 3/5] =?UTF-8?q?=EC=BF=A0=ED=82=A4=EB=8F=84=EB=A9=94?= =?UTF-8?q?=EC=9D=B8=20=EC=84=A4=EC=A0=95=EA=B0=92=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config.php b/config.php index 161e1dd22..cda58baf6 100644 --- a/config.php +++ b/config.php @@ -19,7 +19,7 @@ if (PHP_VERSION >= '5.3.0') { /* 보안서버 도메인 -회원가입, 글쓰기에 사용되는 https 로 시작되는 주소를 말합니다. +회원가입, 글쓰기에 사용되는 https 로 시작되는 주소를 말합니다. 포트가 있다면 도메인 뒤에 :443 과 같이 입력하세요. 보안서버주소가 없다면 공란으로 두시면 되며 보안서버주소 뒤에 / 는 붙이지 않습니다. 입력예) https://www.domain.com:443/gnuboard4s @@ -31,7 +31,7 @@ define('G4_HTTPS_DOMAIN', ''); www.sir.co.kr 과 sir.co.kr 도메인은 서로 다른 도메인으로 인식합니다. 쿠키를 공유하려면 .sir.co.kr 과 같이 입력하세요. 이곳에 입력이 없다면 www 붙은 도메인과 그렇지 않은 도메인은 쿠키를 공유하지 않으므로 로그인이 풀릴 수 있습니다. */ -define('G4_COOKIE_DOMAIN', '.sirgle.com'); +define('G4_COOKIE_DOMAIN', ''); define('G4_DBCONFIG_FILE', 'dbconfig.php'); @@ -56,9 +56,9 @@ define('G4_SYNDI_DIR', 'syndi'); if (G4_DOMAIN) { define('G4_URL', G4_DOMAIN); } else { - if (isset($g4_path['url'])) + if (isset($g4_path['url'])) define('G4_URL', $g4_path['url']); - else + else define('G4_URL', ''); } From 881e049425c3b8ca7989af24c93f57d2faaceec0 Mon Sep 17 00:00:00 2001 From: chicpro Date: Mon, 6 May 2013 09:47:31 +0900 Subject: [PATCH 4/5] =?UTF-8?q?=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EB=A6=AC?= =?UTF-8?q?=EC=82=AC=EC=9D=B4=EC=A6=88=EC=8B=9C=20=EB=86=92=EC=9D=B4?= =?UTF-8?q?=EA=B0=92=EC=9D=B4=20=EC=9E=88=EC=9D=84=20=EA=B2=BD=EC=9A=B0?= =?UTF-8?q?=EC=97=90=20=EB=8C=80=ED=95=9C=20=EC=BD=94=EB=93=9C=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 --- skin/board/basic/view.skin.php | 7 +++++++ skin/board/gallery/view.skin.php | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/skin/board/basic/view.skin.php b/skin/board/basic/view.skin.php index 316767c06..cd3ab66ba 100644 --- a/skin/board/basic/view.skin.php +++ b/skin/board/basic/view.skin.php @@ -279,17 +279,24 @@ function view_image_resize() $img.each(function() { var img_width = $(this).width(); + var img_height = $(this).height(); var this_width = $(this).data("width"); + var this_height = $(this).data("height"); if(this_width == undefined) { $(this).data("width", img_width); // 원래 이미지 사이즈 + $(this).data("height", img_height); this_width = img_width; + this_height = img_height; } if(this_width > res_width) { $(this).width(res_width); + var res_height = Math.round(res_width * $(this).data("height") / $(this).data("width")); + $(this).height(res_height); } else { $(this).width(this_width); + $(this).height(this_height); } }); } diff --git a/skin/board/gallery/view.skin.php b/skin/board/gallery/view.skin.php index 19ecc715b..7873cf3bd 100644 --- a/skin/board/gallery/view.skin.php +++ b/skin/board/gallery/view.skin.php @@ -277,17 +277,24 @@ function view_image_resize() $img.each(function() { var img_width = $(this).width(); + var img_height = $(this).height(); var this_width = $(this).data("width"); + var this_height = $(this).data("height"); if(this_width == undefined) { $(this).data("width", img_width); // 원래 이미지 사이즈 + $(this).data("height", img_height); this_width = img_width; + this_height = img_height; } if(this_width > res_width) { $(this).width(res_width); + var res_height = Math.round(res_width * $(this).data("height") / $(this).data("width")); + $(this).height(res_height); } else { $(this).width(this_width); + $(this).height(this_height); } }); } From ed54791188448915b0c27ed5ba2a8fcbb7dbe491 Mon Sep 17 00:00:00 2001 From: chicpro Date: Mon, 6 May 2013 20:02:23 +0900 Subject: [PATCH 5/5] =?UTF-8?q?cf=5Fadd=5Fscript=20=EA=B0=92=20=EC=B6=9C?= =?UTF-8?q?=EB=A0=A5=EB=90=98=EC=A7=80=20=EC=95=8A=EB=8D=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 --- adm/admin.lib.php | 2 +- head.sub.php | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/adm/admin.lib.php b/adm/admin.lib.php index 5cf11271f..c1d11a9fa 100644 --- a/adm/admin.lib.php +++ b/adm/admin.lib.php @@ -265,5 +265,5 @@ if (isset($page)) $arr_query[] = 'page='.$page; $qstr = implode("&", $arr_query); // 관리자에서는 추가 스크립트는 사용하지 않는다. -$config['cf_add_script'] = ''; +//$config['cf_add_script'] = ''; ?> \ No newline at end of file diff --git a/head.sub.php b/head.sub.php index ce07fb2fb..b4222740d 100644 --- a/head.sub.php +++ b/head.sub.php @@ -40,7 +40,7 @@ if (G4_IS_MOBILE) { } ?> <?php echo $g4_head_title; ?> -'.PHP_EOL; } else { @@ -62,21 +62,22 @@ var g4_is_mobile = ""; var g4_bo_table = ""; var g4_sca = ""; var g4_cookie_domain = ""; - - set_cookie("device_width", screen.width, 6, g4_cookie_domain); '.PHP_EOL; } -echo $config['cf_add_script']; +if(!defined('G4_IS_ADMIN')) + echo $config['cf_add_script']; ?>