Merge branch 'master' of github.com:gnuboard/g4s

This commit is contained in:
whitedot
2013-03-29 11:37:46 +09:00
3 changed files with 3 additions and 3 deletions

View File

@ -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");

View File

@ -62,7 +62,7 @@ $content .= "<p style=\"margin:0;padding:30px 30px 30px;border-bottom:1px solid
$content .= "<span style=\"display:inline-block;width:100px\">회원아이디</span> ".$mb['mb_id']."<br>";
$content .= "<span style=\"display:inline-block;width:100px\">변경될 패스워드</span> <strong style=\"color:#ff3061\">".$change_password."</strong>";
$content .= "</p>";
$content .= "<a href=\"".$href."/\" style=\"display:block;padding:30px 0;background:#484848;color:#fff;text-decoration:none;text-align:center\">패스워드 변경</a>";
$content .= "<a href=\"".$href."\" style=\"display:block;padding:30px 0;background:#484848;color:#fff;text-decoration:none;text-align:center\">패스워드 변경</a>";
$content .= "</div>";
$content .= "</div>";

View File

@ -62,7 +62,7 @@ $content .= "<p style=\"margin:0;padding:30px 30px 30px;border-bottom:1px solid
$content .= "<span style=\"display:inline-block;width:100px\">회원아이디</span> ".$mb['mb_id']."<br>";
$content .= "<span style=\"display:inline-block;width:100px\">변경될 패스워드</span> <strong style=\"color:#ff3061\">".$change_password."</strong>";
$content .= "</p>";
$content .= "<a href=\"".$href."/\" style=\"display:block;padding:30px 0;background:#484848;color:#fff;text-decoration:none;text-align:center\">패스워드 변경</a>";
$content .= "<a href=\"".$href."\" style=\"display:block;padding:30px 0;background:#484848;color:#fff;text-decoration:none;text-align:center\">패스워드 변경</a>";
$content .= "</div>";
$content .= "</div>";