From 0ad6b58a9f07ced5f81690ecf45b83a384185182 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Thu, 12 Dec 2013 13:11:52 +0900 Subject: [PATCH 1/8] =?UTF-8?q?.gitignore=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + config.php | 157 ------------------------------------ extend/.htaccess | 1 - plugin/okname/key/.htaccess | 1 - 4 files changed, 1 insertion(+), 159 deletions(-) delete mode 100644 config.php delete mode 100644 extend/.htaccess delete mode 100644 plugin/okname/key/.htaccess diff --git a/.gitignore b/.gitignore index 64a32baaf..39d385970 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +!.gitignore .htaccess config.php data/ diff --git a/config.php b/config.php deleted file mode 100644 index 8d37b4ca9..000000000 --- a/config.php +++ /dev/null @@ -1,157 +0,0 @@ -= '5.1.0') { - //if (function_exists("date_default_timezone_set")) date_default_timezone_set("Asia/Seoul"); - date_default_timezone_set("Asia/Seoul"); -} - -/******************** - 경로 상수 -********************/ - -/* -보안서버 도메인 -회원가입, 글쓰기에 사용되는 https 로 시작되는 주소를 말합니다. -포트가 있다면 도메인 뒤에 :443 과 같이 입력하세요. -보안서버주소가 없다면 공란으로 두시면 되며 보안서버주소 뒤에 / 는 붙이지 않습니다. -입력예) https://www.domain.com:443/gnuboard5 -*/ -define('G5_DOMAIN', ''); -define('G5_HTTPS_DOMAIN', ''); - -/* -www.sir.co.kr 과 sir.co.kr 도메인은 서로 다른 도메인으로 인식합니다. 쿠키를 공유하려면 .sir.co.kr 과 같이 입력하세요. -이곳에 입력이 없다면 www 붙은 도메인과 그렇지 않은 도메인은 쿠키를 공유하지 않으므로 로그인이 풀릴 수 있습니다. -*/ -define('G5_COOKIE_DOMAIN', ''); - -define('G5_DBCONFIG_FILE', 'dbconfig.php'); - -define('G5_ADMIN_DIR', 'adm'); -define('G5_BBS_DIR', 'bbs'); -define('G5_CSS_DIR', 'css'); -define('G5_DATA_DIR', 'data'); -define('G5_EXTEND_DIR', 'extend'); -define('G5_IMG_DIR', 'img'); -define('G5_JS_DIR', 'js'); -define('G5_LIB_DIR', 'lib'); -define('G5_PLUGIN_DIR', 'plugin'); -define('G5_SKIN_DIR', 'skin'); -define('G5_CAPTCHA_DIR', 'kcaptcha'); -define('G5_EDITOR_DIR', 'editor'); -define('G5_MOBILE_DIR', 'mobile'); -define('G5_OKNAME_DIR', 'okname'); - -define('G5_KCPCERT_DIR', 'kcpcert'); - -define('G5_SNS_DIR', 'sns'); -define('G5_SYNDI_DIR', 'syndi'); -define('G5_PHPMAILER_DIR', 'PHPMailer_v2.0.4'); - -// URL 은 브라우저상에서의 경로 (도메인으로 부터의) -if (G5_DOMAIN) { - define('G5_URL', G5_DOMAIN); -} else { - if (isset($g5_path['url'])) - define('G5_URL', $g5_path['url']); - else - define('G5_URL', ''); -} - -if (isset($g5_path['path'])) { - define('G5_PATH', $g5_path['path']); -} else { - define('G5_PATH', ''); -} - -define('G5_ADMIN_URL', G5_URL.'/'.G5_ADMIN_DIR); -define('G5_BBS_URL', G5_URL.'/'.G5_BBS_DIR); -define('G5_CSS_URL', G5_URL.'/'.G5_CSS_DIR); -define('G5_DATA_URL', G5_URL.'/'.G5_DATA_DIR); -define('G5_IMG_URL', G5_URL.'/'.G5_IMG_DIR); -define('G5_JS_URL', G5_URL.'/'.G5_JS_DIR); -define('G5_SKIN_URL', G5_URL.'/'.G5_SKIN_DIR); -define('G5_PLUGIN_URL', G5_URL.'/'.G5_PLUGIN_DIR); -define('G5_CAPTCHA_URL', G5_PLUGIN_URL.'/'.G5_CAPTCHA_DIR); -define('G5_EDITOR_URL', G5_PLUGIN_URL.'/'.G5_EDITOR_DIR); -define('G5_OKNAME_URL', G5_PLUGIN_URL.'/'.G5_OKNAME_DIR); -define('G5_KCPCERT_URL', G5_PLUGIN_URL.'/'.G5_KCPCERT_DIR); -define('G5_SNS_URL', G5_PLUGIN_URL.'/'.G5_SNS_DIR); -define('G5_SYNDI_URL', G5_PLUGIN_URL.'/'.G5_SYNDI_DIR); -define('G5_MOBILE_URL', G5_URL.'/'.G5_MOBILE_DIR); - -// PATH 는 서버상에서의 절대경로 -define('G5_ADMIN_PATH', G5_PATH.'/'.G5_ADMIN_DIR); -define('G5_BBS_PATH', G5_PATH.'/'.G5_BBS_DIR); -define('G5_DATA_PATH', G5_PATH.'/'.G5_DATA_DIR); -define('G5_EXTEND_PATH', G5_PATH.'/'.G5_EXTEND_DIR); -define('G5_LIB_PATH', G5_PATH.'/'.G5_LIB_DIR); -define('G5_PLUGIN_PATH', G5_PATH.'/'.G5_PLUGIN_DIR); -define('G5_SKIN_PATH', G5_PATH.'/'.G5_SKIN_DIR); -define('G5_MOBILE_PATH', G5_PATH.'/'.G5_MOBILE_DIR); -define('G5_CAPTCHA_PATH', G5_PLUGIN_PATH.'/'.G5_CAPTCHA_DIR); -define('G5_EDITOR_PATH', G5_PLUGIN_PATH.'/'.G5_EDITOR_DIR); -define('G5_OKNAME_PATH', G5_PLUGIN_PATH.'/'.G5_OKNAME_DIR); - -define('G5_KCPCERT_PATH', G5_PLUGIN_PATH.'/'.G5_KCPCERT_DIR); - -define('G5_SNS_PATH', G5_PLUGIN_PATH.'/'.G5_SNS_DIR); -define('G5_SYNDI_PATH', G5_PLUGIN_PATH.'/'.G5_SYNDI_DIR); -define('G5_PHPMAILER_PATH', G5_PLUGIN_PATH.'/'.G5_PHPMAILER_DIR); -//============================================================================== - - -define('G5_USE_MOBILE', true); // 모바일 홈페이지를 사용하지 않을 경우 false 로 설정 -define('G5_USE_CACHE', true); // 최신글등에 cache 기능 사용 여부 - - -/******************** - 시간 상수 -********************/ -// 서버의 시간과 실제 사용하는 시간이 틀린 경우 수정하세요. -// 하루는 86400 초입니다. 1시간은 3600초 -// 6시간이 빠른 경우 time() + (3600 * 6); -// 6시간이 느린 경우 time() - (3600 * 6); -define('G5_SERVER_TIME', time()); -define('G5_TIME_YMDHIS', date('Y-m-d H:i:s', G5_SERVER_TIME)); -define('G5_TIME_YMD', substr(G5_TIME_YMDHIS, 0, 10)); -define('G5_TIME_HIS', substr(G5_TIME_YMDHIS, 11, 8)); - -// 입력값 검사 상수 (숫자를 변경하시면 안됩니다.) -define('G5_ALPHAUPPER', 1); // 영대문자 -define('G5_ALPHALOWER', 2); // 영소문자 -define('G5_ALPHABETIC', 4); // 영대,소문자 -define('G5_NUMERIC', 8); // 숫자 -define('G5_HANGUL', 16); // 한글 -define('G5_SPACE', 32); // 공백 -define('G5_SPECIAL', 64); // 특수문자 - -// 퍼미션 -define('G5_DIR_PERMISSION', 0755); // 디렉토리 생성시 퍼미션 -define('G5_FILE_PERMISSION', 0644); // 파일 생성시 퍼미션 - -// 모바일 인지 결정 $_SERVER['HTTP_USER_AGENT'] -define('G5_MOBILE_AGENT', 'phone|samsung|lgtel|mobile|[^A]skt|nokia|blackberry|android|sony'); - -// SMTP -// lib/mailer.lib.php 에서 사용 -define('G5_SMTP', '127.0.0.1'); - - -/******************** - 기타 상수 -********************/ - -// 게시판에서 링크의 기본개수를 말합니다. -// 필드를 추가하면 이 숫자를 필드수에 맞게 늘려주십시오. -define('G5_LINK_COUNT', 2); -?> \ No newline at end of file diff --git a/extend/.htaccess b/extend/.htaccess deleted file mode 100644 index 05196c0b3..000000000 --- a/extend/.htaccess +++ /dev/null @@ -1 +0,0 @@ -# .htaccess diff --git a/plugin/okname/key/.htaccess b/plugin/okname/key/.htaccess deleted file mode 100644 index 05196c0b3..000000000 --- a/plugin/okname/key/.htaccess +++ /dev/null @@ -1 +0,0 @@ -# .htaccess From e1fb2464c77b9fa588682d92dd5933230237e5b5 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Thu, 12 Dec 2013 13:47:37 +0900 Subject: [PATCH 2/8] =?UTF-8?q?cheditor=20=EC=97=90=EC=84=9C=20=EC=9D=B4?= =?UTF-8?q?=EB=AF=B8=EC=A7=80=20=EC=82=AC=EC=9D=B4=EC=A6=88=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=ED=95=9C=EB=8C=80=EB=A1=9C=20=EB=85=B8=EC=B6=9C?= =?UTF-8?q?=ED=95=98=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/common.lib.php | 3 ++- lib/thumbnail.lib.php | 39 +++++++++++++++++++++++++++------------ 2 files changed, 29 insertions(+), 13 deletions(-) diff --git a/lib/common.lib.php b/lib/common.lib.php index 0233a5b4b..62146cad1 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -2006,7 +2006,8 @@ function get_editor_image($contents) return false; // $contents 중 img 태그 추출 - $pattern = "/]*src=[\'\"]?([^>\'\"]+[^>\'\"]+)[\'\"]?[^>]*>/"; + //$pattern = "/]*src=[\'\"]?([^>\'\"]+[^>\'\"]+)[\'\"]?[^>]*>/"; + $pattern = "/]*)>/iS"; preg_match_all($pattern, $contents, $matchs); return $matchs; diff --git a/lib/thumbnail.lib.php b/lib/thumbnail.lib.php index ceb3e4579..31f4b7e7f 100644 --- a/lib/thumbnail.lib.php +++ b/lib/thumbnail.lib.php @@ -22,13 +22,13 @@ function get_list_thumbnail($bo_table, $wr_id, $thumb_width, $thumb_height, $is_ $write_table = $g5['write_prefix'].$bo_table; $sql = " select wr_content from $write_table where wr_id = '$wr_id' "; $write = sql_fetch($sql); - $matchs = get_editor_image($write['wr_content']); + $matches = get_editor_image($write['wr_content']); $edt = true; - for($i=0; $i\'\"]+[^>\'\"]+)/i", $img, $m); + $src = $m[1]; + preg_match("/style=[\"\']?([^\"\'>]+)/i", $img, $m); + $style = $m[1]; + preg_match("/width:\s*(\d+)px/", $style, $m); + $width = $m[1]; + preg_match("/height:\s*(\d+)px/", $style, $m); + $height = $m[1]; + // 이미지 path 구함 - $p = parse_url($matchs[1][$i]); + $p = parse_url($src); if(strpos($p['path'], "/data/") != 0) $data_path = preg_replace("/^\/.*\/data/", "/data", $p['path']); else @@ -154,14 +165,18 @@ function get_view_thumbnail($contents, $thumb_width=0) else $thumb_file = $filename; - $img_tag = $matchs[0][$i]; preg_match("/alt=[\"\']?([^\"\']*)[\"\']?/", $img_tag, $malt); $alt = get_text($malt[1]); - $thumb_tag = ''.$alt.''; + if ($width) { + $thumb_tag = ''.$alt.''; + } else { + $thumb_tag = ''.$alt.''; + } // $img_tag에 editor 경로가 있으면 원본보기 링크 추가 - if(strpos($matchs[1][$i], 'data/editor') && preg_match("/\.({$config['cf_image_extension']})$/i", $filename)) { - $imgurl = str_replace(G5_URL, "", $matchs[1][$i]); + $img_tag = $matches[0][$i]; + if(strpos($img_tag, 'data/editor') && preg_match("/\.({$config['cf_image_extension']})$/i", $filename)) { + $imgurl = str_replace(G5_URL, "", $img_tag); $thumb_tag = ''.$thumb_tag.''; } From 1822ff7295165fc851bac94c140ad58558ae257f Mon Sep 17 00:00:00 2001 From: gnuboard Date: Thu, 12 Dec 2013 16:11:16 +0900 Subject: [PATCH 3/8] =?UTF-8?q?config.php=20=EA=B0=80=20=ED=8F=AC=ED=95=A8?= =?UTF-8?q?=EB=90=98=EB=8F=84=EB=A1=9D=20.gitignore=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 +- config.php | 157 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 158 insertions(+), 2 deletions(-) create mode 100644 config.php diff --git a/.gitignore b/.gitignore index 39d385970..96ca0ceec 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,8 @@ !.gitignore .htaccess -config.php data/ test/ -sirgle +sirgle/ test.php *.key *.sh diff --git a/config.php b/config.php new file mode 100644 index 000000000..8d37b4ca9 --- /dev/null +++ b/config.php @@ -0,0 +1,157 @@ += '5.1.0') { + //if (function_exists("date_default_timezone_set")) date_default_timezone_set("Asia/Seoul"); + date_default_timezone_set("Asia/Seoul"); +} + +/******************** + 경로 상수 +********************/ + +/* +보안서버 도메인 +회원가입, 글쓰기에 사용되는 https 로 시작되는 주소를 말합니다. +포트가 있다면 도메인 뒤에 :443 과 같이 입력하세요. +보안서버주소가 없다면 공란으로 두시면 되며 보안서버주소 뒤에 / 는 붙이지 않습니다. +입력예) https://www.domain.com:443/gnuboard5 +*/ +define('G5_DOMAIN', ''); +define('G5_HTTPS_DOMAIN', ''); + +/* +www.sir.co.kr 과 sir.co.kr 도메인은 서로 다른 도메인으로 인식합니다. 쿠키를 공유하려면 .sir.co.kr 과 같이 입력하세요. +이곳에 입력이 없다면 www 붙은 도메인과 그렇지 않은 도메인은 쿠키를 공유하지 않으므로 로그인이 풀릴 수 있습니다. +*/ +define('G5_COOKIE_DOMAIN', ''); + +define('G5_DBCONFIG_FILE', 'dbconfig.php'); + +define('G5_ADMIN_DIR', 'adm'); +define('G5_BBS_DIR', 'bbs'); +define('G5_CSS_DIR', 'css'); +define('G5_DATA_DIR', 'data'); +define('G5_EXTEND_DIR', 'extend'); +define('G5_IMG_DIR', 'img'); +define('G5_JS_DIR', 'js'); +define('G5_LIB_DIR', 'lib'); +define('G5_PLUGIN_DIR', 'plugin'); +define('G5_SKIN_DIR', 'skin'); +define('G5_CAPTCHA_DIR', 'kcaptcha'); +define('G5_EDITOR_DIR', 'editor'); +define('G5_MOBILE_DIR', 'mobile'); +define('G5_OKNAME_DIR', 'okname'); + +define('G5_KCPCERT_DIR', 'kcpcert'); + +define('G5_SNS_DIR', 'sns'); +define('G5_SYNDI_DIR', 'syndi'); +define('G5_PHPMAILER_DIR', 'PHPMailer_v2.0.4'); + +// URL 은 브라우저상에서의 경로 (도메인으로 부터의) +if (G5_DOMAIN) { + define('G5_URL', G5_DOMAIN); +} else { + if (isset($g5_path['url'])) + define('G5_URL', $g5_path['url']); + else + define('G5_URL', ''); +} + +if (isset($g5_path['path'])) { + define('G5_PATH', $g5_path['path']); +} else { + define('G5_PATH', ''); +} + +define('G5_ADMIN_URL', G5_URL.'/'.G5_ADMIN_DIR); +define('G5_BBS_URL', G5_URL.'/'.G5_BBS_DIR); +define('G5_CSS_URL', G5_URL.'/'.G5_CSS_DIR); +define('G5_DATA_URL', G5_URL.'/'.G5_DATA_DIR); +define('G5_IMG_URL', G5_URL.'/'.G5_IMG_DIR); +define('G5_JS_URL', G5_URL.'/'.G5_JS_DIR); +define('G5_SKIN_URL', G5_URL.'/'.G5_SKIN_DIR); +define('G5_PLUGIN_URL', G5_URL.'/'.G5_PLUGIN_DIR); +define('G5_CAPTCHA_URL', G5_PLUGIN_URL.'/'.G5_CAPTCHA_DIR); +define('G5_EDITOR_URL', G5_PLUGIN_URL.'/'.G5_EDITOR_DIR); +define('G5_OKNAME_URL', G5_PLUGIN_URL.'/'.G5_OKNAME_DIR); +define('G5_KCPCERT_URL', G5_PLUGIN_URL.'/'.G5_KCPCERT_DIR); +define('G5_SNS_URL', G5_PLUGIN_URL.'/'.G5_SNS_DIR); +define('G5_SYNDI_URL', G5_PLUGIN_URL.'/'.G5_SYNDI_DIR); +define('G5_MOBILE_URL', G5_URL.'/'.G5_MOBILE_DIR); + +// PATH 는 서버상에서의 절대경로 +define('G5_ADMIN_PATH', G5_PATH.'/'.G5_ADMIN_DIR); +define('G5_BBS_PATH', G5_PATH.'/'.G5_BBS_DIR); +define('G5_DATA_PATH', G5_PATH.'/'.G5_DATA_DIR); +define('G5_EXTEND_PATH', G5_PATH.'/'.G5_EXTEND_DIR); +define('G5_LIB_PATH', G5_PATH.'/'.G5_LIB_DIR); +define('G5_PLUGIN_PATH', G5_PATH.'/'.G5_PLUGIN_DIR); +define('G5_SKIN_PATH', G5_PATH.'/'.G5_SKIN_DIR); +define('G5_MOBILE_PATH', G5_PATH.'/'.G5_MOBILE_DIR); +define('G5_CAPTCHA_PATH', G5_PLUGIN_PATH.'/'.G5_CAPTCHA_DIR); +define('G5_EDITOR_PATH', G5_PLUGIN_PATH.'/'.G5_EDITOR_DIR); +define('G5_OKNAME_PATH', G5_PLUGIN_PATH.'/'.G5_OKNAME_DIR); + +define('G5_KCPCERT_PATH', G5_PLUGIN_PATH.'/'.G5_KCPCERT_DIR); + +define('G5_SNS_PATH', G5_PLUGIN_PATH.'/'.G5_SNS_DIR); +define('G5_SYNDI_PATH', G5_PLUGIN_PATH.'/'.G5_SYNDI_DIR); +define('G5_PHPMAILER_PATH', G5_PLUGIN_PATH.'/'.G5_PHPMAILER_DIR); +//============================================================================== + + +define('G5_USE_MOBILE', true); // 모바일 홈페이지를 사용하지 않을 경우 false 로 설정 +define('G5_USE_CACHE', true); // 최신글등에 cache 기능 사용 여부 + + +/******************** + 시간 상수 +********************/ +// 서버의 시간과 실제 사용하는 시간이 틀린 경우 수정하세요. +// 하루는 86400 초입니다. 1시간은 3600초 +// 6시간이 빠른 경우 time() + (3600 * 6); +// 6시간이 느린 경우 time() - (3600 * 6); +define('G5_SERVER_TIME', time()); +define('G5_TIME_YMDHIS', date('Y-m-d H:i:s', G5_SERVER_TIME)); +define('G5_TIME_YMD', substr(G5_TIME_YMDHIS, 0, 10)); +define('G5_TIME_HIS', substr(G5_TIME_YMDHIS, 11, 8)); + +// 입력값 검사 상수 (숫자를 변경하시면 안됩니다.) +define('G5_ALPHAUPPER', 1); // 영대문자 +define('G5_ALPHALOWER', 2); // 영소문자 +define('G5_ALPHABETIC', 4); // 영대,소문자 +define('G5_NUMERIC', 8); // 숫자 +define('G5_HANGUL', 16); // 한글 +define('G5_SPACE', 32); // 공백 +define('G5_SPECIAL', 64); // 특수문자 + +// 퍼미션 +define('G5_DIR_PERMISSION', 0755); // 디렉토리 생성시 퍼미션 +define('G5_FILE_PERMISSION', 0644); // 파일 생성시 퍼미션 + +// 모바일 인지 결정 $_SERVER['HTTP_USER_AGENT'] +define('G5_MOBILE_AGENT', 'phone|samsung|lgtel|mobile|[^A]skt|nokia|blackberry|android|sony'); + +// SMTP +// lib/mailer.lib.php 에서 사용 +define('G5_SMTP', '127.0.0.1'); + + +/******************** + 기타 상수 +********************/ + +// 게시판에서 링크의 기본개수를 말합니다. +// 필드를 추가하면 이 숫자를 필드수에 맞게 늘려주십시오. +define('G5_LINK_COUNT', 2); +?> \ No newline at end of file From a2e6ba132d719d10ab4b2afbe3bac78e0601754d Mon Sep 17 00:00:00 2001 From: gnuboard Date: Thu, 12 Dec 2013 16:14:50 +0900 Subject: [PATCH 4/8] =?UTF-8?q?.htaccess=20=ED=8C=8C=EC=9D=BC=EC=9D=B4=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C=EB=90=98=EC=A7=80=20=EC=95=8A=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20.gitignore=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 - extend/.htaccess | 1 + plugin/okname/key/.htaccess | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 extend/.htaccess create mode 100644 plugin/okname/key/.htaccess diff --git a/.gitignore b/.gitignore index 96ca0ceec..be427cb2e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ !.gitignore -.htaccess data/ test/ sirgle/ diff --git a/extend/.htaccess b/extend/.htaccess new file mode 100644 index 000000000..05196c0b3 --- /dev/null +++ b/extend/.htaccess @@ -0,0 +1 @@ +# .htaccess diff --git a/plugin/okname/key/.htaccess b/plugin/okname/key/.htaccess new file mode 100644 index 000000000..05196c0b3 --- /dev/null +++ b/plugin/okname/key/.htaccess @@ -0,0 +1 @@ +# .htaccess From 6a344d14388f76a4ba4cf0db2389f79f3e108b79 Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 13 Dec 2013 09:27:39 +0900 Subject: [PATCH 5/8] =?UTF-8?q?=EC=8D=B8=EB=84=A4=EC=9D=BC=EC=83=9D?= =?UTF-8?q?=EC=84=B1=20=ED=9B=84=20=EC=A7=80=EC=A0=95=20=EC=9D=B4=EB=AF=B8?= =?UTF-8?q?=EC=A7=80=20=EC=82=AC=EC=9D=B4=EC=A6=88=20=EC=9C=A0=EC=A7=80?= =?UTF-8?q?=EB=90=98=EC=A7=80=20=EC=95=8A=EB=8A=94=20=EC=98=A4=EB=A5=98=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/viewimageresize.js | 16 ++++++++++------ lib/thumbnail.lib.php | 2 +- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/js/viewimageresize.js b/js/viewimageresize.js index 7893ae45c..4336e11c5 100644 --- a/js/viewimageresize.js +++ b/js/viewimageresize.js @@ -21,16 +21,20 @@ var width = $this.width(); $img.each(function() { - $(this).removeAttr("width") - .removeAttr("height") - .css("width","") - .css("height", ""); - if($(this).data("width") == undefined) $(this).data("width", $(this).width()); if($(this).data("width") > width) { - $(this).css("width", "100%"); + $(this).removeAttr("width") + .removeAttr("height") + .css("width","") + .css("height", ""); + + if($(this).data("width") > width) { + $(this).css("width", "100%"); + } + } else { + $(this).attr("width", $(this).data("width")); } }); } diff --git a/lib/thumbnail.lib.php b/lib/thumbnail.lib.php index 31f4b7e7f..5920105d1 100644 --- a/lib/thumbnail.lib.php +++ b/lib/thumbnail.lib.php @@ -176,7 +176,7 @@ function get_view_thumbnail($contents, $thumb_width=0) // $img_tag에 editor 경로가 있으면 원본보기 링크 추가 $img_tag = $matches[0][$i]; if(strpos($img_tag, 'data/editor') && preg_match("/\.({$config['cf_image_extension']})$/i", $filename)) { - $imgurl = str_replace(G5_URL, "", $img_tag); + $imgurl = str_replace(G5_URL, "", $src); $thumb_tag = ''.$thumb_tag.''; } From 85840f77ecbf01c3a18faf6d1908eb3a7a4d3f18 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Mon, 16 Dec 2013 13:34:28 +0900 Subject: [PATCH 6/8] =?UTF-8?q?=EA=B0=A4=EB=9F=AC=EB=A6=AC=20=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=EC=97=90=EC=84=9C=20=EB=82=B4=EC=9A=A9?= =?UTF-8?q?=EC=97=90=20=EC=9D=B4=EB=AF=B8=EC=A7=80=EA=B0=80=20=ED=8F=AC?= =?UTF-8?q?=ED=95=A8=EB=90=98=EC=96=B4=20=EC=9E=88=EC=9D=84=20=EA=B2=BD?= =?UTF-8?q?=EC=9A=B0=20=EC=8D=B8=EB=84=A4=EC=9D=BC=20=EC=83=9D=EC=84=B1?= =?UTF-8?q?=EB=90=98=EC=A7=80=20=EC=95=8A=EB=8D=98=20=EC=98=A4=EB=A5=98=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/common.lib.php | 8 +++++--- lib/thumbnail.lib.php | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/common.lib.php b/lib/common.lib.php index 62146cad1..9d9299335 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -2000,14 +2000,16 @@ function delete_board_thumbnail($bo_table, $file) } // 에디터 이미지 얻기 -function get_editor_image($contents) +function get_editor_image($contents, $view=true) { if(!$contents) return false; // $contents 중 img 태그 추출 - //$pattern = "/]*src=[\'\"]?([^>\'\"]+[^>\'\"]+)[\'\"]?[^>]*>/"; - $pattern = "/]*)>/iS"; + if ($view) + $pattern = "/]*)>/iS"; + else + $pattern = "/]*src=[\'\"]?([^>\'\"]+[^>\'\"]+)[\'\"]?[^>]*>/"; preg_match_all($pattern, $contents, $matchs); return $matchs; diff --git a/lib/thumbnail.lib.php b/lib/thumbnail.lib.php index 5920105d1..caf04acc1 100644 --- a/lib/thumbnail.lib.php +++ b/lib/thumbnail.lib.php @@ -22,7 +22,7 @@ function get_list_thumbnail($bo_table, $wr_id, $thumb_width, $thumb_height, $is_ $write_table = $g5['write_prefix'].$bo_table; $sql = " select wr_content from $write_table where wr_id = '$wr_id' "; $write = sql_fetch($sql); - $matches = get_editor_image($write['wr_content']); + $matches = get_editor_image($write['wr_content'], false); $edt = true; for($i=0; $i Date: Mon, 16 Dec 2013 15:10:55 +0900 Subject: [PATCH 7/8] =?UTF-8?q?=EB=8F=84=EB=A1=9C=EB=AA=85=20=EC=A3=BC?= =?UTF-8?q?=EC=86=8C=20=EA=B2=80=EC=83=89=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/member_form.php | 9 +- adm/member_form_update.php | 1 + bbs/register_form_update.php | 51 ++--- bbs/zip.php | 18 +- install/gnuboard5.sql | 1 + js/common.js | 2 +- .../skin/member/basic/register_form.skin.php | 4 +- mobile/skin/member/basic/zip.skin.php | 190 +++++++++++++----- skin/member/basic/register_form.skin.php | 4 +- skin/member/basic/zip.skin.php | 187 ++++++++++++----- 10 files changed, 336 insertions(+), 131 deletions(-) diff --git a/adm/member_form.php b/adm/member_form.php index 0306fb699..8e5519985 100644 --- a/adm/member_form.php +++ b/adm/member_form.php @@ -112,6 +112,11 @@ if(isset($mb['mb_adult'])) { sql_query(" ALTER TABLE `{$g5['member_table']}` ADD `mb_adult` TINYINT NOT NULL DEFAULT '0' AFTER `mb_certify` ", false); } +// 지번주소 필드추가 +if(!isset($mb['mb_addr_jibeon'])) { + sql_query(" ALTER TABLE {$g5['member_table']} ADD `mb_addr_jibeon` varchar(255) NOT NULL DEFAULT '' AFTER `mb_addr2` ", false); +} + if ($mb['mb_intercept_date']) $g5['title'] = "차단된 "; else $g5['title'] .= ""; $g5['title'] .= '회원 '.$html_title; @@ -203,9 +208,11 @@ include_once('./admin.head.php');
상세주소 입력 +
+ 지번주소 : diff --git a/adm/member_form_update.php b/adm/member_form_update.php index 1ce9a55f1..44a7d50c7 100644 --- a/adm/member_form_update.php +++ b/adm/member_form_update.php @@ -41,6 +41,7 @@ $sql_common = " mb_name = '{$_POST['mb_name']}', mb_zip2 = '{$_POST['mb_zip2']}', mb_addr1 = '{$_POST['mb_addr1']}', mb_addr2 = '{$_POST['mb_addr2']}', + mb_addr_jibeon = '{$_POST['mb_addr_jibeon']}', mb_birth = '{$_POST['mb_birth']}', mb_sex = '{$_POST['mb_sex']}', mb_signature = '{$_POST['mb_signature']}', diff --git a/bbs/register_form_update.php b/bbs/register_form_update.php index eb2c80cc4..0b96a2867 100644 --- a/bbs/register_form_update.php +++ b/bbs/register_form_update.php @@ -26,30 +26,31 @@ $mb_password_re = escape_trim($_POST['mb_password_re']); $mb_name = escape_trim($_POST['mb_name']); $mb_nick = escape_trim($_POST['mb_nick']); $mb_email = escape_trim($_POST['mb_email']); -$mb_sex = isset($_POST['mb_sex']) ? escape_trim($_POST['mb_sex']) : ""; -$mb_birth = isset($_POST['mb_birth']) ? escape_trim($_POST['mb_birth']) : ""; -$mb_homepage = isset($_POST['mb_homepage']) ? escape_trim($_POST['mb_homepage']) : ""; -$mb_tel = isset($_POST['mb_tel']) ? escape_trim($_POST['mb_tel']) : ""; -$mb_hp = isset($_POST['mb_hp']) ? escape_trim($_POST['mb_hp']) : ""; -$mb_zip1 = isset($_POST['mb_zip1']) ? escape_trim($_POST['mb_zip1']) : ""; -$mb_zip2 = isset($_POST['mb_zip2']) ? escape_trim($_POST['mb_zip2']) : ""; -$mb_addr1 = isset($_POST['mb_addr1']) ? escape_trim($_POST['mb_addr1']) : ""; -$mb_addr2 = isset($_POST['mb_addr2']) ? escape_trim($_POST['mb_addr2']) : ""; -$mb_signature = isset($_POST['mb_signature']) ? escape_trim($_POST['mb_signature']) : ""; -$mb_profile = isset($_POST['mb_profile']) ? escape_trim($_POST['mb_profile']) : ""; -$mb_recommend = isset($_POST['mb_recommend']) ? escape_trim($_POST['mb_recommend']) : ""; -$mb_mailling = isset($_POST['mb_mailling']) ? escape_trim($_POST['mb_mailling']) : ""; -$mb_sms = isset($_POST['mb_sms']) ? escape_trim($_POST['mb_sms']) : ""; -$mb_1 = isset($_POST['mb_1']) ? escape_trim($_POST['mb_1']) : ""; -$mb_2 = isset($_POST['mb_2']) ? escape_trim($_POST['mb_2']) : ""; -$mb_3 = isset($_POST['mb_3']) ? escape_trim($_POST['mb_3']) : ""; -$mb_4 = isset($_POST['mb_4']) ? escape_trim($_POST['mb_4']) : ""; -$mb_5 = isset($_POST['mb_5']) ? escape_trim($_POST['mb_5']) : ""; -$mb_6 = isset($_POST['mb_6']) ? escape_trim($_POST['mb_6']) : ""; -$mb_7 = isset($_POST['mb_7']) ? escape_trim($_POST['mb_7']) : ""; -$mb_8 = isset($_POST['mb_8']) ? escape_trim($_POST['mb_8']) : ""; -$mb_9 = isset($_POST['mb_9']) ? escape_trim($_POST['mb_9']) : ""; -$mb_10 = isset($_POST['mb_10']) ? escape_trim($_POST['mb_10']) : ""; +$mb_sex = isset($_POST['mb_sex']) ? escape_trim($_POST['mb_sex']) : ""; +$mb_birth = isset($_POST['mb_birth']) ? escape_trim($_POST['mb_birth']) : ""; +$mb_homepage = isset($_POST['mb_homepage']) ? escape_trim($_POST['mb_homepage']) : ""; +$mb_tel = isset($_POST['mb_tel']) ? escape_trim($_POST['mb_tel']) : ""; +$mb_hp = isset($_POST['mb_hp']) ? escape_trim($_POST['mb_hp']) : ""; +$mb_zip1 = isset($_POST['mb_zip1']) ? escape_trim($_POST['mb_zip1']) : ""; +$mb_zip2 = isset($_POST['mb_zip2']) ? escape_trim($_POST['mb_zip2']) : ""; +$mb_addr1 = isset($_POST['mb_addr1']) ? escape_trim($_POST['mb_addr1']) : ""; +$mb_addr2 = isset($_POST['mb_addr2']) ? escape_trim($_POST['mb_addr2']) : ""; +$mb_addr_jibeon = isset($_POST['mb_addr_jibeon']) ? escape_trim($_POST['mb_addr_jibeon']) : ""; +$mb_signature = isset($_POST['mb_signature']) ? escape_trim($_POST['mb_signature']) : ""; +$mb_profile = isset($_POST['mb_profile']) ? escape_trim($_POST['mb_profile']) : ""; +$mb_recommend = isset($_POST['mb_recommend']) ? escape_trim($_POST['mb_recommend']) : ""; +$mb_mailling = isset($_POST['mb_mailling']) ? escape_trim($_POST['mb_mailling']) : ""; +$mb_sms = isset($_POST['mb_sms']) ? escape_trim($_POST['mb_sms']) : ""; +$mb_1 = isset($_POST['mb_1']) ? escape_trim($_POST['mb_1']) : ""; +$mb_2 = isset($_POST['mb_2']) ? escape_trim($_POST['mb_2']) : ""; +$mb_3 = isset($_POST['mb_3']) ? escape_trim($_POST['mb_3']) : ""; +$mb_4 = isset($_POST['mb_4']) ? escape_trim($_POST['mb_4']) : ""; +$mb_5 = isset($_POST['mb_5']) ? escape_trim($_POST['mb_5']) : ""; +$mb_6 = isset($_POST['mb_6']) ? escape_trim($_POST['mb_6']) : ""; +$mb_7 = isset($_POST['mb_7']) ? escape_trim($_POST['mb_7']) : ""; +$mb_8 = isset($_POST['mb_8']) ? escape_trim($_POST['mb_8']) : ""; +$mb_9 = isset($_POST['mb_9']) ? escape_trim($_POST['mb_9']) : ""; +$mb_10 = isset($_POST['mb_10']) ? escape_trim($_POST['mb_10']) : ""; if ($w == '' || $w == 'u') { @@ -198,6 +199,7 @@ if ($w == '') { mb_zip2 = '{$mb_zip2}', mb_addr1 = '{$mb_addr1}', mb_addr2 = '{$mb_addr2}', + mb_addr_jibeon = '{$mb_addr_jibeon}', mb_signature = '{$mb_signature}', mb_profile = '{$mb_profile}', mb_today_login = '".G5_TIME_YMDHIS."', @@ -308,6 +310,7 @@ if ($w == '') { mb_zip2 = '{$mb_zip2}', mb_addr1 = '{$mb_addr1}', mb_addr2 = '{$mb_addr2}', + mb_addr_jibeon = '{$mb_addr_jibeon}', mb_signature = '{$mb_signature}', mb_profile = '{$mb_profile}', mb_1 = '{$mb_1}', diff --git a/bbs/zip.php b/bbs/zip.php index 6f10ef7d9..55e4bc2b8 100644 --- a/bbs/zip.php +++ b/bbs/zip.php @@ -5,6 +5,7 @@ include_once('./_common.php'); //ini_set('memory_limit', '20M'); //$zipfile = file("./zip.db"); +/* $zipfile = array(); $fp = fopen('./zip.db', 'r'); while(!feof($fp)) { @@ -14,17 +15,17 @@ fclose($fp); $search_count = 0; -if ($addr1) +if ($addr1) { - while ($zipcode = each($zipfile)) + while ($zipcode = each($zipfile)) { if(strstr(substr($zipcode[1],9,512), $addr1)) { $list[$search_count][zip1] = substr($zipcode[1],0,3); - $list[$search_count][zip2] = substr($zipcode[1],4,3); + $list[$search_count][zip2] = substr($zipcode[1],4,3); $addr = explode(" ", substr($zipcode[1],8)); - if ($addr[sizeof($addr)-1]) + if ($addr[sizeof($addr)-1]) { $list[$search_count][addr] = str_replace($addr[sizeof($addr)-1], "", substr($zipcode[1],8)); $list[$search_count][bunji] = trim($addr[sizeof($addr)-1]); @@ -34,20 +35,21 @@ if ($addr1) $list[$search_count][encode_addr] = urlencode($list[$search_count][addr]); $search_count++; - } + } } if (!$search_count) alert('찾으시는 주소가 없습니다.'); } +*/ /* 기존의 DB에서 불러오는 방식 -if ($addr1) +if ($addr1) { //$sql = " select * from $g5[zip_table] where zp_dong like '%$addr1%' order by zp_id "; $sql = " select * from $g5[zip_table] where zp_dong like '%$addr1%' order by zp_sido, zp_gugun, zp_dong "; $result = sql_query($sql); $search_count = 0; - for ($i=0; $row=sql_fetch_array($result); $i++) + for ($i=0; $row=sql_fetch_array($result); $i++) { $list[$i][zip1] = substr($row[zp_code], 0, 3); $list[$i][zip2] = substr($row[zp_code], 3, 3); @@ -57,7 +59,7 @@ if ($addr1) $search_count++; } - if (!$search_count) + if (!$search_count) alert("찾으시는 주소가 없습니다."); } */ diff --git a/install/gnuboard5.sql b/install/gnuboard5.sql index 986aaa475..55e826937 100644 --- a/install/gnuboard5.sql +++ b/install/gnuboard5.sql @@ -456,6 +456,7 @@ CREATE TABLE IF NOT EXISTS `g5_member` ( `mb_zip2` char(3) NOT NULL default '', `mb_addr1` varchar(255) NOT NULL default '', `mb_addr2` varchar(255) NOT NULL default '', + `mb_addr_jibeon` varchar(255) NOT NULL default '', `mb_signature` text NOT NULL, `mb_recommend` varchar(255) NOT NULL default '', `mb_point` int(11) NOT NULL default '0', diff --git a/js/common.js b/js/common.js index 375bddbc2..8d44e19e6 100644 --- a/js/common.js +++ b/js/common.js @@ -356,7 +356,7 @@ var win_homepage = function(href) { * 우편번호 창 **/ var win_zip = function(href) { - var new_win = window.open(href, 'win_zip', 'width=616, height=460, scrollbars=1'); + var new_win = window.open(href, 'win_zip', 'width=616, height=760, scrollbars=1'); new_win.focus(); } diff --git a/mobile/skin/member/basic/register_form.skin.php b/mobile/skin/member/basic/register_form.skin.php index 609d087fb..6e43423fe 100644 --- a/mobile/skin/member/basic/register_form.skin.php +++ b/mobile/skin/member/basic/register_form.skin.php @@ -149,9 +149,11 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 class="frm_input frm_address " size="50"> class="frm_input frm_address " size="50"> +
+ diff --git a/mobile/skin/member/basic/zip.skin.php b/mobile/skin/member/basic/zip.skin.php index f93338781..e0d524761 100644 --- a/mobile/skin/member/basic/zip.skin.php +++ b/mobile/skin/member/basic/zip.skin.php @@ -2,65 +2,161 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 ?> +

-
- - - - - +

+ 시도 및 시군구 선택없이 도로명, 읍/면/동, 건물명 등으로 검색하실 수 있습니다.
+ 검색결과는 최대 1,000건만 표시됩니다. 만약 검색결과에 찾으시는 주소가 없을 때는
+ 시도와 시군구를 선택하신 후 다시 검색해 주십시오. +

+ +
- - +
+ + + + +
+
+ + + +
+ - - - - - 0) { ?> -
-
총 건 가나다순 정렬
-
-
    - -
  • -
    • - -
-
-
- -

검색결과가 끝났습니다.

- +
- 0) { ?> - -
+ + + \ No newline at end of file diff --git a/skin/member/basic/register_form.skin.php b/skin/member/basic/register_form.skin.php index f8bbc846e..4faaab5e6 100644 --- a/skin/member/basic/register_form.skin.php +++ b/skin/member/basic/register_form.skin.php @@ -154,9 +154,11 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 class="frm_input frm_address " size="50"> class="frm_input frm_address " size="50"> +
+ diff --git a/skin/member/basic/zip.skin.php b/skin/member/basic/zip.skin.php index b1101b9c9..e0d524761 100644 --- a/skin/member/basic/zip.skin.php +++ b/skin/member/basic/zip.skin.php @@ -8,64 +8,155 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가

- - - - - - +

+ 시도 및 시군구 선택없이 도로명, 읍/면/동, 건물명 등으로 검색하실 수 있습니다.
+ 검색결과는 최대 1,000건만 표시됩니다. 만약 검색결과에 찾으시는 주소가 없을 때는
+ 시도와 시군구를 선택하신 후 다시 검색해 주십시오. +

+
- - - +
+ + + + +
+
+ + + +
- - - 0) { ?> -
-
총 건 가나다순 정렬
-
- '; - ?> -
  • -
    • - 0) echo ''; - ?> -
    -
    - -

    검색결과가 끝났습니다.

    - - +
    - 0) { ?> - -
    + + \ No newline at end of file From 61c78397cc8fc4e0b8c7e5afcec20edecd701e35 Mon Sep 17 00:00:00 2001 From: chicpro Date: Tue, 17 Dec 2013 09:07:05 +0900 Subject: [PATCH 8/8] =?UTF-8?q?=EC=A7=80=EB=B2=88=EC=A3=BC=EC=86=8C=20?= =?UTF-8?q?=EC=B6=9C=EB=A0=A5=20=EC=97=98=EB=A6=AC=EB=A8=BC=ED=8A=B8=20id?= =?UTF-8?q?=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mobile/skin/member/basic/register_form.skin.php | 2 +- mobile/skin/member/basic/zip.skin.php | 2 +- skin/member/basic/register_form.skin.php | 2 +- skin/member/basic/zip.skin.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mobile/skin/member/basic/register_form.skin.php b/mobile/skin/member/basic/register_form.skin.php index 6e43423fe..7a007c14d 100644 --- a/mobile/skin/member/basic/register_form.skin.php +++ b/mobile/skin/member/basic/register_form.skin.php @@ -150,7 +150,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 class="frm_input frm_address " size="50">
    - +