diff --git a/.gitignore b/.gitignore index 64a32baaf..be427cb2e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,7 @@ -.htaccess -config.php +!.gitignore data/ test/ -sirgle +sirgle/ test.php *.key *.sh 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/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/common.lib.php b/lib/common.lib.php index 0233a5b4b..9d9299335 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -2000,13 +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=[\'\"]?([^>\'\"]+[^>\'\"]+)[\'\"]?[^>]*>/"; + 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 ceb3e4579..caf04acc1 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'], false); $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, "", $src); $thumb_tag = ''.$thumb_tag.''; } diff --git a/mobile/skin/member/basic/register_form.skin.php b/mobile/skin/member/basic/register_form.skin.php index 609d087fb..7a007c14d 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..c95b2d5c6 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..342a9e451 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..c95b2d5c6 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