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

g5 merge 충돌수정

Browse Source
This commit is contained in:
chicpro
2014-03-20 14:56:39 +09:00
parent 93f3f971a4 bcc013bdcf
commit 91ae476e4e
70 changed files with 8342 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/common.lib.php
View File

@ -1205,7 +1205,7 @@ function get_sideview($mb_id, $name='', $email='', $homepage='')
{
global $config;
global $g5;
global $bo_table, $sca, $is_admin;
global $bo_table, $sca, $is_admin, $member;
$email = base64_encode($email);
$homepage = set_http($homepage);
@ -1273,6 +1273,10 @@ function get_sideview($mb_id, $name='', $email='', $homepage='')
}
if($mb_id)
$str2 .= "<a href=\"".G5_BBS_URL."/new.php?mb_id=".$mb_id."\">전체게시물</a>\n";
if($g5['sms5_use_sideview']){
$mb = get_member($mb_id, " mb_open, mb_sms , mb_hp ");
if( $mb['mb_open'] && $mb['mb_sms'] && $mb['mb_hp'] ) $str2 .= "<a href=\"".G5_SMS5_URL."/?mb_id=".$mb_id."\" class=\"win_sms5\" target=\"_blank\">문자보내기</a>\n";
}
if($is_admin == "super" && $mb_id) {
$str2 .= "<a href=\"".G5_ADMIN_URL."/member_form.php?w=u&amp;mb_id=".$mb_id."\" target=\"_blank\">회원정보변경</a>\n";
$str2 .= "<a href=\"".G5_ADMIN_URL."/point_list.php?sfl=mb_id&amp;stx=".$mb_id."\" target=\"_blank\">포인트내역</a>\n";