diff --git a/adm/admin.lib.php b/adm/admin.lib.php index 53410238e..38a1183f4 100644 --- a/adm/admin.lib.php +++ b/adm/admin.lib.php @@ -191,7 +191,6 @@ function order_select($fld, $sel='') // 접근 권한 검사 if (!$member['mb_id']) { - //alert('로그인 하십시오.', '$g5['bbs_path']/login.php?url=' . urlencode('$_SERVER['PHP_SELF']?w=$w&mb_id=$mb_id')); alert('로그인 하십시오.', G5_BBS_URL.'/login.php?url=' . urlencode(G5_ADMIN_URL)); } else if ($is_admin != 'super') diff --git a/adm/auth_list.php b/adm/auth_list.php index fc11f400e..3dfad19f5 100644 --- a/adm/auth_list.php +++ b/adm/auth_list.php @@ -45,7 +45,7 @@ $sql = " select * limit {$from_record}, {$rows} "; $result = sql_query($sql); -$listall = '전체목록'; +$listall = '전체목록'; $g5['title'] = "관리권한설정"; include_once('./admin.head.php'); @@ -158,7 +158,7 @@ else diff --git a/adm/board_form.php b/adm/board_form.php index 1bf23223c..d40bd5756 100644 --- a/adm/board_form.php +++ b/adm/board_form.php @@ -1099,12 +1099,12 @@ $frm_submit .= ''; - - - - - - + + + + + + diff --git a/adm/board_list.php b/adm/board_list.php index 1c51da1d2..ade37535c 100644 --- a/adm/board_list.php +++ b/adm/board_list.php @@ -46,7 +46,7 @@ $from_record = ($page - 1) * $rows; // 시작 열을 구함 $sql = " select * {$sql_common} {$sql_search} {$sql_order} limit {$from_record}, {$rows} "; $result = sql_query($sql); -$listall = '전체목록'; +$listall = '전체목록'; $g5['title'] = '게시판관리'; include_once('./admin.head.php'); @@ -208,7 +208,7 @@ $colspan = 15; - + '."\n"; -flush(); - -$max_count = 50; - -// 테이블 락을 걸고 -$sql = " LOCK TABLES {$g5['member_table']} WRITE, {$g5['point_table']} WRITE "; -sql_query($sql); - -$sql = " select mb_id, count(po_point) as cnt - from {$g5['point_table']} - group by mb_id - having cnt > {$max_count}+1 - order by cnt "; -$result = sql_query($sql); -for ($i=0; $row=sql_fetch_array($result); $i++) -{ - $count = 0; - $total = 0; - $sql2 = " select po_id, po_point - from {$g5['point_table']} - where mb_id = '{$row['mb_id']}' - order by po_id desc - limit {$max_count}, {$row['cnt']} "; - $result2 = sql_query($sql2); - for ($k=0; $row2=sql_fetch_array($result2); $k++) - { - $count++; - $total += $row2['po_point']; - - sql_query(" delete from {$g5['point_table']} where po_id = '{$row2['po_id']}' "); - } - - insert_point($row['mb_id'], $total, '포인트 {$count}건 정리', '@clear', $row['mb_id'], G5_TIME_YMD."-".uniqid("")); - - $str = $row['mb_id']."님 포인트 내역 ".number_format($count)."건 ".number_format($total)."점 정리
"; - echo ''."\n"; - flush(); -} - -// 테이블 락을 풀고 -$sql = " UNLOCK TABLES "; -sql_query($sql); - -echo ''."\n"; -?> diff --git a/adm/point_list.php b/adm/point_list.php index 08f44d5b1..eaed7aaff 100644 --- a/adm/point_list.php +++ b/adm/point_list.php @@ -48,7 +48,7 @@ $sql = " select * limit {$from_record}, {$rows} "; $result = sql_query($sql); -$listall = '전체목록'; +$listall = '전체목록'; $mb = array(); if ($sfl == 'mb_id' && $stx) @@ -70,16 +70,6 @@ else $mb_id = ""; ?> - -
전체 건 @@ -91,7 +81,6 @@ function point_clear() echo ' (전체 합계 '.number_format($row2['sum_point']).'점)'; } ?> -
@@ -192,7 +181,7 @@ function point_clear()
- +

개별회원 포인트 증감 설정

