firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

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

Browse Source
This commit is contained in:
chicpro
2013-03-11 16:33:44 +09:00
parent ed49e6e5c3 98ef9ae691
commit 1721ac2012
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
adm/admin.head.php
View File

@ -57,7 +57,7 @@ function imageview(id, w, h)
}
</script>
<div id="to_content"><a href="#wrapper">본문 바로가기</a></div>
<div id="to_content"><a href="#container">본문 바로가기</a></div>
<header id="hd">
<div id="hd_wrap">

2
bbs/poll_etc_update.php
View File

@ -37,7 +37,7 @@ if ($w == '')
// 관리자에게 보내는 메일
$admin = get_admin('super');
$from_email = $member['mb_email'] ? $member['mb_email'] : $admin['mb_email'];
mailer($name, $from_email, $admin['mb_email'], '설문조사 기타의견 메일', $content, 1);
mailer($name, $from_email, $admin['mb_email'], '['.$config['cf_title'].'] 설문조사 기타의견 메일', $content, 1);
}
}
else if ($w == 'd')

3
bbs/write_update.php
View File

@ -561,7 +561,8 @@ if (!($w == 'u' || $w == 'cu') && $config['cf_email_use'] && $board['bo_use_emai
$warr = array( ''=>'입력', 'u'=>'수정', 'r'=>'답변', 'c'=>'코멘트', 'cu'=>'코멘트 수정' );
$str = $warr[$w];
$subject = '['.$config['cf_title'].'] "'.$board['bo_subject'].'" 게시판에 '.$str.'글이 올라왔습니다.';
$subject = '['.$config['cf_title'].'] '.$board['bo_subject'].' 게시판에 '.$str.'글이 올라왔습니다.';
$link_url = G4_BBS_URL.'/board.php?bo_table='.$bo_table.'&amp;wr_id='.$wr_id.'&amp;'.$qstr;
include_once(G4_LIB_PATH.'/mailer.lib.php');

2
skin/member/basic/password_lost2.skin.php
View File

@ -39,7 +39,7 @@ sql_query($sql);
$href = G4_BBS_URL.'/password_lost_certify.php?mb_no='.$mb['mb_no'].'&amp;mb_datetime='.$mb_datetime.'&amp;mb_lost_certify='.$mb_lost_certify;
$subject = '['.$config['cf_title'].'] 요청하신 회원 아이디/패스워드 정보입니다.';
$subject = "[".$config['cf_title']."] 요청하신 회원 아이디/패스워드 정보입니다.";
$content = "";