diff --git a/adm/admin.lib.php b/adm/admin.lib.php
index 0ea37f4d7..df560e7d8 100644
--- a/adm/admin.lib.php
+++ b/adm/admin.lib.php
@@ -70,7 +70,7 @@ function member_delete($mb_id)
}
// 회원자료는 정보만 없앤 후 아이디는 보관하여 다른 사람이 사용하지 못하도록 함 : 061025
- $sql = " update {$g4['member_table']} set mb_jumin = '', mb_password = '', mb_level = 1, mb_email = '', mb_homepage = '', mb_password_q = '', mb_password_a = '', mb_tel = '', mb_hp = '', mb_zip1 = '', mb_zip2 = '', mb_addr1 = '', mb_addr2 = '', mb_birth = '', mb_sex = '', mb_signature = '', mb_memo = '".date('Ymd', G4_SERVER_TIME)." 삭제함".PHP_EOL."{$mb['mb_memo']}', mb_leave_date = '".date('Ymd', G4_SERVER_TIME)."' where mb_id = '{$mb_id}' ";
+ $sql = " update {$g4['member_table']} set mb_jumin = '', mb_password = '', mb_level = 1, mb_email = '', mb_homepage = '', mb_password_q = '', mb_password_a = '', mb_tel = '', mb_hp = '', mb_zip1 = '', mb_zip2 = '', mb_addr1 = '', mb_addr2 = '', mb_birth = '', mb_sex = '', mb_signature = '', mb_memo = '".date('Ymd', G4_SERVER_TIME)." 삭제함\n{$mb['mb_memo']}', mb_leave_date = '".date('Ymd', G4_SERVER_TIME)."' where mb_id = '{$mb_id}' ";
sql_query($sql);
}
@@ -176,7 +176,7 @@ function help($help="")
{
global $g4;
- $str = ''.$help.' ';
+ $str = ''.str_replace("\n", " ", $help).' ';
return $str;
}
diff --git a/adm/auth_list.php b/adm/auth_list.php
index ec8bde957..cb8a41da7 100644
--- a/adm/auth_list.php
+++ b/adm/auth_list.php
@@ -138,7 +138,7 @@ $colspan = 5;
//if (isset($stx))
- // echo ''.PHP_EOL;
+ // echo ''."\n";
if (strstr($sfl, 'mb_id'))
$mb_id = $stx;
diff --git a/adm/board_form.php b/adm/board_form.php
index 9b70a64b6..47f72395c 100644
--- a/adm/board_form.php
+++ b/adm/board_form.php
@@ -185,7 +185,7 @@ $pg_anchor = "
카운트 조정
- =help('현재 원글수 : '.number_format($board['bo_count_write']).', 현재 댓글수 : '.number_format($board['bo_count_comment']).PHP_EOL.'게시판 목록에서 글의 번호가 맞지 않을 경우에 체크하십시오.')?>
+ =help('현재 원글수 : '.number_format($board['bo_count_write']).', 현재 댓글수 : '.number_format($board['bo_count_comment'])."\n".'게시판 목록에서 글의 번호가 맞지 않을 경우에 체크하십시오.')?>
@@ -457,7 +457,8 @@ $pg_anchor = "
그룹적용
-
+
+
전체적용
@@ -809,8 +810,8 @@ $pg_anchor = "
그룹적용
-
- 전체적용
+
+ 전체적용
@@ -833,10 +834,10 @@ $pg_anchor = "
@@ -846,10 +847,10 @@ $pg_anchor = "
@@ -859,10 +860,10 @@ $pg_anchor = "
diff --git a/adm/config_form.php b/adm/config_form.php
index 1c019aca9..f63dd2864 100644
--- a/adm/config_form.php
+++ b/adm/config_form.php
@@ -191,7 +191,7 @@ $pg_anchor = "
$arr = get_skin_dir('new');
for ($i=0; $i".$arr[$i]."".PHP_EOL;
+ echo "".$arr[$i]." \n";
}
?>
@@ -202,7 +202,7 @@ $pg_anchor = "
$arr = get_skin_dir('new', G4_MOBILE_PATH.'/'.G4_SKIN_DIR);
for ($i=0; $i".$arr[$i]."".PHP_EOL;
+ echo "".$arr[$i]." \n";
}
?>
@@ -215,7 +215,7 @@ $pg_anchor = "
$arr = get_skin_dir('search');
for ($i=0; $i".$arr[$i]."".PHP_EOL;
+ echo "".$arr[$i]." \n";
}
?>
@@ -226,7 +226,7 @@ $pg_anchor = "
$arr = get_skin_dir('search', G4_MOBILE_PATH.'/'.G4_SKIN_DIR);
for ($i=0; $i".$arr[$i]."".PHP_EOL;
+ echo "".$arr[$i]." \n";
}
?>
@@ -239,7 +239,7 @@ $pg_anchor = "
$arr = get_skin_dir('connect');
for ($i=0; $i".$arr[$i]."".PHP_EOL;
+ echo "".$arr[$i]." \n";
}
?>
@@ -250,7 +250,7 @@ $pg_anchor = "
$arr = get_skin_dir('connect', G4_MOBILE_PATH.'/'.G4_SKIN_DIR);
for ($i=0; $i".$arr[$i]."".PHP_EOL;
+ echo "".$arr[$i]." \n";
}
?>
@@ -374,7 +374,7 @@ $pg_anchor = "
$arr = get_skin_dir('member');
for ($i=0; $i'.$arr[$i].''.PHP_EOL;
+ echo ''.$arr[$i].' '."\n";
}
?>
@@ -385,7 +385,7 @@ $pg_anchor = "
$arr = get_skin_dir('member', G4_MOBILE_PATH.'/'.G4_SKIN_DIR);
for ($i=0; $i'.$arr[$i].''.PHP_EOL;
+ echo ''.$arr[$i].' '."\n";
}
?>
diff --git a/adm/member_form_update.php b/adm/member_form_update.php
index 761bab04f..1f33070ff 100644
--- a/adm/member_form_update.php
+++ b/adm/member_form_update.php
@@ -15,12 +15,35 @@ if ($member['mb_password'] != sql_password($_POST['admin_password'])) {
$mb_id = mysql_real_escape_string(trim($_POST['mb_id']));
+// 핸드폰번호 체크
+$mb_hp = $_POST['mb_hp'];
+if($mb_hp) {
+ $mb_hp = preg_replace("/[^0-9]/", "", $mb_hp);
+ $hp_len = strlen($mb_hp);
+ if($hp_len == 10) {
+ $mb_hp = preg_replace("/([0-9]{3})([0-9]{3})([0-9]{4})/", "\\1-\\2-\\3", $mb_hp);
+ } else if($hp_len == 11) {
+ $mb_hp = preg_replace("/([0-9]{3})([0-9]{4})([0-9]{4})/", "\\1-\\2-\\3", $mb_hp);
+ } else {
+ alert('핸드폰번호를 올바르게 입력해 주십시오.');
+ }
+
+ // 중복체크
+ $sql = " select count(*) as cnt from {$g4['member_table']} where mb_hp = '$mb_hp' ";
+ if($w == 'u')
+ $sql .= " and mb_id <> '$mb_id' ";
+
+ $row = sql_fetch($sql);
+ if($row['cnt'])
+ alert('다른 회원이 사용 중인 핸드폰번호입니다.');
+}
+
$sql_common = " mb_name = '{$_POST['mb_name']}',
mb_nick = '{$_POST['mb_nick']}',
mb_email = '{$_POST['mb_email']}',
mb_homepage = '{$_POST['mb_homepage']}',
mb_tel = '{$_POST['mb_tel']}',
- mb_hp = '{$_POST['mb_hp']}',
+ mb_hp = '$mb_hp',
mb_zip1 = '{$_POST['mb_zip1']}',
mb_zip2 = '{$_POST['mb_zip2']}',
mb_addr1 = '{$_POST['mb_addr1']}',
@@ -51,13 +74,13 @@ if ($w == '')
{
$mb = get_member($mb_id);
if ($mb['mb_id'])
- alert('이미 존재하는 회원입니다.'.PHP_EOL.'ID : '.$mb['mb_id'].PHP_EOL.'이름 : '.$mb['mb_name'].PHP_EOL.'별명 : '.$mb['mb_nick'].PHP_EOL.'메일 : '.$mb['mb_email']);
+ alert('이미 존재하는 회원입니다.\\nID : '.$mb['mb_id'].'\\n이름 : '.$mb['mb_name'].'\\n별명 : '.$mb['mb_nick'].'\\n메일 : '.$mb['mb_email']);
if ($mb['mb_nick'] == $mb_nick)
- alert('이미 존재하는 별명입니다.'.PHP_EOL.'ID : '.$mb['mb_id'].PHP_EOL.'이름 : '.$mb['mb_name'].PHP_EOL.'별명 : '.$mb['mb_nick'].PHP_EOL.'메일 : '.$mb['mb_email']);
+ alert('이미 존재하는 별명입니다.\\nID : '.$mb['mb_id'].'\\n이름 : '.$mb['mb_name'].'\\n별명 : '.$mb['mb_nick'].'\\n메일 : '.$mb['mb_email']);
if ($mb['mb_email'] == $mb_email)
- alert('이미 존재하는 E-mail 입니다.'.PHP_EOL.'ID : '.$mb['mb_id'].PHP_EOL.'이름 : '.$mb['mb_name'].PHP_EOL.'별명 : '.$mb['mb_nick'].PHP_EOL.'메일 : '.$mb['mb_email']);
+ alert('이미 존재하는 E-mail 입니다.\\nID : '.$mb['mb_id'].'\\n이름 : '.$mb['mb_name'].'\\n별명 : '.$mb['mb_nick'].'\\n메일 : '.$mb['mb_email']);
sql_query(" insert into {$g4['member_table']} set mb_id = '{$mb_id}', mb_password = '".sql_password($mb_password)."', mb_datetime = '".G4_TIME_YMDHIS."', mb_ip = '{$_SERVER['REMOTE_ADDR']}', mb_email_certify = '".G4_TIME_YMDHIS."', {$sql_common} ");
}
@@ -97,7 +120,7 @@ else if ($w == 'u')
if (file_exists($dest_path)) {
$size = getimagesize($dest_path);
// 아이콘의 폭 또는 높이가 설정값 보다 크다면 이미 업로드 된 아이콘 삭제
- if ($size[0] > $config[cf_member_icon_width] || $size[1] > $config[cf_member_icon_height]) {
+ if ($size[0] > $config['cf_member_icon_width'] || $size[1] > $config['cf_member_icon_height']) {
@unlink($dest_path);
}
}
diff --git a/adm/point_clear.php b/adm/point_clear.php
index 84523d6ed..3006816d2 100644
--- a/adm/point_clear.php
+++ b/adm/point_clear.php
@@ -16,7 +16,7 @@ echo ' ';
include_once('./admin.tail.php');
flush();
-echo ''.PHP_EOL;
+echo ''."\n";
flush();
$max_count = 50;
@@ -52,7 +52,7 @@ for ($i=0; $row=sql_fetch_array($result); $i++)
insert_point($row['mb_id'], $total, '포인트 {$count}건 정리', '@clear', $row['mb_id'], G4_TIME_YMD."-".uniqid(""));
$str = $row['mb_id']."님 포인트 내역 ".number_format($count)."건 ".number_format($total)."점 정리 ";
- echo ''.PHP_EOL;
+ echo ''."\n";
flush();
}
@@ -60,5 +60,5 @@ for ($i=0; $row=sql_fetch_array($result); $i++)
$sql = " UNLOCK TABLES ";
sql_query($sql);
-echo ''.PHP_EOL;
+echo ''."\n";
?>
diff --git a/bbs/ckeditor/ckeditor.lib.php b/bbs/ckeditor/ckeditor.lib.php
index 26017287d..b27798394 100644
--- a/bbs/ckeditor/ckeditor.lib.php
+++ b/bbs/ckeditor/ckeditor.lib.php
@@ -1,16 +1,16 @@
';
- $html .= PHP_EOL.'';
- $html .= PHP_EOL.'';
+ $html .= "\n".'';
+ $html .= "\n".'';
+ $html .= "\n".'';
$js = false;
}
@@ -21,7 +21,7 @@ function editor_html($id, $content, $ckeditor=true, $class="")
// textarea 로 값을 넘긴다. javascript 반드시 필요
-function get_editor_js($id, $ckeditor=true)
+function get_editor_js($id, $ckeditor=true)
{
if ( $ckeditor ) {
return "var {$id}_editor_data = CKEDITOR.instances.{$id}.getData();\n";
diff --git a/bbs/gcaptcha/gcaptcha.lib.php b/bbs/gcaptcha/gcaptcha.lib.php
index 4f9bf841b..b8c6772fc 100644
--- a/bbs/gcaptcha/gcaptcha.lib.php
+++ b/bbs/gcaptcha/gcaptcha.lib.php
@@ -1,7 +1,7 @@
get_captcha_key();
-
+
set_session('ss_captcha_cnt', 0);
set_session('ss_captcha_key', $captcha_key);
@@ -125,7 +125,7 @@ class gcaptcha
imagejpeg($im, G4_DATA_PATH.'/cache/'.$this->captcha_filename.'.jpg');
imagedestroy($im);
- $this->make_wav($this->captcha_filename.'.wav');
+ $this->make_wav($this->captcha_filename.'.wav');
}
function get_captcha_filename()
@@ -152,7 +152,7 @@ class gcaptcha
}
/*
-사용법 :
+사용법 :
$gcaptcha = new gcaptcha();
$gcaptcha->set_captcha_length(mt_rand(4, 6));
$gcaptcha->set_position(mt_rand(0, 10), mt_rand(15, 20));
@@ -176,8 +176,8 @@ function captcha_html($class='captcha')
$jpg_file_url = G4_DATA_URL.'/cache/'.$obj->captcha_filename.'.jpg';
$wav_file_url = G4_DATA_URL.'/cache/'.$obj->captcha_filename.'.wav';
- $html .= PHP_EOL.'';
- $html .= PHP_EOL.'';
+ $html .= "\n".'';
+ $html .= "\n".'';
$html .= '';
$html .= '자동등록방지 ';
$html .= ' ';
diff --git a/bbs/memo_form.php b/bbs/memo_form.php
index be6b4c4a6..eb60c03fa 100644
--- a/bbs/memo_form.php
+++ b/bbs/memo_form.php
@@ -5,16 +5,16 @@ include_once(G4_GCAPTCHA_PATH.'/gcaptcha.lib.php');
if ($is_guest)
alert_close('회원만 이용하실 수 있습니다.');
-if (!$member['mb_open'] && $is_admin != 'super' && $member['mb_id'] != $mb_id)
+if (!$member['mb_open'] && $is_admin != 'super' && $member['mb_id'] != $mb_id)
alert_close("자신의 정보를 공개하지 않으면 다른분에게 쪽지를 보낼 수 없습니다. 정보공개 설정은 회원정보수정에서 하실 수 있습니다.");
$content = "";
// 탈퇴한 회원에게 쪽지 보낼 수 없음
-if ($me_recv_mb_id)
+if ($me_recv_mb_id)
{
$mb = get_member($me_recv_mb_id);
if (!$mb['mb_id'])
- alert_close('회원정보가 존재하지 않습니다.'.PHP_EOL.PHP_EOL.'탈퇴하였을 수 있습니다.');
+ alert_close('회원정보가 존재하지 않습니다.\\n\\n탈퇴하였을 수 있습니다.');
if (!$mb['mb_open'] && $is_admin != 'super')
alert_close('정보공개를 하지 않았습니다.');
@@ -23,10 +23,10 @@ if ($me_recv_mb_id)
$row = sql_fetch(" select me_memo from {$g4['memo_table']} where me_id = '{$me_id}' and (me_recv_mb_id = '{$member['mb_id']}' or me_send_mb_id = '{$member['mb_id']}') ");
if ($row['me_memo'])
{
- $content = PHP_EOL.PHP_EOL.PHP_EOL.' >'
- .PHP_EOL.' >'
- .PHP_EOL.' >'.preg_replace("/\n/", "\n> ", get_text($row[me_memo], 0))
- .PHP_EOL.' >'
+ $content = "\n\n\n".' >'
+ ."\n".' >'
+ ."\n".' >'.preg_replace("/\n/", "\n> ", get_text($row['me_memo'], 0))
+ ."\n".' >'
.' >';
}
diff --git a/bbs/move_update.php b/bbs/move_update.php
index ac844ec94..e58020d48 100644
--- a/bbs/move_update.php
+++ b/bbs/move_update.php
@@ -43,7 +43,7 @@ while ($row = sql_fetch_array($result))
{
$nick = cut_str($member['mb_nick'], $config['cf_cut_name']);
if (!$row2['wr_is_comment'] && $config['cf_use_copy_log'])
- $row2['wr_content'] .= PHP_EOL.'[이 게시물은 '.$nick.'님에 의해 '.G4_TIME_YMDHIS.' '.$board['bo_subject'].'에서 '.($sw == 'copy' ? '복사' : '이동').' 됨]
';
+ $row2['wr_content'] .= "\n".'[이 게시물은 '.$nick.'님에 의해 '.G4_TIME_YMDHIS.' '.$board['bo_subject'].'에서 '.($sw == 'copy' ? '복사' : '이동').' 됨]
';
$sql = " insert into $move_write_table
set wr_num = '$next_wr_num',
diff --git a/bbs/password_lost.php b/bbs/password_lost.php
index aab1d68c7..8ac886766 100644
--- a/bbs/password_lost.php
+++ b/bbs/password_lost.php
@@ -6,7 +6,7 @@ if ($is_member) {
alert("이미 로그인중입니다.");
}
-$g4['title'] = '회원아이디/패스워드 찾기';
+$g4['title'] = '회원정보 찾기';
include_once(G4_PATH.'/head.sub.php');
$action_url = G4_HTTPS_BBS_URL."/password_lost2.php";
diff --git a/bbs/password_lost_certify.php b/bbs/password_lost_certify.php
index 6368044e0..847a5e7bf 100644
--- a/bbs/password_lost_certify.php
+++ b/bbs/password_lost_certify.php
@@ -19,7 +19,7 @@ sql_query(" update {$g4['member_table']} set mb_lost_certify = '' where mb_no =
// 변경될 패스워드가 넘어와야하고 저장된 변경패스워드를 md5 로 변환하여 같으면 정상
if ($mb_lost_certify && $mb_datetime === sql_password($mb['mb_datetime']) && $mb_lost_certify === $mb['mb_lost_certify']) {
sql_query(" update {$g4['member_table']} set mb_password = '{$mb['mb_lost_certify']}' where mb_no = '$mb_no' ");
- alert('이메일로 보내드린 패스워드로 변경 하였습니다.\\n\\n회원아이디와 변경된 패스워드로 로그인 하시기 바랍니다.', G4_BBS_URL.'/login.php');
+ alert('변경된 패스워드를 이메일로 보내드렸습니다.\\n\\n회원아이디와 변경된 패스워드로 로그인 하시기 바랍니다.', G4_BBS_URL.'/login.php');
}
else {
die("Error");
diff --git a/bbs/register_form_update_mail3.php b/bbs/register_form_update_mail3.php
index 1966a0e7d..b7cd690f5 100644
--- a/bbs/register_form_update_mail3.php
+++ b/bbs/register_form_update_mail3.php
@@ -35,71 +35,3 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가