diff --git a/adm/poll_form.php b/adm/poll_form.php index 533596dcd..795719edf 100644 --- a/adm/poll_form.php +++ b/adm/poll_form.php @@ -86,8 +86,8 @@ include_once('./admin.head.php'); - - + 투표등록일 + diff --git a/adm/poll_form_update.php b/adm/poll_form_update.php index ef955f793..19a11b49d 100644 --- a/adm/poll_form_update.php +++ b/adm/poll_form_update.php @@ -14,7 +14,7 @@ if ($w == '') { $sql = " insert {$g5['poll_table']} ( po_subject, po_poll1, po_poll2, po_poll3, po_poll4, po_poll5, po_poll6, po_poll7, po_poll8, po_poll9, po_cnt1, po_cnt2, po_cnt3, po_cnt4, po_cnt5, po_cnt6, po_cnt7, po_cnt8, po_cnt9, po_etc, po_level, po_point, po_date ) - values ( '{$_POST['po_subject']}', '{$_POST['po_poll1']}', '{$_POST['po_poll2']}', '{$_POST['po_poll3']}', '{$_POST['po_poll4']}', '{$_POST['po_poll5']}', '{$_POST['po_poll6']}', '{$_POST['po_poll7']}', '{$_POST['po_poll8']}', '{$_POST['po_poll9']}', '{$_POST['po_cnt1']}', '{$_POST['po_cnt2']}', '{$_POST['po_cnt3']}', '{$_POST['po_cnt4']}', '{$_POST['po_cnt5']}', '{$_POST['po_cnt6']}', '{$_POST['po_cnt7']}', '{$_POST['po_cnt8']}', '{$_POST['po_cnt9']}', '{$_POST['po_etc']}', '{$_POST['po_level']}', '{$_POST['po_point']}', '".G5_TIME_YMDHIS."' ) "; + values ( '{$_POST['po_subject']}', '{$_POST['po_poll1']}', '{$_POST['po_poll2']}', '{$_POST['po_poll3']}', '{$_POST['po_poll4']}', '{$_POST['po_poll5']}', '{$_POST['po_poll6']}', '{$_POST['po_poll7']}', '{$_POST['po_poll8']}', '{$_POST['po_poll9']}', '{$_POST['po_cnt1']}', '{$_POST['po_cnt2']}', '{$_POST['po_cnt3']}', '{$_POST['po_cnt4']}', '{$_POST['po_cnt5']}', '{$_POST['po_cnt6']}', '{$_POST['po_cnt7']}', '{$_POST['po_cnt8']}', '{$_POST['po_cnt9']}', '{$_POST['po_etc']}', '{$_POST['po_level']}', '{$_POST['po_point']}', '".G5_TIME_YMD."' ) "; sql_query($sql); $po_id = mysql_insert_id(); @@ -43,8 +43,7 @@ else if ($w == 'u') po_cnt9 = '{$_POST['po_cnt9']}', po_etc = '{$_POST['po_etc']}', po_level = '{$_POST['po_level']}', - po_point = '{$_POST['po_point']}', - po_date = '{$_POST['po_date']}' + po_point = '{$_POST['po_point']}' where po_id = '{$_POST['po_id']}' "; sql_query($sql); } diff --git a/adm/poll_list.php b/adm/poll_list.php index b07e39166..2de51e514 100644 --- a/adm/poll_list.php +++ b/adm/poll_list.php @@ -44,7 +44,7 @@ $sql = " select * limit {$from_record}, {$rows} "; $result = sql_query($sql); -$listall = '전체목록'; +$listall = '전체목록'; $g5['title'] = '투표관리'; include_once('./admin.head.php'); @@ -106,7 +106,6 @@ $colspan = 7; $po_etc = ($row['po_etc']) ? "사용" : "미사용"; $s_mod = '수정'; - //$s_del = '삭제'; $bg = 'bg'.($i%2); ?> @@ -139,7 +138,7 @@ $colspan = 7; - + - +
- 목록 + 목록
diff --git a/adm/sms_admin/history_list.php b/adm/sms_admin/history_list.php index 193937878..bf6d1afd0 100644 --- a/adm/sms_admin/history_list.php +++ b/adm/sms_admin/history_list.php @@ -27,7 +27,7 @@ $vnum = $total_count - (($page-1) * $page_size); include_once(G5_ADMIN_PATH.'/admin.head.php'); ?> -
class="local_sch01 local_sch" method="get"> + class="local_sch01 local_sch" method="get"> @@ -91,7 +91,7 @@ include_once(G5_ADMIN_PATH.'/admin.head.php'); - + - + @@ -100,7 +100,7 @@ include_once(G5_ADMIN_PATH.'/admin.head.php'); - + - + @@ -244,7 +244,7 @@ function all_send() - + - +
거부 명 -
+ + - +
@@ -256,7 +256,7 @@ function select_copy(sw, f) { } - + - 목록 + 목록 diff --git a/adm/sms_admin/sms_write.php b/adm/sms_admin/sms_write.php index ee98ee8b4..89ec40562 100644 --- a/adm/sms_admin/sms_write.php +++ b/adm/sms_admin/sms_write.php @@ -238,6 +238,8 @@ function sms5_chk_send(f) var hp_list = document.getElementById('hp_list'); var wr_message = document.getElementById('wr_message'); var hp_number = document.getElementById('hp_number'); + var wr_reply = document.getElementById('wr_reply'); + var wr_reply_regExp = /^[0-9\-]+$/; var list = ''; if (!wr_message.value) { @@ -246,7 +248,12 @@ function sms5_chk_send(f) is_sms5_submitted = false; return false; } - + if( !wr_reply_regExp.test(wr_reply.value) ){ + alert('회신번호 형식이 잘못 되었습니다.'); + wr_reply.focus(); + is_sms5_submitted = false; + return false; + } if (hp_list.length < 1) { alert('받는 사람을 입력해주세요.'); hp_number.focus(); diff --git a/adm/sms_admin/sms_write_form.php b/adm/sms_admin/sms_write_form.php index 23435005a..fdbf64c91 100644 --- a/adm/sms_admin/sms_write_form.php +++ b/adm/sms_admin/sms_write_form.php @@ -23,7 +23,7 @@ $no_count = $res['cnt'];
- + diff --git a/adm/sms_admin/sms_write_send.php b/adm/sms_admin/sms_write_send.php index c59301258..45646ffec 100644 --- a/adm/sms_admin/sms_write_send.php +++ b/adm/sms_admin/sms_write_send.php @@ -6,10 +6,13 @@ auth_check($auth[$sub_menu], "w"); $g5['title'] = "문자전송중"; -if (!trim($wr_reply)) - win_close_alert('회신 번호를 입력해주세요.'); +$wr_reply = preg_replace('#[^0-9\-]#', '', trim($wr_reply)); +$wr_message = clean_xss_tags(trim($wr_message)); -if (!trim($wr_message)) +if (!$wr_reply) + win_close_alert('회신 번호를 숫자, - 로 입력해주세요.'); + +if (!$wr_message) win_close_alert('메세지를 입력해주세요.'); if (!trim($send_list)) diff --git a/adm/visit_delete_update.php b/adm/visit_delete_update.php index 1cbe920cf..716eec63f 100644 --- a/adm/visit_delete_update.php +++ b/adm/visit_delete_update.php @@ -19,7 +19,7 @@ if(!$pass) // 관리자 비밀번호 비교 $admin = get_admin('super'); -if(sql_password($pass) != $admin['mb_password']) +if(!check_password($pass, $admin['mb_password'])) alert('관리자 비밀번호가 일치하지 않습니다.'); if(!$year) diff --git a/adm/visit_list.php b/adm/visit_list.php index 3b9b9c070..afc950164 100644 --- a/adm/visit_list.php +++ b/adm/visit_list.php @@ -75,8 +75,8 @@ $result = sql_query($sql); else $ip = preg_replace("/([0-9]+).([0-9]+).([0-9]+).([0-9]+)/", G5_IP_DISPLAY, $row['vi_ip']); - if ($brow == '기타') { $brow = ''.$brow.''; } - if ($os == '기타') { $os = ''.$os.''; } + if ($brow == '기타') { $brow = ''.$brow.''; } + if ($os == '기타') { $os = ''.$os.''; } $bg = 'bg'.($i%2); ?> @@ -102,7 +102,7 @@ if (isset($domain)) $qstr .= "&domain=$domain"; $qstr .= "&page="; -$pagelist = get_paging($config['cf_write_pages'], $page, $total_page, "{$_SERVER['PHP_SELF']}?$qstr"); +$pagelist = get_paging($config['cf_write_pages'], $page, $total_page, "{$_SERVER['SCRIPT_NAME']}?$qstr"); echo $pagelist; include_once('./admin.tail.php'); diff --git a/adm/visit_search.php b/adm/visit_search.php index 636304de2..23f1af471 100644 --- a/adm/visit_search.php +++ b/adm/visit_search.php @@ -10,7 +10,7 @@ include_once('./admin.head.php'); include_once(G5_PLUGIN_PATH.'/jquery-ui/datepicker.php'); $colspan = 5; -$listall = '처음'; //페이지 처음으로 (초기화용도) +$listall = '처음'; //페이지 처음으로 (초기화용도) ?>
@@ -92,17 +92,17 @@ $listall = '처음'; //페이지 처음 else $ip = preg_replace("/([0-9]+).([0-9]+).([0-9]+).([0-9]+)/", G5_IP_DISPLAY, $row['vi_ip']); - if ($brow == '기타') $brow = ''.$brow.''; - if ($os == '기타') $os = ''.$os.''; + if ($brow == '기타') $brow = ''.$brow.''; + if ($os == '기타') $os = ''.$os.''; $bg = 'bg'.($i%2); ?>
- + - + '; ?> @@ -111,7 +111,7 @@ $listall = '처음'; //페이지 처음 ", $msg); if (!$url) $url = $_SERVER['HTTP_REFERER']; +// url 체크 +check_url_host($url); + if($error) { $header2 = "다음 항목에 오류가 있습니다."; } else { diff --git a/bbs/confirm.php b/bbs/confirm.php index cba013226..76e9c7652 100644 --- a/bbs/confirm.php +++ b/bbs/confirm.php @@ -1,6 +1,11 @@ '; + echo ''; exit; } @@ -32,6 +32,8 @@ if ($row['cnt']) exit; } +$wr_content = trim($_POST['wr_content']); + // 덧글이 넘어오고 코멘트를 쓸 권한이 있다면 if ($wr_content && ($member['mb_level'] >= $board['bo_comment_level'])) { diff --git a/bbs/search.php b/bbs/search.php index ed0058d54..9548bfae7 100644 --- a/bbs/search.php +++ b/bbs/search.php @@ -135,7 +135,7 @@ if ($stx) { $sch_all = ""; if ($onetable == $g5_search['tables'][$i]) $sch_class = "class=sch_on"; else $sch_all = "class=sch_on"; - $str_board_list .= '
  • '.$row2['bo_subject'].''.$row['cnt'].'
    • '; + $str_board_list .= '
  • '.$row2['bo_subject'].''.$row['cnt'].'
    • '; } } @@ -217,7 +217,7 @@ if ($stx) { $from_record = 0; } - $write_pages = get_paging(G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, $_SERVER['PHP_SELF'].'?'.$search_query.'&gr_id='.$gr_id.'&srows='.$srows.'&onetable='.$onetable.'&page='); + $write_pages = get_paging(G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, $_SERVER['SCRIPT_NAME'].'?'.$search_query.'&gr_id='.$gr_id.'&srows='.$srows.'&onetable='.$onetable.'&page='); } $group_select = '); // 최대 ', 0); ?> - diff --git a/mobile/skin/faq/basic/list.skin.php b/mobile/skin/faq/basic/list.skin.php index d64a533a1..f625ff36a 100644 --- a/mobile/skin/faq/basic/list.skin.php +++ b/mobile/skin/faq/basic/list.skin.php @@ -73,7 +73,7 @@ if( count($faq_master_list) ){ ?> - +',

    비밀번호를 한번 더 입력해주세요. + + 비밀번호를 입력하시면 회원탈퇴가 완료됩니다. + 회원님의 정보를 안전하게 보호하기 위해 비밀번호를 한번 더 확인합니다. +

    diff --git a/mobile/skin/member/basic/point.skin.php b/mobile/skin/member/basic/point.skin.php index 93ce40a91..bc0ff54b7 100644 --- a/mobile/skin/member/basic/point.skin.php +++ b/mobile/skin/member/basic/point.skin.php @@ -75,7 +75,7 @@ add_stylesheet('', - +
    \ No newline at end of file diff --git a/mobile/tail.php b/mobile/tail.php index 6ada54bbd..44d88ff22 100644 --- a/mobile/tail.php +++ b/mobile/tail.php @@ -25,27 +25,8 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 $val) { - if($key == 'device') - continue; - - $href .= $sep.$key.'='.$val; - $sep = '&'; - $seq++; - } - } - if($seq) - $href .= '&device=pc'; - else - $href .= '?device=pc'; -?> -PC 버전으로 보기 +if(G5_DEVICE_BUTTON_DISPLAY && G5_IS_MOBILE) { ?> +PC 버전으로 보기); // 최대 ); // 최대 - +',
    자료가 없습니다.
    - +
    \ No newline at end of file diff --git a/skin/member/basic/style.css b/skin/member/basic/style.css index 87861cf15..481d30037 100644 --- a/skin/member/basic/style.css +++ b/skin/member/basic/style.css @@ -50,7 +50,7 @@ .mbskin .frm_file {} .mbskin .tbl_frm01 {} -.mbskin .tbl_frm01 th {} +.mbskin .tbl_frm01 th {width:85px;} .mbskin .tbl_frm01 td {} .mbskin .tbl_frm01 textarea, .mb_skin tbl_frm01 .frm_input {} .mbskin .tbl_frm01 textarea {} diff --git a/skin/qa/basic/style.css b/skin/qa/basic/style.css index 1d383415f..8f7022428 100644 --- a/skin/qa/basic/style.css +++ b/skin/qa/basic/style.css @@ -107,7 +107,7 @@ #bo_list .txt_expired {color:#ccc} #bo_cate h2 {position:absolute;font-size:0;line-height:0;overflow:hidden} -#bo_cate ul {margin-bottom:10px;padding-left:1px;width:728px;zoom:1} +#bo_cate ul {margin-bottom:10px;padding-left:1px;zoom:1} #bo_cate ul:after {display:block;visibility:hidden;clear:both;content:""} #bo_cate li {float:left;margin-bottom:-1px} #bo_cate a {display:block;position:relative;margin-left:-1px;padding:6px 0 5px;width:90px;border:1px solid #ddd;background:#f7f7f7;color:#888;text-align:center;letter-spacing:-0.1em;line-height:1.2em;cursor:pointer} diff --git a/skin/search/basic/style.css b/skin/search/basic/style.css index 10de1ac5c..8adf23a45 100644 --- a/skin/search/basic/style.css +++ b/skin/search/basic/style.css @@ -12,10 +12,10 @@ #sch_res_ov dd {float:left;margin:0 10px 0 5px} #sch_res_ov p {float:right;margin:0;padding:0;line-height:1em} -#sch_res_board {margin:0 0 10px;padding-left:1px;width:728px;list-style:none;zoom:1} +#sch_res_board {margin:0 0 10px;padding-left:1px;list-style:none;zoom:1} #sch_res_board:after {display:block;visibility:hidden;clear:both;content:""} #sch_res_board li {float:left;margin-bottom:-1px} -#sch_res_board a {display:block;position:relative;margin-left:-1px;padding:6px 0 5px;width:181px;border:1px solid #ddd;text-align:center;letter-spacing:-0.1em;line-height:1.2em;cursor:pointer} +#sch_res_board a {display:block;position:relative;margin-left:-1px;padding:6px 0 5px;width:180px;border:1px solid #ddd;text-align:center;letter-spacing:-0.1em;line-height:1.2em;cursor:pointer} #sch_res_board a:focus, #sch_res_board a:hover, #sch_res_board a:active {text-decoration:none} #sch_res_board .cnt_cmt {font-weight:normal !important} diff --git a/tail.php b/tail.php index f4b57a4c9..48c1e7103 100644 --- a/tail.php +++ b/tail.php @@ -38,27 +38,8 @@ if (G5_IS_MOBILE) { $val) { - if($key == 'device') - continue; - - $href .= $sep.$key.'='.strip_tags($val); - $sep = '&'; - $seq++; - } - } - if($seq) - $href .= '&device=mobile'; - else - $href .= '?device=mobile'; -?> -모바일 버전으로 보기 +if(G5_DEVICE_BUTTON_DISPLAY && !G5_IS_MOBILE) { ?> +모바일 버전으로 보기