From 1aca39c3409f228fa2b5c8a5bfbda23cbf58084c Mon Sep 17 00:00:00 2001 From: whitedot Date: Tue, 19 Mar 2013 11:21:55 +0900 Subject: [PATCH 01/24] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20=ED=9A=8C?= =?UTF-8?q?=EC=9B=90=EA=B0=80=EC=9E=85=20=EC=84=9C=EC=8B=9D=EC=97=90?= =?UTF-8?q?=EC=84=9C=20=EC=A3=BC=EC=86=8C=20=EC=9E=85=EB=A0=A5=20=EA=B4=80?= =?UTF-8?q?=EB=A0=A8=20=ED=95=84=EC=88=98=20=EC=9E=85=EB=A0=A5=20=EC=B2=98?= =?UTF-8?q?=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- skin/member/basic/register_form.skin.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/skin/member/basic/register_form.skin.php b/skin/member/basic/register_form.skin.php index 2460c74dc..1e5b99628 100644 --- a/skin/member/basic/register_form.skin.php +++ b/skin/member/basic/register_form.skin.php @@ -103,12 +103,12 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 필수 - title="우편번호 앞자리" class="frm_input " size="2" maxlength="3"> + title="우편번호 앞자리" class="frm_input " size="2" maxlength="3"> - - title="우편번호 뒷자리" class="frm_input " size="2" maxlength="3"> + title="우편번호 뒷자리" class="frm_input " size="2" maxlength="3"> 주소찾기 - title="행정구역주소" class="frm_input frm_address " size="50"> - title="상세주소" class="frm_input frm_address " size="50"> + title="행정구역주소" class="frm_input frm_address " size="50"> + title="상세주소" class="frm_input frm_address " size="50"> From 7d7304148fcf8ca471560d7d1af528dfce8d301c Mon Sep 17 00:00:00 2001 From: whitedot Date: Tue, 19 Mar 2013 11:28:39 +0900 Subject: [PATCH 02/24] =?UTF-8?q?=EB=9D=84=EC=96=B4=EC=93=B0=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mobile/skin/board/basic/list.skin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mobile/skin/board/basic/list.skin.php b/mobile/skin/board/basic/list.skin.php index 7c6ae9e45..8d7cc4236 100644 --- a/mobile/skin/board/basic/list.skin.php +++ b/mobile/skin/board/basic/list.skin.php @@ -140,7 +140,7 @@ if ($is_nogood) $colspan++; - + From f5a7455da63ad0c4ffbf8217259eea0e69cc6040 Mon Sep 17 00:00:00 2001 From: whitedot Date: Tue, 19 Mar 2013 11:29:57 +0900 Subject: [PATCH 03/24] =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC:=20=EC=95=84?= =?UTF-8?q?=EC=9B=83=EB=A1=9C=EA=B7=B8=EC=9D=B8=EC=8A=A4=ED=82=A8=20title?= =?UTF-8?q?=20placeholder=20=EA=B2=B9=EC=B9=98=EB=8A=94=20=EB=AC=B8?= =?UTF-8?q?=EC=A0=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mobile/skin/outlogin/basic/outlogin.skin.1.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mobile/skin/outlogin/basic/outlogin.skin.1.php b/mobile/skin/outlogin/basic/outlogin.skin.1.php index 529e7cc6d..abfbe3f68 100644 --- a/mobile/skin/outlogin/basic/outlogin.skin.1.php +++ b/mobile/skin/outlogin/basic/outlogin.skin.1.php @@ -10,8 +10,8 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
- - + +
From e2a9d80f2f4c8e943f3b3ef3ff369ffba01d268c Mon Sep 17 00:00:00 2001 From: gnuboard Date: Tue, 19 Mar 2013 15:25:32 +0900 Subject: [PATCH 04/24] =?UTF-8?q?bignum=20width=20=EC=B6=95=EC=86=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/member_list.php | 2 ++ css/admin.css | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/adm/member_list.php b/adm/member_list.php index 6dac453aa..2935953e2 100644 --- a/adm/member_list.php +++ b/adm/member_list.php @@ -123,6 +123,7 @@ $colspan = 15; 권한 포인트 최종접속 + 가입일 수신 공개 인증 @@ -189,6 +190,7 @@ $colspan = 15; + Yes':'No';?> Yes':'No';?> Yes':'No';?> diff --git a/css/admin.css b/css/admin.css index e4fa02603..fe64bb5fb 100644 --- a/css/admin.css +++ b/css/admin.css @@ -264,7 +264,7 @@ td {padding:8px 5px 6px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9 /* 공통 */ .td_chk {width:30px;text-align:center} .td_num {width:60px;text-align:center} -.td_bignum {width:120px;text-align:center} +.td_bignum {width:100px;text-align:center} .td_grid {width:60px;text-align:center} .td_mbid, .td_name, From 27404bb4b9494b5501088af86c602a624357672a Mon Sep 17 00:00:00 2001 From: gnuboard Date: Tue, 19 Mar 2013 16:36:23 +0900 Subject: [PATCH 05/24] =?UTF-8?q?=EC=B5=9C=EC=8B=A0=EA=B8=80=20=EC=8A=A4?= =?UTF-8?q?=ED=82=A8=EC=9D=80=20=EC=8A=A4=ED=82=A8=EB=B3=84=EB=A1=9C=20.cs?= =?UTF-8?q?s=20=ED=95=9C=EB=B2=88=EB=A7=8C=20=EB=A1=9C=EB=94=A9=ED=95=98?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/latest.lib.php | 7 +++++++ skin/latest/basic/latest.skin.php | 2 -- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/latest.lib.php b/lib/latest.lib.php index f81eb7c79..2d0312558 100644 --- a/lib/latest.lib.php +++ b/lib/latest.lib.php @@ -5,6 +5,7 @@ if (!defined('_GNUBOARD_')) exit; function latest($skin_dir='', $bo_table, $rows=10, $subject_len=40) { global $g4; + static $css = array(); if (!$skin_dir) $skin_dir = 'basic'; @@ -38,6 +39,12 @@ function latest($skin_dir='', $bo_table, $rows=10, $subject_len=40) include_once($cache_file); + // 같은 스킨은 .css 를 한번만 호출한다. + if (!in_array($skin_dir, $css)) { + echo ''; + $css[] = $skin_dir; + } + ob_start(); include $latest_skin_path.'/latest.skin.php'; $content = ob_get_contents(); diff --git a/skin/latest/basic/latest.skin.php b/skin/latest/basic/latest.skin.php index c89558fa8..712bc3f91 100644 --- a/skin/latest/basic/latest.skin.php +++ b/skin/latest/basic/latest.skin.php @@ -2,8 +2,6 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 ?> - -
    From 78f63127c4f0f7827baa969cec1de7c04ace219f Mon Sep 17 00:00:00 2001 From: whitedot Date: Tue, 19 Mar 2013 17:35:02 +0900 Subject: [PATCH 06/24] =?UTF-8?q?alert.php=20=EC=8A=A4=ED=83=80=EC=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/admin.css | 5 +++++ css/default.css | 2 +- head.sub.php | 6 +++++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/css/admin.css b/css/admin.css index e4fa02603..344d2df9d 100644 --- a/css/admin.css +++ b/css/admin.css @@ -298,6 +298,11 @@ td {padding:8px 5px 6px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9 .new_win_ul a {display:block;padding:10px 10px 8px;border-right:1px solid #595959;border-left:1px solid #595959;color:#fff;font-family:"dotum";font-weight:bold;text-decoration:none} .new_win_desc {margin:0 auto;width:93%} +/* 자바스크립트 alert 대안 */ +#validation_check {margin:100px auto;width:500px} +#validation_check h1 {margin-bottom:20px;font-size:1.3em} +#validation_check p {margin-bottom:20px;padding:30px 20px;border:1px solid #e9e9e9;background:#fff} + /* 관리자 패스워드 확인 */ #admin_confirm {padding:0 0 10px;background:#222;text-align:center} #admin_confirm p {margin:0 0 10px;color:#9ab9c5;background:#383a3f} diff --git a/css/default.css b/css/default.css index 93c6490c4..57f581529 100644 --- a/css/default.css +++ b/css/default.css @@ -227,7 +227,7 @@ input.required:focus {padding:3px 3px 4px;border:0;background:#21272e !important /* 자바스크립트 alert 대안 */ #validation_check {margin:100px auto;width:500px} #validation_check h1 {margin-bottom:20px;font-size:1.3em} -#validation_check p {margin-bottom:20px;padding:30px 20px} +#validation_check p {margin-bottom:20px;padding:30px 20px;border:1px solid #e9e9e9;background:#fff} /* 사이드뷰 */ .sv_wrap {display:inline-block;position:relative;font-weight:normal} diff --git a/head.sub.php b/head.sub.php index ec12ca7ec..2b1edc8d3 100644 --- a/head.sub.php +++ b/head.sub.php @@ -32,7 +32,11 @@ header("Pragma: no-cache"); // HTTP/1.0 - + + + + + <?=$g4_head_title?> From ef297dfcea51aaa88b7f86efc96cb67b9abc492b Mon Sep 17 00:00:00 2001 From: gnuboard Date: Wed, 20 Mar 2013 10:14:02 +0900 Subject: [PATCH 07/24] =?UTF-8?q?=EA=B2=BD=EB=A1=9C=EB=AC=B8=EC=A0=9C?= =?UTF-8?q?=EB=A1=9C=20=EC=9D=B8=ED=95=B4=20g4=5Fpath()=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common.php | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/common.php b/common.php index dff8c4e0a..706d7339b 100644 --- a/common.php +++ b/common.php @@ -69,18 +69,44 @@ $g4 = array(); function g4_path() { - $path = dirname(__FILE__); // 예) /home/sir/www/g4s + $result['path'] = dirname(__FILE__); + $root = str_replace($_SERVER['DOCUMENT_ROOT'], '', $result['path']); + $port = $_SERVER['SERVER_PORT'] != 80 ? ':'.$_SERVER['SERVER_PORT'] : ''; + $http = 'http' . ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS']=='on') ? 's' : '') . '://'; + $user = str_replace(str_replace($_SERVER['DOCUMENT_ROOT'], '', $_SERVER['SCRIPT_FILENAME']), '', $_SERVER['SCRIPT_NAME']); + $result['url'] = $http.$_SERVER['SERVER_NAME'].$port.$user.$root; + + + //$base_dir = parse_url($_SERVER['REQUEST_URI']); + //print_r($base_dir); + /* $linux_dir = str_replace("\\", "/", $path); // 예) /home/sir/www/g4s $document_root = str_replace("\\", "/", $_SERVER['DOCUMENT_ROOT']); // 예) /home/sir/www - $base_dir = preg_replace('#^'.$document_root.'#i', '', $linux_dir); // 예) /g4s + + if (strpos($linux_dir, $document_root) === false) { + for($base_dir = dirname($_SERVER['SCRIPT_NAME']); strpos($linux_dir, $base_dir) === false; $base_dir = dirname($base_dir)); + + if (strlen($base_dir) && strlen($linux_dir) != (strrpos($linux_dir, $base_dir)+strlen($base_dir))) { + $base_dir = substr($linux_dir, strrpos($linux_dir, $base_dir)); + } + } + else { + $base_dir = preg_replace('#^'.$document_root.'#i', '', $linux_dir); // 예) /g4s + } + + if (strlen($base_dir) && substr($base_dir, 0, 1) != '/') $base_dir = '/'.$base_dir; + $port = $_SERVER['SERVER_PORT'] != 80 ? ':'.$_SERVER['SERVER_PORT'] : ''; $http = 'http' . ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS']=='on') ? 's' : '') . '://'; $result = array(); - $result['path'] = $path; + // 윈도우의 경우 역슬레쉬 경로인데 그다지 권장하지 않는다. php에서는 슬레쉬도 경로 인자로 인식하므로 슬레쉬 사용. + $result['path'] = $linux_dir; + $result['url'] = $http.$_SERVER['SERVER_NAME'].$port.$base_dir; $result['curr_url'] = $http.$_SERVER['SERVER_NAME'].$port.$_SERVER['PHP_SELF']; $result['curr_uri'] = $result['curr_url'] . ($_SERVER['QUERY_STRING'] ? '?'.$_SERVER['QUERY_STRING'] : ''); + */ return $result; } @@ -127,7 +153,7 @@ div a {display:block;margin:50px auto 10px;width:170px;text-align:center}

프로그램 설치 후 실행하시기 바랍니다.

- 그누보드4S 설치하기 + 그누보드4S 설치하기
From ce43fe11e50c2e2ec26a95d7a41ee5b749130f06 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Wed, 20 Mar 2013 10:14:25 +0900 Subject: [PATCH 08/24] =?UTF-8?q?=EC=84=A4=EC=B9=98=20=EC=BD=94=EB=93=9C?= =?UTF-8?q?=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- install/index.php | 10 ++++++++-- install/install.inc.php | 5 ++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/install/index.php b/install/index.php index bf0a46041..461917d30 100644 --- a/install/index.php +++ b/install/index.php @@ -4,6 +4,9 @@ include_once ('../config.php'); include_once ('./install.inc.php'); ?> +

라이센스(License) 내용을 반드시 확인하십시오.
라이센스에 동의하시는 경우에만 설치가 진행됩니다. @@ -11,8 +14,6 @@ include_once ('./install.inc.php'); -

-
@@ -35,6 +36,11 @@ function frm_submit(f) return true; } + + +
\ No newline at end of file diff --git a/install/install.inc.php b/install/install.inc.php index 22bb69a07..1591ef359 100644 --- a/install/install.inc.php +++ b/install/install.inc.php @@ -53,6 +53,7 @@ if (file_exists($dbconfig_file)) { ?> mkdir

위 명령 실행후 브라우저를 새로고침 하십시오.

chmod 707 또는 chmod uo+rwx

위 명령 실행후 브라우저를 새로고침 하십시오.

\ No newline at end of file From 892d674a15725c589c78fc24d2eab9e70661e375 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Wed, 20 Mar 2013 10:37:34 +0900 Subject: [PATCH 09/24] =?UTF-8?q?HTTP=5FREFERER=20=EA=B0=80=20=EB=84=98?= =?UTF-8?q?=EC=96=B4=EA=B0=80=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- skin/board/basic/view.skin.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/skin/board/basic/view.skin.php b/skin/board/basic/view.skin.php index 46770bf31..29bc5d439 100644 --- a/skin/board/basic/view.skin.php +++ b/skin/board/basic/view.skin.php @@ -40,7 +40,7 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php'); if (isset($view['file'][$i]['source']) && $view['file'][$i]['source'] && !$view['file'][$i]['view']) { ?>
  • - + 첨부파일 () @@ -184,9 +184,8 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php'); "; - header("Location:$url"); + @header("Location:$url"); exit; } From 779b11002b4ba046ffdfea8efe3489617191c07f Mon Sep 17 00:00:00 2001 From: chicpro Date: Wed, 20 Mar 2013 11:20:51 +0900 Subject: [PATCH 13/24] =?UTF-8?q?DOCUMENT=5FROOT=20=EA=B0=80=20=ED=98=84?= =?UTF-8?q?=EC=9E=AC=20=EC=82=AC=EC=9A=A9=EC=9E=90=EC=9D=98=20=EA=B2=BD?= =?UTF-8?q?=EB=A1=9C=EB=A1=9C=20=EB=82=98=EC=98=A4=EC=A7=80=20=EC=95=8A?= =?UTF-8?q?=EB=8A=94=20=EA=B2=BD=EC=9A=B0=EC=97=90=20=EB=8C=80=ED=95=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/common.php b/common.php index 4e97e3c10..3af8e10c0 100644 --- a/common.php +++ b/common.php @@ -66,11 +66,13 @@ $g4 = array(); function g4_path() { - $result['path'] = dirname(__FILE__); - $root = str_replace($_SERVER['DOCUMENT_ROOT'], '', $result['path']); + $result['path'] = str_replace('\\', '/', dirname(__FILE__)); + $tilde_remove = preg_replace('/^\/\~[^\/]+(.*)$/', '$1', $_SERVER['SCRIPT_NAME']); + $document_root = str_replace($tilde_remove, '', $_SERVER['SCRIPT_FILENAME']); + $root = str_replace($document_root, '', $result['path']); $port = $_SERVER['SERVER_PORT'] != 80 ? ':'.$_SERVER['SERVER_PORT'] : ''; $http = 'http' . ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS']=='on') ? 's' : '') . '://'; - $user = str_replace(str_replace($_SERVER['DOCUMENT_ROOT'], '', $_SERVER['SCRIPT_FILENAME']), '', $_SERVER['SCRIPT_NAME']); + $user = str_replace(str_replace($document_root, '', $_SERVER['SCRIPT_FILENAME']), '', $_SERVER['SCRIPT_NAME']); $result['url'] = $http.$_SERVER['SERVER_NAME'].$port.$user.$root; return $result; } From 98d7db2a43cabf26dc2722953a9fe3663d4510dd Mon Sep 17 00:00:00 2001 From: chicpro Date: Wed, 20 Mar 2013 11:35:04 +0900 Subject: [PATCH 14/24] =?UTF-8?q?get=5Fskin=5Fstylesheet=20=ED=95=A8?= =?UTF-8?q?=EC=88=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/common.lib.php | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/lib/common.lib.php b/lib/common.lib.php index 57148a1e7..2ed73f8f3 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -1737,7 +1737,7 @@ function delete_cache_latest($bo_table) { $files = glob(G4_DATA_PATH.'/cache/latest-'.$bo_table.'-*'); if (is_array($files)) { - foreach ($files as $filename) + foreach ($files as $filename) unlink($filename); } } @@ -1751,7 +1751,7 @@ function delete_board_thumbnail($bo_table, $file) $fn = preg_replace("/\.[^\.]+$/i", "", basename($file)); $files = glob(G4_DATA_PATH.'/file/'.$bo_table.'/thumb-'.$fn.'*'); if (is_array($files)) { - foreach ($files as $filename) + foreach ($files as $filename) unlink($filename); } } @@ -1802,16 +1802,9 @@ function get_skin_stylesheet($skin_path) if(!$skin_path) return ""; - $doc_root = realpath($_SERVER['DOCUMENT_ROOT']); - $skin_path = realpath($skin_path); - $str = ""; - $p = parse_url(G4_URL); - $skin_url = $p['scheme'].'://'.$p['host']; - if(isset($p['port'])) - $skin_url .= ':'.$p['port']; - $skin_url .= str_replace("\\", "/", str_replace($doc_root, "", $skin_path)); + $skin_url = G4_URL.str_replace("\\", "/", str_replace(G4_PATH, "", $skin_path)); if(is_dir($skin_path)) { if($dh = opendir($skin_path)) { From 68c70fd24c015ecb5a6b5027d5a3d24e3ce8c2f5 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Wed, 20 Mar 2013 14:24:41 +0900 Subject: [PATCH 15/24] =?UTF-8?q?charset=20=EC=9D=84=20utf-8=20=EA=B3=A0?= =?UTF-8?q?=EC=A0=95=ED=95=98=EA=B1=B0=EB=82=98=20=EC=A3=BC=EC=84=9D?= =?UTF-8?q?=EB=AC=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/visit_list.php | 11 ++----- bbs/rss.php | 8 ++--- .../include/include.adm.board_delete.inc.php | 2 +- .../include/include.adm.board_form_update.php | 2 +- bbs/syndi/include/include.bbs.delete.php | 2 +- bbs/syndi/include/include.bbs.delete_all.php | 2 +- bbs/syndi/include/include.bbs.move_update.php | 2 +- .../include/include.bbs.write_update.php | 2 +- lib/common.lib.php | 30 +------------------ lib/mailer.lib.php | 3 -- 10 files changed, 13 insertions(+), 51 deletions(-) diff --git a/adm/visit_list.php b/adm/visit_list.php index 496e98b95..e2b95d6e5 100644 --- a/adm/visit_list.php +++ b/adm/visit_list.php @@ -63,15 +63,8 @@ $result = sql_query($sql); $referer = get_text(cut_str($row['vi_referer'], 255, '')); $referer = urldecode($referer); - if (strtolower($g4['charset']) == 'utf-8') { - if (!is_utf8($referer)) { - $referer = iconv('euc-kr', 'utf-8', $referer); - } - } - else { - if (is_utf8($referer)) { - $referer = iconv('utf-8', 'euc-kr', $referer); - } + if (!is_utf8($referer)) { + $referer = iconv_utf8($referer); } $title = str_replace(array('<', '>', '&'), array("<", ">", "&"), $referer); diff --git a/bbs/rss.php b/bbs/rss.php index d2478356c..6d12d4347 100644 --- a/bbs/rss.php +++ b/bbs/rss.php @@ -30,15 +30,15 @@ if (!$row['bo_use_rss_view']) { exit; } -Header("Content-type: text/xml"); -header("Cache-Control: no-cache, must-revalidate"); -header("Pragma: no-cache"); +header('Content-type: text/xml'); +header('Cache-Control: no-cache, must-revalidate'); +header('Pragma: no-cache'); $sql = " select gr_subject from {$g4['group_table']} where gr_id = '{$row['gr_id']}' "; $row = sql_fetch($sql); $subj1 = specialchars_replace($row['gr_subject'], 255); -echo ''."\n"; +echo ''."\n"; ?> diff --git a/bbs/syndi/include/include.adm.board_delete.inc.php b/bbs/syndi/include/include.adm.board_delete.inc.php index a419f712d..75e1c05ee 100644 --- a/bbs/syndi/include/include.adm.board_delete.inc.php +++ b/bbs/syndi/include/include.adm.board_delete.inc.php @@ -4,7 +4,7 @@ * @author sol (ngleader@gmail.com) * @brief 게시판 삭제시 Syndication Ping * gnuboard4/adm/board_delete.inc.php 파일에 추가 - * include '../syndi/include/gnuboard4_euckr/include.adm.board_delete.inc.php'; + * include '../syndi/include/include.adm.board_delete.inc.php'; */ if(!defined('_GNUBOARD_')) return; diff --git a/bbs/syndi/include/include.adm.board_form_update.php b/bbs/syndi/include/include.adm.board_form_update.php index f643168be..146188666 100644 --- a/bbs/syndi/include/include.adm.board_form_update.php +++ b/bbs/syndi/include/include.adm.board_form_update.php @@ -4,7 +4,7 @@ * @author sol (ngleader@gmail.com) * @brief 게시판 삭제시 Syndication Ping * gnuboard4/adm/board_form_update.php 파일에 추가 - * include '../syndi/include/gnuboard4_euckr/include.adm.board_form_update.php'; + * include '../syndi/include/include.adm.board_form_update.php'; */ if(!defined('_GNUBOARD_')) return; diff --git a/bbs/syndi/include/include.bbs.delete.php b/bbs/syndi/include/include.bbs.delete.php index 0ddfcc1c8..19aa2c417 100644 --- a/bbs/syndi/include/include.bbs.delete.php +++ b/bbs/syndi/include/include.bbs.delete.php @@ -4,7 +4,7 @@ * @author sol (ngleader@gmail.com) * @brief 글 삭제시 Syndication Ping * gnuboard4/bbs/bbs.delete.php 파일에 추가 - * include '../syndi/include/gnuboard4_euckr/include.bbs.delete.php'; + * include '../syndi/include/include.bbs.delete.php'; */ if(!defined('_GNUBOARD_')) return; diff --git a/bbs/syndi/include/include.bbs.delete_all.php b/bbs/syndi/include/include.bbs.delete_all.php index cb9bc40e2..248e9a7d4 100644 --- a/bbs/syndi/include/include.bbs.delete_all.php +++ b/bbs/syndi/include/include.bbs.delete_all.php @@ -4,7 +4,7 @@ * @author sol (ngleader@gmail.com) * @brief 글 삭제시 Syndication Ping * gnuboard4/bbs/bbs.delete_all.php 파일에 추가 - * include '../syndi/include/gnuboard4_euckr/include.bbs.delete_all.php'; + * include '../syndi/include/include.bbs.delete_all.php'; */ if(!defined('_GNUBOARD_')) return; diff --git a/bbs/syndi/include/include.bbs.move_update.php b/bbs/syndi/include/include.bbs.move_update.php index d29a19b34..dff7522b2 100644 --- a/bbs/syndi/include/include.bbs.move_update.php +++ b/bbs/syndi/include/include.bbs.move_update.php @@ -4,7 +4,7 @@ * @author sol (ngleader@gmail.com) * @brief 글 등록/수정시 Syndication Ping * gnuboard4/bbs/move_update.php 파일에 추가 - * include '../syndi/include/gnuboard4_euckr/include.bbs.move_update.php'; + * include '../syndi/include/include.bbs.move_update.php'; */ if(!defined('_GNUBOARD_')) return; diff --git a/bbs/syndi/include/include.bbs.write_update.php b/bbs/syndi/include/include.bbs.write_update.php index 81655e807..69875f3d8 100644 --- a/bbs/syndi/include/include.bbs.write_update.php +++ b/bbs/syndi/include/include.bbs.write_update.php @@ -4,7 +4,7 @@ * @author sol (ngleader@gmail.com) * @brief 글 등록/수정시 Syndication Ping * gnuboard4/bbs/write_update.php 파일에 추가 - * include '../syndi/include/gnuboard4_euckr/include.bbs.write_update.php'; + * include '../syndi/include/include.bbs.write_update.php'; */ if(!defined('_GNUBOARD_')) return; diff --git a/lib/common.lib.php b/lib/common.lib.php index 2ed73f8f3..2998b57dd 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -137,19 +137,6 @@ function alert($msg='', $url='', $error=true, $post=false) if (!$msg) $msg = '올바른 방법으로 이용해 주십시오.'; - /* - //header("Content-Type: text/html; charset=$g4['charset']"); - echo ""; - echo ""; - if ($url) - // 4.06.00 : 불여우의 경우 아래의 코드를 제대로 인식하지 못함 - //echo ""; - goto_url($url); - exit; - */ $header = ''; if (isset($g4['title'])) { $header = $g4['title']; @@ -164,11 +151,6 @@ function alert_close($msg, $error=true) { global $g4; - /* - echo ""; - echo ""; - exit; - */ $header = ''; if (isset($g4['title'])) { $header = $g4['title']; @@ -1309,10 +1291,7 @@ function get_table_define($table, $crlf="\n") $schema_create .= implode($columns, ', ') . ')'; } // end while - if (strtolower($g4['charset']) == 'utf-8') - $schema_create .= $crlf . ') DEFAULT CHARSET=utf8'; - else - $schema_create .= $crlf . ')'; + $schema_create .= $crlf . ') DEFAULT CHARSET=utf8'; return $schema_create; } // end of the 'PMA_getTableDef()' function @@ -1517,13 +1496,6 @@ function cut_hangul_last($hangul) } } - // 홀수라면 한글이 반쪽난 상태이므로 - if (strtoupper($g4['charset']) != 'UTF-8') { - if ($cnt%2) { - $hangul = substr($hangul, 0, $cnt-1); - } - } - return $hangul; } diff --git a/lib/mailer.lib.php b/lib/mailer.lib.php index f816a3d7d..3e6aa9985 100644 --- a/lib/mailer.lib.php +++ b/lib/mailer.lib.php @@ -11,11 +11,8 @@ function mailer($fname, $fmail, $to, $subject, $content, $type=0, $file='', $cc= // 메일발송 사용을 하지 않는다면 if (!$config['cf_email_use']) return; - //$fname = "=?$g4[charset]?B?" . base64_encode($fname) . "?="; - //$subject = "=?$g4[charset]?B?" . base64_encode($subject) . "?="; $fname = "=?utf-8?B?" . base64_encode($fname) . "?="; $subject = "=?utf-8?B?" . base64_encode($subject) . "?="; - //$g4[charset] = ($g4[charset] != "") ? "charset=$g4[charset]" : ""; $header = "Return-Path: <$fmail>\n"; $header .= "From: $fname <$fmail>\n"; From 473326d2d9a5033f238c0b0f105cfe0ded2521fe Mon Sep 17 00:00:00 2001 From: chicpro Date: Wed, 20 Mar 2013 14:33:14 +0900 Subject: [PATCH 16/24] =?UTF-8?q?get=5Feditor=5Fimage=20=ED=95=A8=EC=88=98?= =?UTF-8?q?=20=EC=A0=95=EA=B7=9C=EC=8B=9D=20=ED=8C=A8=ED=84=B4=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/common.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/common.lib.php b/lib/common.lib.php index 2ed73f8f3..9b7fdae8a 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -1763,7 +1763,7 @@ function get_editor_image($contents) return false; // $contents 중 img 태그 추출 - $pattern = "/]*src=[\'\"]?([^>\'\"]+".str_replace(".", "\.", $_SERVER['HTTP_HOST'])."[^>\'\"]+)[\'\"]?[^>]*>/"; + $pattern = "/]*src=[\'\"]?([^>\'\"]+[^>\'\"]+)[\'\"]?[^>]*>/"; preg_match_all($pattern, $contents, $matchs); return $matchs; From ae37d9aa3124f056951a00c1b1f44ce7ec876740 Mon Sep 17 00:00:00 2001 From: chicpro Date: Wed, 20 Mar 2013 14:33:55 +0900 Subject: [PATCH 17/24] =?UTF-8?q?=EC=8D=B8=EB=84=A4=EC=9D=BC=20=EC=83=9D?= =?UTF-8?q?=EC=84=B1=20=EC=BD=94=EB=93=9C=EC=97=90=EC=84=9C=20=EA=B2=BD?= =?UTF-8?q?=EB=A1=9C=20=EA=B4=80=EB=A0=A8=20=EC=BD=94=EB=93=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/thumbnail.lib.php | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/lib/thumbnail.lib.php b/lib/thumbnail.lib.php index d56497c6d..7fe5f7185 100644 --- a/lib/thumbnail.lib.php +++ b/lib/thumbnail.lib.php @@ -34,9 +34,11 @@ function get_list_thumbnail($bo_table, $wr_id, $thumb_width, $thumb_height, $is_ for($i=0; $i'.$thumb_tag.''; + $imgurl = str_replace(G4_URL, "", $matchs[1][$i]); + $thumb_tag = ''.$thumb_tag.''; } $contents = str_replace($img_tag, $thumb_tag, $contents); From 6180493eb644b0aaed68d6099bf8a1e2999a9640 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Wed, 20 Mar 2013 14:34:11 +0900 Subject: [PATCH 18/24] =?UTF-8?q?=EB=8D=94=EC=9D=B4=EC=83=81=20=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=ED=95=98=EC=A7=80=20=EC=95=8A=EB=8A=94=20filter.js=20?= =?UTF-8?q?=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/filter.js | 25 ------------------------- 1 file changed, 25 deletions(-) delete mode 100644 js/filter.js diff --git a/js/filter.js b/js/filter.js deleted file mode 100644 index 7b839b873..000000000 --- a/js/filter.js +++ /dev/null @@ -1,25 +0,0 @@ -if (typeof(FILTER_JS) == 'undefined') // 한번만 실행 -{ - if (typeof g4_cf_filter == 'undefined') - alert('g4_cf_filter 변수가 선언되지 않았습니다. js/filter.js'); - - var FILTER_JS = true; - - // 금지단어 필터링 - function word_filter_check(v) - { - var trim_pattern = /(^\s*)|(\s*$)/g; // \s 공백 문자 // 양쪽 공백 없애기 trim() - var filter = g4_cf_filter; - var s = filter.split(","); - - for (i=0; i Date: Wed, 20 Mar 2013 15:09:08 +0900 Subject: [PATCH 19/24] =?UTF-8?q?=EB=8B=A4=EC=9A=B4=EB=A1=9C=EB=93=9C=20?= =?UTF-8?q?=EA=B6=8C=ED=95=9C=EC=97=86=EC=9D=84=20=EB=95=8C=20referer=20?= =?UTF-8?q?=EA=B0=92=EC=9D=B4=20=EC=97=86=EB=8A=94=20=EC=98=A4=EB=A5=98=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/download.php | 6 +++--- mobile/skin/board/basic/view.skin.php | 22 +++++++++++++++++----- mobile/skin/board/gallery/view.skin.php | 22 +++++++++++++++++----- skin/board/basic/view.skin.php | 21 +++++++++++++++++---- skin/board/gallery/view.skin.php | 22 +++++++++++++++++----- 5 files changed, 71 insertions(+), 22 deletions(-) diff --git a/bbs/download.php b/bbs/download.php index 6b59c5726..2fc09500f 100644 --- a/bbs/download.php +++ b/bbs/download.php @@ -16,9 +16,9 @@ if (!$file['bf_file']) alert_close('파일 정보가 존재하지 않습니다.'); // JavaScript 불가일 때 -if($confirm != 'yes' && $board['bo_download_point'] < 0) { +if($js != 'on' && $board['bo_download_point'] < 0) { $msg = $file['bf_source'].' 파일을 다운로드 하시면 포인트가 차감('.number_format($board['bo_download_point']).'점)됩니다.\\n포인트는 게시물당 한번만 차감되며 다음에 다시 다운로드 하셔도 중복하여 차감하지 않습니다.\\n그래도 다운로드 하시겠습니까?'; - $url1 = './download.php?'.$_SERVER['QUERY_STRING'].'&confirm=yes'; + $url1 = G4_BBS_URL.'/download.php?'.$_SERVER['QUERY_STRING'].'&js=on'; $url2 = $_SERVER['HTTP_REFERER']; //$url1 = 확인link, $url2=취소link @@ -54,7 +54,7 @@ if (!get_session($ss_name)) { // 다운로드 포인트가 음수이고 회원의 포인트가 0 이거나 작다면 if ($member['mb_point'] + $board['bo_download_point'] < 0) - alert('보유하신 포인트('.number_format($member['mb_point']).')가 없거나 모자라서 다운로드('.number_format($board['bo_download_point']).')가 불가합니다.'."\n\n".'포인트를 적립하신 후 다시 다운로드 해 주십시오.'); + alert('보유하신 포인트('.number_format($member['mb_point']).')가 없거나 모자라서 다운로드('.number_format($board['bo_download_point']).')가 불가합니다.\\n\\n포인트를 적립하신 후 다시 다운로드 해 주십시오.'); // 게시물당 한번만 차감하도록 수정 insert_point($member['mb_id'], $board['bo_download_point'], "{$board['bo_subject']} $wr_id 파일 다운로드", $bo_table, $wr_id, "다운로드"); diff --git a/mobile/skin/board/basic/view.skin.php b/mobile/skin/board/basic/view.skin.php index 2b70d4351..b44f08c6c 100644 --- a/mobile/skin/board/basic/view.skin.php +++ b/mobile/skin/board/basic/view.skin.php @@ -40,7 +40,7 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php'); if (isset($view['file'][$i]['source']) && $view['file'][$i]['source'] && !$view['file'][$i]['view']) { ?>
  • - + 첨부파일 () @@ -183,10 +183,22 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');