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

Merge branch 'g5'

Browse Source
This commit is contained in:
chicpro
2015-10-02 16:25:18 +09:00
parent d033692728 dc8fbb05ef
commit 7c65fd7ac7
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bbs/formmail.php
View File

@ -31,7 +31,7 @@ include_once(G5_PATH.'/head.sub.php');
if (!$name) if (!$name)
$name = base64_decode($email); $name = base64_decode($email);
else else
$name = get_text(stripslashes($name)); $name = get_text(stripslashes($name), true);
if (!isset($type)) if (!isset($type))
$type = 0; $type = 0;

16
lib/common.lib.php
View File

@ -383,8 +383,9 @@ function get_list($write_row, $board, $skin_url, $subject_len=40)
$list['wr_homepage'] = get_text($list['wr_homepage']); $list['wr_homepage'] = get_text($list['wr_homepage']);
$tmp_name = get_text(cut_str($list['wr_name'], $config['cf_cut_name'])); // 설정된 자리수 만큼만 이름 출력 $tmp_name = get_text(cut_str($list['wr_name'], $config['cf_cut_name'])); // 설정된 자리수 만큼만 이름 출력
$tmp_name2 = cut_str($list['wr_name'], $config['cf_cut_name']); // 설정된 자리수 만큼만 이름 출력
if ($board['bo_use_sideview']) if ($board['bo_use_sideview'])
$list['name'] = get_sideview($list['mb_id'], $tmp_name, $list['wr_email'], $list['wr_homepage']); $list['name'] = get_sideview($list['mb_id'], $tmp_name2, $list['wr_email'], $list['wr_homepage']);
else else
$list['name'] = '<span class="'.($list['mb_id']?'sv_member':'sv_guest').'">'.$tmp_name.'</span>'; $list['name'] = '<span class="'.($list['mb_id']?'sv_member':'sv_guest').'">'.$tmp_name.'</span>';
@ -1201,6 +1202,10 @@ function get_sideview($mb_id, $name='', $email='', $homepage='')
$email = base64_encode($email); $email = base64_encode($email);
$homepage = set_http(clean_xss_tags($homepage)); $homepage = set_http(clean_xss_tags($homepage));
$name = get_text($name, true);
$email = get_text($email);
$homepage = get_text($homepage);
$tmp_name = ""; $tmp_name = "";
if ($mb_id) { if ($mb_id) {
//$tmp_name = "<a href=\"".G5_BBS_URL."/profile.php?mb_id=".$mb_id."\" class=\"sv_member\" title=\"$name 자기소개\" target=\"_blank\" onclick=\"return false;\">$name</a>"; //$tmp_name = "<a href=\"".G5_BBS_URL."/profile.php?mb_id=".$mb_id."\" class=\"sv_member\" title=\"$name 자기소개\" target=\"_blank\" onclick=\"return false;\">$name</a>";
@ -1235,10 +1240,6 @@ function get_sideview($mb_id, $name='', $email='', $homepage='')
$title_mb_id = '[비회원]'; $title_mb_id = '[비회원]';
} }
$name = get_text($name);
$email = get_text($email);
$homepage = get_text($homepage);
$str = "<span class=\"sv_wrap\">\n"; $str = "<span class=\"sv_wrap\">\n";
$str .= $tmp_name."\n"; $str .= $tmp_name."\n";
@ -1360,7 +1361,7 @@ function cut_str($str, $len, $suffix="…")
// TEXT 형식으로 변환 // TEXT 형식으로 변환
function get_text($str, $html=0) function get_text($str, $html=0, $restore=false)
{ {
$source[] = "<"; $source[] = "<";
$target[] = "&lt;"; $target[] = "&lt;";
@ -1371,7 +1372,8 @@ function get_text($str, $html=0)
$source[] = "\'"; $source[] = "\'";
$target[] = "&#039;"; $target[] = "&#039;";
$str = str_replace($target, $source, $str); if($restore)
$str = str_replace($target, $source, $str);
// 3.31 // 3.31
// TEXT 출력일 경우 &amp; &nbsp; 등의 코드를 정상으로 출력해 주기 위함 // TEXT 출력일 경우 &amp; &nbsp; 등의 코드를 정상으로 출력해 주기 위함