diff --git a/adm/mail_form.php b/adm/mail_form.php index 8a0774339..147cff18c 100644 --- a/adm/mail_form.php +++ b/adm/mail_form.php @@ -38,7 +38,7 @@ include_once('./admin.head.php'); - + diff --git a/adm/mail_select_form.php b/adm/mail_select_form.php index 4a053d6e1..daff1ce9c 100644 --- a/adm/mail_select_form.php +++ b/adm/mail_select_form.php @@ -34,8 +34,6 @@ if (!isset($mb_id1)) $mb_id1 = 1; if (!isset($mb_level_from)) $mb_level_from = 1; if (!isset($mb_level_to)) $mb_level_to = 10; if (!isset($mb_mailling)) $mb_mailling = 1; -if (!isset($mb_sex)) $mb_sex = 1; -if (!isset($mb_area)) $mb_area = 1; $g4['title'] = '회원메일발송'; include_once('./admin.head.php'); @@ -59,58 +57,12 @@ include_once('./admin.head.php'); > 에서 까지 - - - - - - - - - 부터 - 까지 단어 포함 (예 : @sir.co.kr) - - - - - - - - - - - - - - diff --git a/adm/mail_select_list.php b/adm/mail_select_list.php index 2146bc870..3e958b96e 100644 --- a/adm/mail_select_list.php +++ b/adm/mail_select_list.php @@ -19,18 +19,6 @@ if ($mb_id1 != 1) if ($mb_email != "") $sql_where .= " and mb_email like '%{$mb_email}%' "; -// 성별 -if ($mb_sex != "") - $sql_where .= " and mb_sex = '{$mb_sex}' "; - -// 생일 -if ($mb_birth_from && $mb_birth_to) - $sql_where .= " and substring(mb_birth,5,4) between '{$mb_birth_from}' and '{$mb_birth_to}' "; - -// 지역 -if ($mb_area != "") - $sql_where .= " and mb_addr1 like '{$mb_area}%' "; - // 메일링 if ($mb_mailling != "") $sql_where .= " and mb_mailling = '{$mb_mailling}' "; @@ -39,14 +27,12 @@ if ($mb_mailling != "") $sql_where .= " and mb_level between '{$mb_level_from}' and '{$mb_level_to}' "; // 게시판그룹회원 -if ($gr_id) -{ +if ($gr_id) { $group_member = ""; $comma = ""; $sql2 = " select mb_id from {$g4['group_member_table']} where gr_id = '{$gr_id}' order by mb_id "; $result2 = sql_query($sql2); - for ($k=0; $row2=sql_fetch_array($result2); $k++) - { + for ($k=0; $row2=sql_fetch_array($result2); $k++) { $group_member .= "{$comma}'{$row2['mb_id']}'"; $comma = ","; } @@ -71,10 +57,6 @@ $ma_last_option .= "mb_id1={$mb_id1}"; $ma_last_option .= "||mb_id1_from={$mb_id1_from}"; $ma_last_option .= "||mb_id1_to={$mb_id1_to}"; $ma_last_option .= "||mb_email={$mb_email}"; -$ma_last_option .= "||mb_sex={$mb_sex}"; -$ma_last_option .= "||mb_birth_from={$mb_birth_from}"; -$ma_last_option .= "||mb_birth_to={$mb_birth_to}"; -$ma_last_option .= "||mb_area={$mb_area}"; $ma_last_option .= "||mb_mailling={$mb_mailling}"; $ma_last_option .= "||mb_level_from={$mb_level_from}"; $ma_last_option .= "||mb_level_to={$mb_level_to}"; @@ -103,7 +85,7 @@ include_once('./admin.head.php'); diff --git a/adm/mail_select_update.php b/adm/mail_select_update.php index 9b20f64d3..92d477445 100644 --- a/adm/mail_select_update.php +++ b/adm/mail_select_update.php @@ -47,7 +47,7 @@ $subject = $ma['ma_subject']; $cnt = 0; for ($i=0; $i

▶ 더 이상 정보 수신을 원치 않으시면 [수신거부] 해 주십시오.

