diff --git a/.gitignore b/.gitignore index e27caf303..03866fc5b 100644 --- a/.gitignore +++ b/.gitignore @@ -12,7 +12,8 @@ cheditor5.*/ ckeditor*/ log/ g5_tree/ +.vscode/ naver*.html initests01/ SIRsoft000/ -config.php \ No newline at end of file +config.php diff --git a/adm/mail_select_update.php b/adm/mail_select_update.php index 4a7ba5be8..cb4f62681 100644 --- a/adm/mail_select_update.php +++ b/adm/mail_select_update.php @@ -61,7 +61,7 @@ for ($i=0; $i

▶ 더 이상 정보 수신을 원치 않으시면 [수신거부] 해 주십시오.

"; + $content = $content . "

▶ 더 이상 정보 수신을 원치 않으시면 [수신거부] 해 주십시오.

"; mailer($config['cf_admin_email_name'], $config['cf_admin_email'], $to_email, $subject, $content, 1); diff --git a/adm/sms_admin/config.php b/adm/sms_admin/config.php index dc2d28467..e6e256b18 100644 --- a/adm/sms_admin/config.php +++ b/adm/sms_admin/config.php @@ -17,6 +17,9 @@ if( ! isset($config['cf_icode_token_key']) ){ $config['cf_icode_token_key'] = ''; } +// 배열코드 초기화 +$userinfo = array('payment'=>'', 'coin'=>''); + if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) { $userinfo = get_icode_userinfo($config['cf_icode_id'], $config['cf_icode_pw']); diff --git a/adm/sms_admin/num_group_update.php b/adm/sms_admin/num_group_update.php index abd3407b0..b168271f6 100644 --- a/adm/sms_admin/num_group_update.php +++ b/adm/sms_admin/num_group_update.php @@ -65,7 +65,7 @@ else if ($w == 'em') // 비우기 } else // 등록 { - $bg_name = isset($_POST['bg_name']) ? strip_tags(clean_xss_attributes($_POST['bg_name'])) : ''; + $bg_name = isset($_REQUEST['bg_name']) ? strip_tags(clean_xss_attributes($_REQUEST['bg_name'])) : ''; if (!strlen(trim($bg_name))) alert('그룹명을 입력해주세요'); diff --git a/bbs/list.php b/bbs/list.php index bbe61e3e6..9a18a393b 100644 --- a/bbs/list.php +++ b/bbs/list.php @@ -222,14 +222,14 @@ if ($is_search_bbs) { if (isset($min_spt) && $prev_spt >= $min_spt) { $qstr1 = preg_replace($patterns, '', $qstr); $prev_part_href = get_pretty_url($bo_table,0,$qstr1.'&spt='.$prev_spt.'&page=1'); - $write_pages = page_insertbefore($write_pages, '이전검색'); + $write_pages = page_insertbefore($write_pages, '이전검색'); } $next_spt = $spt + $config['cf_search_part']; if ($next_spt < 0) { $qstr1 = preg_replace($patterns, '', $qstr); $next_part_href = get_pretty_url($bo_table,0,$qstr1.'&spt='.$next_spt.'&page=1'); - $write_pages = page_insertafter($write_pages, '다음검색'); + $write_pages = page_insertafter($write_pages, '다음검색'); } } diff --git a/bbs/move.php b/bbs/move.php index 9fbc97d51..70d13cfdb 100644 --- a/bbs/move.php +++ b/bbs/move.php @@ -41,6 +41,9 @@ else if ($is_admin == 'board') $sql .= " and a.bo_admin = '{$member['mb_id']}' "; $sql .= " order by a.gr_id, a.bo_order, a.bo_table "; $result = sql_query($sql); + +$list = array(); + for ($i=0; $row=sql_fetch_array($result); $i++) { $list[$i] = $row; diff --git a/bbs/view_image.php b/bbs/view_image.php index 6be5aedd0..c083a37e9 100644 --- a/bbs/view_image.php +++ b/bbs/view_image.php @@ -104,6 +104,12 @@ $.fn.imgLoad = function(callback) { } } + if(win_w < screen.width) { + if(window.outerWidth){ + win_w = win_w + (window.outerWidth - (document.documentElement.clientWidth || window.innerWidth)); + } + } + window.moveTo(win_l, win_t); window.resizeTo(win_w, win_h); }); diff --git a/config.php b/config.php index bba850bff..b1b125d38 100644 --- a/config.php +++ b/config.php @@ -5,8 +5,8 @@ ********************/ define('G5_VERSION', '그누보드5'); -define('G5_GNUBOARD_VER', '5.4.5.4'); -define('G5_YOUNGCART_VER', '5.4.5.4'); +define('G5_GNUBOARD_VER', '5.4.5.5'); +define('G5_YOUNGCART_VER', '5.4.5.5'); // 이 상수가 정의되지 않으면 각각의 개별 페이지는 별도로 실행될 수 없음 define('_GNUBOARD_', true); diff --git a/g4_import.php b/g4_import.php index 0bb6c23bd..437238e0b 100644 --- a/g4_import.php +++ b/g4_import.php @@ -4,7 +4,7 @@ include_once(G5_LIB_PATH.'/connect.lib.php'); include_once(G5_LIB_PATH.'/outlogin.lib.php'); $g5['title'] = '그누보드4 DB 데이터 이전'; -include_once(G5_PATH.'/'.G5_THEME_DIR.'/basic/head.sub.php'); +if((isset($config['cf_theme']) && $config['cf_theme'])) include_once(G5_PATH.'/'.G5_THEME_DIR.'/basic/head.sub.php'); if(get_session('tables_copied') == 'done') alert('DB 데이터 변환을 이미 실행하였습니다. 중복 실행시 오류가 발생할 수 있습니다.', G5_URL);