diff --git a/adm/admin.lib.php b/adm/admin.lib.php index 061f7992d..53410238e 100644 --- a/adm/admin.lib.php +++ b/adm/admin.lib.php @@ -192,7 +192,7 @@ function order_select($fld, $sel='') if (!$member['mb_id']) { //alert('로그인 하십시오.', '$g5['bbs_path']/login.php?url=' . urlencode('$_SERVER['PHP_SELF']?w=$w&mb_id=$mb_id')); - alert('로그인 하십시오.', G5_BBS_URL.'/login.php?url=' . urlencode($_SERVER['PHP_SELF'].'?'.$_SERVER['QUERY_STRING'])); + alert('로그인 하십시오.', G5_BBS_URL.'/login.php?url=' . urlencode(G5_ADMIN_URL)); } else if ($is_admin != 'super') { diff --git a/adm/config_form.php b/adm/config_form.php index b55a3b680..02da0575d 100644 --- a/adm/config_form.php +++ b/adm/config_form.php @@ -833,7 +833,7 @@ if ($config['cf_icode_id'] && $config['cf_icode_pw']) { 서비스에 가입되어 있지 않다면, 본인확인 서비스 신청페이지에서 서비스 신청 후 상점아이디를 발급 받으실 수 있습니다.
LG유플러스 휴대폰본인확인은 ActiveX 설치가 필요하므로 Internet Explorer 에서만 사용할 수 있습니다.') ?> si_ - LG유플러스 본인확인 서비스 신청페이지 + LG유플러스 본인확인 서비스 신청페이지 diff --git a/install/install_db.php b/install/install_db.php index 1d0407eb6..52d64d8d9 100644 --- a/install/install_db.php +++ b/install/install_db.php @@ -120,6 +120,8 @@ $sql = " insert into `{$table_prefix}config` cf_mobile_search_skin = 'basic', cf_mobile_connect_skin = 'basic', cf_mobile_member_skin = 'basic', + cf_faq_skin = 'basic', + cf_mobile_faq_skin = 'basic', cf_editor = 'smarteditor2', cf_captcha_mp3 = 'basic', cf_register_level = '2', diff --git a/lib/common.lib.php b/lib/common.lib.php index ab77afef8..a53b23898 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -2756,6 +2756,30 @@ function member_delete($mb_id) // 회원자료는 정보만 없앤 후 아이디는 보관하여 다른 사람이 사용하지 못하도록 함 : 061025 $sql = " update {$g5['member_table']} set mb_password = '', mb_level = 1, mb_email = '', mb_homepage = '', mb_tel = '', mb_hp = '', mb_zip1 = '', mb_zip2 = '', mb_addr1 = '', mb_addr2 = '', mb_birth = '', mb_sex = '', mb_signature = '', mb_memo = '".date('Ymd', G5_SERVER_TIME)." 삭제함\n{$mb['mb_memo']}', mb_leave_date = '".date('Ymd', G5_SERVER_TIME)."' where mb_id = '{$mb_id}' "; sql_query($sql); + + // 포인트 테이블에서 삭제 + sql_query(" delete from {$g5['point_table']} where mb_id = '$mb_id' "); + + // 그룹접근가능 삭제 + sql_query(" delete from {$g5['group_member_table']} where mb_id = '$mb_id' "); + + // 쪽지 삭제 + sql_query(" delete from {$g5['memo_table']} where me_recv_mb_id = '$mb_id' or me_send_mb_id = '$mb_id' "); + + // 스크랩 삭제 + sql_query(" delete from {$g5['scrap_table']} where mb_id = '$mb_id' "); + + // 관리권한 삭제 + sql_query(" delete from {$g5['auth_table']} where mb_id = '$mb_id' "); + + // 그룹관리자인 경우 그룹관리자를 공백으로 + sql_query(" update {$g5['group_table']} set gr_admin = '' where gr_admin = '$mb_id' "); + + // 게시판관리자인 경우 게시판관리자를 공백으로 + sql_query(" update {$g5['board_table']} set bo_admin = '' where bo_admin = '$mb_id' "); + + // 아이콘 삭제 + @unlink(G5_DATA_PATH.'/member/'.substr($mb_id,0,2).'/'.$mb_id.'.gif'); } // 이메일 주소 추출 diff --git a/lib/thumbnail.lib.php b/lib/thumbnail.lib.php index 50d7b0d2f..b9a5c4abf 100644 --- a/lib/thumbnail.lib.php +++ b/lib/thumbnail.lib.php @@ -235,6 +235,7 @@ function thumbnail($filename, $source_path, $target_path, $thumb_width, $thumb_h if ($size[2] == 1) { $src = imagecreatefromgif($source_file); + $src_transparency = imagecolortransparent($src); } else if ($size[2] == 2) { $src = imagecreatefromjpeg($source_file); @@ -332,9 +333,15 @@ function thumbnail($filename, $source_path, $target_path, $thumb_width, $thumb_h if($size[2] == 3) { imagealphablending($dst, false); imagesavealpha($dst, true); + } else if($size[2] == 1 && $src_transparency != -1) { + $transparent_color = imagecolorsforindex($src, $src_transparency); + $current_transparent = imagecolorallocate($dst, $transparent_color['red'], $transparent_color['green'], $transparent_color['blue']); + imagefill($dst, 0, 0, $current_transparent); + imagecolortransparent($dst, $current_transparent); } } else { $dst = imagecreatetruecolor($dst_w, $dst_h); + $bgcolor = imagecolorallocate($dst, 255, 255, 255); // 배경색 if($src_w < $dst_w) { if($src_h >= $dst_h) { @@ -359,8 +366,16 @@ function thumbnail($filename, $source_path, $target_path, $thumb_width, $thumb_h imagefill($dst, 0, 0, $bgcolor); imagealphablending($dst, false); imagesavealpha($dst, true); + } else if($size[2] == 1) { + if($src_transparency != -1) { + $transparent_color = imagecolorsforindex($src, $src_transparency); + $current_transparent = imagecolorallocate($dst, $transparent_color['red'], $transparent_color['green'], $transparent_color['blue']); + imagefill($dst, 0, 0, $current_transparent); + imagecolortransparent($dst, $current_transparent); + } else { + imagefill($dst, 0, 0, $bgcolor); + } } else { - $bgcolor = imagecolorallocate($dst, 255, 255, 255); // 배경색 imagefill($dst, 0, 0, $bgcolor); } } diff --git a/mobile/skin/board/basic/view.skin.php b/mobile/skin/board/basic/view.skin.php index 3de738ab1..b1775bd1b 100644 --- a/mobile/skin/board/basic/view.skin.php +++ b/mobile/skin/board/basic/view.skin.php @@ -51,7 +51,7 @@ add_stylesheet('', 0 첨부 - () + () 회 다운로드 DATE : diff --git a/mobile/skin/board/gallery/view.skin.php b/mobile/skin/board/gallery/view.skin.php index c5635d5aa..6657cf5be 100644 --- a/mobile/skin/board/gallery/view.skin.php +++ b/mobile/skin/board/gallery/view.skin.php @@ -51,7 +51,7 @@ add_stylesheet('', 0 첨부 - () + () 회 다운로드 DATE : diff --git a/skin/board/basic/view.skin.php b/skin/board/basic/view.skin.php index 42f83a069..d49275ec5 100644 --- a/skin/board/basic/view.skin.php +++ b/skin/board/basic/view.skin.php @@ -53,7 +53,7 @@ add_stylesheet('', 0 첨부 - () + () 회 다운로드 DATE : diff --git a/skin/board/gallery/view.skin.php b/skin/board/gallery/view.skin.php index 42f83a069..d49275ec5 100644 --- a/skin/board/gallery/view.skin.php +++ b/skin/board/gallery/view.skin.php @@ -53,7 +53,7 @@ add_stylesheet('', 0 첨부 - () + () 회 다운로드 DATE :