diff --git a/bbs/formmail.php b/bbs/formmail.php index fdd045ecf..3415623a5 100644 --- a/bbs/formmail.php +++ b/bbs/formmail.php @@ -8,10 +8,7 @@ if (!$config['cf_email_use']) if (!$is_member && $config['cf_formmail_is_member']) alert_close('회원만 이용하실 수 있습니다.'); -$mb_id = isset($mb_id) ? $mb_id : ''; -$mb_hash = isset($mb_hash) ? $mb_hash : ''; - -$mb_id = get_search_string(get_member_by_hash($mb_id, $mb_hash)); +$mb_id = isset($mb_id) ? get_search_string($mb_id) : ''; if ($is_member && !$member['mb_open'] && $is_admin != "super" && $member['mb_id'] != $mb_id) alert_close('자신의 정보를 공개하지 않으면 다른분에게 메일을 보낼 수 없습니다.\\n\\n정보공개 설정은 회원정보수정에서 하실 수 있습니다.'); diff --git a/bbs/list.php b/bbs/list.php index 8e089bad0..85f179c7c 100644 --- a/bbs/list.php +++ b/bbs/list.php @@ -36,9 +36,9 @@ $stx = trim($stx); //검색인지 아닌지 구분하는 변수 초기화 $is_search_bbs = false; -if ($sca || $stx || $mb_hash || $stx === '0') { //검색이면 +if ($sca || $stx || $stx === '0') { //검색이면 $is_search_bbs = true; //검색구분변수 true 지정 - $sql_search = get_sql_search($sca, $sfl, $stx, $sop, $mb_hash); + $sql_search = get_sql_search($sca, $sfl, $stx, $sop); // 가장 작은 번호를 얻어서 변수에 저장 (하단의 페이징에서 사용) $sql = " select MIN(wr_num) as min_wr_num from {$write_table} "; @@ -202,10 +202,6 @@ if($page_rows > 0) { g5_latest_cache_data($board['bo_table'], $list); -if( $mb_hash ){ - $qstr.="&mb_hash=$mb_hash"; -} - $write_pages = get_paging(G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, get_pretty_url($bo_table, '', $qstr.'&page=')); $list_href = ''; diff --git a/bbs/memo.php b/bbs/memo.php index b8d9f7d93..25405482d 100644 --- a/bbs/memo.php +++ b/bbs/memo.php @@ -50,8 +50,6 @@ $sql = " select a.*, b.mb_id, b.mb_nick, b.mb_email, b.mb_homepage where a.me_{$kind}_mb_id = '{$member['mb_id']}' and a.me_type = '$kind' order by a.me_id desc limit $from_record, {$config['cf_page_rows']} "; -echo $sql; - $result = sql_query($sql); for ($i=0; $row=sql_fetch_array($result); $i++) { diff --git a/bbs/memo_form.php b/bbs/memo_form.php index 7fff33cf4..4ada2ccc3 100644 --- a/bbs/memo_form.php +++ b/bbs/memo_form.php @@ -10,18 +10,9 @@ if (!$member['mb_open'] && $is_admin != 'super' && $member['mb_id'] != $mb_id) $content = ""; // 탈퇴한 회원에게 쪽지 보낼 수 없음 - -$mb_id = isset($mb_id) ? $mb_id : ''; -$mb_hash = isset($mb_hash) ? $mb_hash : ''; -$me_recv_mb_nicks = ''; - -if ($mb_id || $mb_hash) +if ($me_recv_mb_id) { - $me_recv_mb_id = get_search_string(get_member_by_hash($mb_id, $mb_hash)); - $mb = get_member($me_recv_mb_id); - $me_recv_mb_nicks = $mb['mb_nick']; - if (!$mb['mb_id']) alert_close('회원정보가 존재하지 않습니다.\\n\\n탈퇴하였을 수 있습니다.'); diff --git a/bbs/memo_form_update.php b/bbs/memo_form_update.php index 40b36c50d..a3ecd296b 100644 --- a/bbs/memo_form_update.php +++ b/bbs/memo_form_update.php @@ -9,7 +9,7 @@ if (!chk_captcha()) { alert('자동등록방지 숫자가 틀렸습니다.'); } -$recv_list = explode(',', trim($_POST['me_recv_mb_nicks'])); +$recv_list = explode(',', trim($_POST['me_recv_mb_id'])); $str_nick_list = ''; $msg = ''; $error_list = array(); @@ -18,12 +18,7 @@ $member_list = array('id'=>array(), 'nick'=>array()); start_event('memo_form_update_before', $recv_list); for ($i=0; $i +?> \ No newline at end of file diff --git a/bbs/profile.php b/bbs/profile.php index 659e62608..d10ba16b8 100644 --- a/bbs/profile.php +++ b/bbs/profile.php @@ -8,9 +8,8 @@ if (!$member['mb_open'] && $is_admin != 'super' && $member['mb_id'] != $mb_id) alert_close('자신의 정보를 공개하지 않으면 다른분의 정보를 조회할 수 없습니다.\\n\\n정보공개 설정은 회원정보수정에서 하실 수 있습니다.'); $mb_id = isset($mb_id) ? $mb_id : ''; -$mb_hash = isset($mb_hash) ? $mb_hash : ''; -$mb = get_member(get_search_string(get_member_by_hash($mb_id, $mb_hash))); +$mb = get_member($mb_id); if (!$mb['mb_id']) alert_close('회원정보가 존재하지 않습니다.\\n\\n탈퇴하였을 수 있습니다.'); diff --git a/lib/common.lib.php b/lib/common.lib.php index 846d15472..dffe527cf 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -598,7 +598,7 @@ function html_purifier($html) // 검색 구문을 얻는다. -function get_sql_search($search_ca_name, $search_field, $search_text, $search_operator='and', $mb_hashkey='') +function get_sql_search($search_ca_name, $search_field, $search_text, $search_operator='and') { global $g5; @@ -609,7 +609,7 @@ function get_sql_search($search_ca_name, $search_field, $search_text, $search_op $search_text = strip_tags(($search_text)); $search_text = trim(stripslashes($search_text)); - if (!$search_text && $search_text !== '0' && !$mb_hashkey) { + if (!$search_text && $search_text !== '0') { if ($search_ca_name) { return $str; } else { @@ -657,11 +657,6 @@ function get_sql_search($search_ca_name, $search_field, $search_text, $search_op $str .= $op2; switch ($field[$k]) { case "mb_id" : - if( $is_admin ){ - $str .= " $field[$k] = '$s[$i]' "; - $mb_hashkey = ''; - } - break; case "wr_name" : $str .= " $field[$k] = '$s[$i]' "; break; @@ -692,12 +687,6 @@ function get_sql_search($search_ca_name, $search_field, $search_text, $search_op $op1 = " $search_operator "; } - - if ($mb_hashkey){ - $str .= (preg_match('/[a-z]/i', $str) ? " $search_operator" : '' )." mb_id = '".get_string_check_decrypt($mb_hashkey, 'mb_id')."' "; - $not_comment = 1; - } - $str .= " ) "; if ($not_comment) $str .= " and wr_is_comment = '0' "; @@ -1291,13 +1280,6 @@ function get_sideview($mb_id, $name='', $email='', $homepage='') $tmp_name = ""; $en_mb_id = $mb_id; - if( $is_admin ){ - $mb_params = 'mb_id='.$mb_id; - } else { - $en_mb_id = get_string_encrypt($mb_id); - $mb_params = 'mb_hash='.$en_mb_id; - } - if ($mb_id) { //$tmp_name = "$name"; $tmp_name = ''; @@ -1342,26 +1324,22 @@ function get_sideview($mb_id, $name='', $email='', $homepage='') $str2 = "\n"; if($mb_id) - $str2 .= "쪽지보내기\n"; + $str2 .= "쪽지보내기\n"; if($email) - $str2 .= "메일보내기\n"; + $str2 .= "메일보내기\n"; if($homepage) $str2 .= "홈페이지\n"; if($mb_id) - $str2 .= "자기소개\n"; + $str2 .= "자기소개\n"; if($bo_table) { if($mb_id) { - if( $is_admin ){ - $str2 .= "아이디로 검색\n"; - } else { - $str2 .= "아이디로 검색\n"; - } + $str2 .= "아이디로 검색\n"; } else { $str2 .= "이름으로 검색\n"; } } if($mb_id) - $str2 .= "전체게시물\n"; + $str2 .= "전체게시물\n"; if($is_admin == "super" && $mb_id) { $str2 .= "회원정보변경\n"; $str2 .= "포인트내역\n"; @@ -3445,20 +3423,6 @@ function check_vaild_callback($callback){ } } -function is_url_base64_encoded($s) -{ - $s_encode = strtr($s, '._-', '+/='); - - if (!preg_match('/^[a-zA-Z0-9\/\r\n+]*={0,2}$/', $s_encode)) return false; - - $decoded = base64_decode($s_encode, true); - if(false === $decoded) return false; - - if(base64_encode($decoded) != $s_encode) return false; - - return true; -} - // 문자열 암복호화 class str_encrypt { diff --git a/lib/get_data.lib.php b/lib/get_data.lib.php index 5d11c7a51..b1b22a3fe 100644 --- a/lib/get_data.lib.php +++ b/lib/get_data.lib.php @@ -298,30 +298,6 @@ function get_string_encrypt($str){ return $encrypt_str; } -function get_bool_encrypt_encoded($str){ - return apply_replace('get_bool_encrypt_encoded', is_url_base64_encoded($str), $str); -} - -function get_string_check_decrypt($str, $field=''){ - - if( $field === 'mb_id' ){ - $pattern = '/[^0-9a-z_]+/i'; - } else { - $pattern = '/[^a-zA-Z0-9\/:@\.\+-s]/'; - } - - if( get_bool_encrypt_encoded($str) ){ - - if( $field === 'mb_id' ){ - return preg_replace($pattern, '', get_string_decrypt($str)); - } - - return get_string_decrypt($str); - } - - return preg_replace($pattern, '', strip_tags($str)); -} - function get_string_decrypt($str){ $new = get_class_encrypt(); @@ -331,19 +307,6 @@ function get_string_decrypt($str){ return $decrypt_str; } -function get_member_by_hash($mb_id='', $mb_hash=''){ - - global $is_admin; - - if( $is_admin && $mb_id ){ - return $mb_id; - } else if ( $mb_hash ){ - return get_string_check_decrypt($mb_hash, 'mb_id'); - } - - return ''; -} - function get_permission_debug_show(){ global $member; @@ -373,7 +336,7 @@ function get_mb_icon_name($mb_id){ return $icon_name; } - return md5($mb_id); + return $mb_id; } // 생성되면 안되는 게시판명 @@ -388,15 +351,6 @@ function get_bo_table_banned_word(){ return apply_replace('get_bo_table_banned_word', $folders); } -function get_add_mbhash_params($qstr, $board, $wr_id){ - - if( isset($_GET['mb_hash']) && is_url_base64_encoded($_GET['mb_hash']) ){ - $qstr .= '&mb_hash=' . strip_tags($_GET['mb_hash']); - } - - return $qstr; -} - function get_board_sfl_select_options($sfl){ global $is_admin; diff --git a/mobile/skin/member/basic/memo_form.skin.php b/mobile/skin/member/basic/memo_form.skin.php index 6a33bb96c..f8eafd211 100644 --- a/mobile/skin/member/basic/memo_form.skin.php +++ b/mobile/skin/member/basic/memo_form.skin.php @@ -13,14 +13,14 @@ add_stylesheet('',
  • 보낸쪽지
  • 쪽지쓰기
    • -
    +

    쪽지쓰기

    • - + - + 여러 회원에게 보낼때는 컴마(,)로 구분하세요.
      쪽지 보낼때 회원당 점의 포인트를 차감합니다. diff --git a/mobile/skin/member/basic/memo_view.skin.php b/mobile/skin/member/basic/memo_view.skin.php index 2f4e91841..51ed44b88 100644 --- a/mobile/skin/member/basic/memo_view.skin.php +++ b/mobile/skin/member/basic/memo_view.skin.php @@ -43,7 +43,7 @@ add_stylesheet('',
      - 답장 + 답장 이전쪽지 diff --git a/mobile/skin/new/basic/new.skin.php b/mobile/skin/new/basic/new.skin.php index 49388ce5d..e7263f92f 100644 --- a/mobile/skin/new/basic/new.skin.php +++ b/mobile/skin/new/basic/new.skin.php @@ -16,11 +16,7 @@ add_stylesheet('', 0);