"; diff --git a/adm/mail_test.php b/adm/mail_test.php index 76bca7b9e..d7f775484 100644 --- a/adm/mail_test.php +++ b/adm/mail_test.php @@ -17,7 +17,6 @@ $name = $member['mb_name']; $nick = $member['mb_nick']; $mb_id = $member['mb_id']; $email = $member['mb_email']; -$birth = $member['mb_birth']; $sql = "select ma_subject, ma_content from {$g4['mail_table']} where ma_id = '{$ma_id}' "; $ma = sql_fetch($sql); @@ -29,7 +28,6 @@ $content = preg_replace("/{이름}/", $name, $content); $content = preg_replace("/{별명}/", $nick, $content); $content = preg_replace("/{회원아이디}/", $mb_id, $content); $content = preg_replace("/{이메일}/", $email, $content); -$content = preg_replace("/{생일}/", (int)substr($birth,4,2).'월 '.(int)substr($birth,6,2).'일', $content); $mb_md5 = md5($member['mb_id'].$member['mb_email'].$member['mb_datetime']); diff --git a/bbs/rss.php b/bbs/rss.php index 315fe0044..f644da93e 100644 --- a/bbs/rss.php +++ b/bbs/rss.php @@ -13,63 +13,63 @@ function specialchars_replace($str, $len=0) { return $str; } -$sql = " select gr_id, bo_subject, bo_page_rows, bo_read_level, bo_use_rss_view from {$g4[board_table]} where bo_table = '{$bo_table}' "; +$sql = " select gr_id, bo_subject, bo_page_rows, bo_read_level, bo_use_rss_view from {$g4['board_table']} where bo_table = '$bo_table' "; $row = sql_fetch($sql); -$subj2 = specialchars_replace($row[bo_subject], 255); -$lines = $row[bo_page_rows]; +$subj2 = specialchars_replace($row['bo_subject'], 255); +$lines = $row['bo_page_rows']; // 비회원 읽기가 가능한 게시판만 RSS 지원 -if ($row[bo_read_level] >= 2) { +if ($row['bo_read_level'] >= 2) { echo '비회원 읽기가 가능한 게시판만 RSS 지원합니다.'; exit; } // RSS 사용 체크 -if (!$row[bo_use_rss_view]) { +if (!$row['bo_use_rss_view']) { echo 'RSS 보기가 금지되어 있습니다.'; exit; } -Header("Content-type: text/xml"); -header("Cache-Control: no-cache, must-revalidate"); -header("Pragma: no-cache"); +Header("Content-type: text/xml"); +header("Cache-Control: no-cache, must-revalidate"); +header("Pragma: no-cache"); -$sql = " select gr_subject from {$g4[group_table]} where gr_id = '{$row[gr_id]}' "; +$sql = " select gr_subject from {$g4['group_table']} where gr_id = '{$row['gr_id']}' "; $row = sql_fetch($sql); -$subj1 = specialchars_replace($row[gr_subject], 255); -?> +$subj1 = specialchars_replace($row['gr_subject'], 255); -"?> +echo ''."\n"; +?> -<?=specialchars_replace($config[cf_title].' > '.$subj1.' > '.$subj2)?> - +<?=specialchars_replace($config['cf_title'].' > '.$subj1.' > '.$subj2)?> + 테스트 버전 0.2 (2004-04-26) ko -<?=specialchars_replace($row[wr_subject])?> - -]]> - +<?=specialchars_replace($row['wr_subject'])?> + +]]> + '.PHP_EOL; -echo ''.PHP_EOL; +echo ''."\n"; +echo ''."\n"; ?> \ No newline at end of file diff --git a/js/wrest.js b/js/wrest.js index 33f7975f5..4a594abaf 100644 --- a/js/wrest.js +++ b/js/wrest.js @@ -6,7 +6,29 @@ var wrestFldBackColor = "#ff3061"; // subject 속성값을 얻어 return, 없으면 tag의 name을 넘김 function wrestItemname(fld) { - return fld.getAttribute("title") ? fld.getAttribute("title") : ( fld.getAttribute("alt") ? fld.getAttribute("alt") : fld.name ); + //return fld.getAttribute("title") ? fld.getAttribute("title") : ( fld.getAttribute("alt") ? fld.getAttribute("alt") : fld.name ); + var id = fld.getAttribute("id"); + var labels = document.getElementsByTagName("label"); + var el = null; + + for(i=0; i].*[<]\/+.*[>]/gi, ""); + + if(text == '') { + return fld.getAttribute("title") ? fld.getAttribute("title") : ( fld.getAttribute("alt") ? fld.getAttribute("alt") : fld.name ); + } else { + return text; + } + } else { + return fld.getAttribute("title") ? fld.getAttribute("title") : ( fld.getAttribute("alt") ? fld.getAttribute("alt") : fld.name ); + } } // 양쪽 공백 없애기 @@ -257,7 +279,7 @@ function wrestSubmit() // 셀렉트 박스일때도 필수 선택 검사합니다. select-one if (el.type=="text" || el.type=="hidden" || el.type=="file" || el.type=="password" || el.type=="select-one" || el.type=="textarea") { if (el.getAttribute("required") != null) { - wrestRequired(el); + wrestRequired(el); } var array_css = el.className.split(" "); // class 를 공백으로 나눔 @@ -331,7 +353,7 @@ function wrestInitialized() for (var j = 0; j < document.forms[i].elements.length; j++) { // 필수 입력일 경우는 * 배경이미지를 준다. - if (document.forms[i].elements[j].getAttribute("required") != null || + if (document.forms[i].elements[j].getAttribute("required") != null || regexp.test(document.forms[i].elements[j].className)) { //if (regexp.test(document.forms[i].elements[j].className)) { //document.forms[i].elements[j].style.backgroundColor = wrestFldDefaultColor;