From cd6cb1f36ca4d78916cbd76bff7c8d5e65b93528 Mon Sep 17 00:00:00 2001 From: chicpro Date: Tue, 11 Feb 2014 14:00:27 +0900 Subject: [PATCH 01/34] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20lnb=20?= =?UTF-8?q?=EB=A9=94=EB=89=B4=20=EC=B6=9C=EB=A0=A5=EC=97=90=20=EA=B6=8C?= =?UTF-8?q?=ED=95=9C=20=EC=B2=B4=ED=81=AC=20=EC=BD=94=EB=93=9C=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/admin.head.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/adm/admin.head.php b/adm/admin.head.php index 07d9fe27d..7aef36884 100644 --- a/adm/admin.head.php +++ b/adm/admin.head.php @@ -119,7 +119,9 @@ $menu_key = substr($sub_menu, 0, 3); $nl = ''; foreach($menu['menu'.$menu_key] as $key=>$value) { if($key > 0) { - if ($menu_key == substr($menu['menu'.$key][0][0], 0, 2)) echo 1; + if ($is_admin != 'super' && (!array_key_exists($value[0],$auth) || !strstr($auth[$value[0]], 'r'))) + continue; + echo $nl.'
  • '.$value[1].'
    • '; $nl = PHP_EOL; } From 0463ecc23fd401e34fdec673fd92710625a83e3b Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 13 Feb 2014 13:30:06 +0900 Subject: [PATCH 02/34] =?UTF-8?q?html=5Fend=20=ED=95=A8=EC=88=98=EB=A5=BC?= =?UTF-8?q?=20class=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/common.lib.php | 111 +++++++++++++++++++++++++++++---------------- 1 file changed, 72 insertions(+), 39 deletions(-) diff --git a/lib/common.lib.php b/lib/common.lib.php index bdd7069d8..1891e2495 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -2170,47 +2170,80 @@ if (!function_exists('file_put_contents')) { // HTML 마지막 처리 function html_end() { - global $config, $g5, $member; - - // 현재접속자 처리 - $tmp_sql = " select count(*) as cnt from {$g5['login_table']} where lo_ip = '{$_SERVER['REMOTE_ADDR']}' "; - $tmp_row = sql_fetch($tmp_sql); - - if ($tmp_row['cnt']) { - $tmp_sql = " update {$g5['login_table']} set mb_id = '{$member['mb_id']}', lo_datetime = '".G5_TIME_YMDHIS."', lo_location = '{$g5['lo_location']}', lo_url = '{$g5['lo_url']}' where lo_ip = '{$_SERVER['REMOTE_ADDR']}' "; - sql_query($tmp_sql, FALSE); - } else { - $tmp_sql = " insert into {$g5['login_table']} ( lo_ip, mb_id, lo_datetime, lo_location, lo_url ) values ( '{$_SERVER['REMOTE_ADDR']}', '{$member['mb_id']}', '".G5_TIME_YMDHIS."', '{$g5['lo_location']}', '{$g5['lo_url']}' ) "; - sql_query($tmp_sql, FALSE); - - // 시간이 지난 접속은 삭제한다 - sql_query(" delete from {$g5['login_table']} where lo_datetime < '".date("Y-m-d H:i:s", G5_SERVER_TIME - (60 * $config['cf_login_minutes']))."' "); - - // 부담(overhead)이 있다면 테이블 최적화 - //$row = sql_fetch(" SHOW TABLE STATUS FROM `$mysql_db` LIKE '$g5['login_table']' "); - //if ($row['Data_free'] > 0) sql_query(" OPTIMIZE TABLE $g5['login_table'] "); - } - - // 버퍼의 내용에서 body 태그 중간의 외부 css 파일을 CAPTURE 하여 head 태그로 이동시켜준다. - $buffer = ob_get_contents(); - ob_end_clean(); - preg_match('#(.*)#is', $buffer, $bodys); - preg_match_all('/[\n\r]?(]+>).*()?/i', $bodys[0], $links); - $stylesheet = ''; - $links[0] = array_unique($links[0]); - foreach ($links[0] as $key=>$link) { - //$link = PHP_EOL.$links[0][$i]; - $stylesheet .= $link; - $buffer = preg_replace('#'.$link.'#', '', $buffer); - } - /* - - - 밑으로 스킨의 스타일시트가 위치하도록 하게 한다. - */ - return preg_replace('#([^<]*]+>)#', "$1$stylesheet", $buffer); + $end = new html_process(); + return $end->run(); } +class html_process { + protected $links = array(); + + function css_callback1($m) { + $s = $m[0]; + if(preg_match('/]+>/i', $s)) { + preg_match_all("/(]+>)|(]+>)/is", $s, $m); + $this->links = array_merge($this->links, $m[0]); + } + return ''; + } + + function css_callback2($m) { + $this->links = array_merge($this->links, array($m[0])); + return ''; + } + + function run() + { + global $config, $g5, $member, $css; + + // 현재접속자 처리 + $tmp_sql = " select count(*) as cnt from {$g5['login_table']} where lo_ip = '{$_SERVER['REMOTE_ADDR']}' "; + $tmp_row = sql_fetch($tmp_sql); + + if ($tmp_row['cnt']) { + $tmp_sql = " update {$g5['login_table']} set mb_id = '{$member['mb_id']}', lo_datetime = '".G5_TIME_YMDHIS."', lo_location = '{$g5['lo_location']}', lo_url = '{$g5['lo_url']}' where lo_ip = '{$_SERVER['REMOTE_ADDR']}' "; + sql_query($tmp_sql, FALSE); + } else { + $tmp_sql = " insert into {$g5['login_table']} ( lo_ip, mb_id, lo_datetime, lo_location, lo_url ) values ( '{$_SERVER['REMOTE_ADDR']}', '{$member['mb_id']}', '".G5_TIME_YMDHIS."', '{$g5['lo_location']}', '{$g5['lo_url']}' ) "; + sql_query($tmp_sql, FALSE); + + // 시간이 지난 접속은 삭제한다 + sql_query(" delete from {$g5['login_table']} where lo_datetime < '".date("Y-m-d H:i:s", G5_SERVER_TIME - (60 * $config['cf_login_minutes']))."' "); + + // 부담(overhead)이 있다면 테이블 최적화 + //$row = sql_fetch(" SHOW TABLE STATUS FROM `$mysql_db` LIKE '$g5['login_table']' "); + //if ($row['Data_free'] > 0) sql_query(" OPTIMIZE TABLE $g5['login_table'] "); + } + + // 버퍼의 내용에서 body 태그 중간의 외부 css 파일을 CAPTURE 하여 head 태그로 이동시켜준다. + $buffer = ob_get_contents(); + ob_end_clean(); + preg_match('#(.*)#is', $buffer, $bodys); + + $bodys = preg_replace_callback("//is", 'html_process::css_callback1', $bodys); + $bodys = preg_replace_callback("//is", 'html_process::css_callback2', $bodys); + $bodys = preg_replace_callback("/]+>/is", 'html_process::css_callback2', $bodys); + + $links = array_unique($this->links); + + $stylesheet = ''; + + foreach($links as $link) { + if(!trim($link)) + continue; + + if(preg_match('/]+>/i', $link)) + $buffer = preg_replace('#'.$link.'#', '', $buffer); + + $stylesheet .= PHP_EOL.$link; + } + /* + + + 밑으로 스킨의 스타일시트가 위치하도록 하게 한다. + */ + return preg_replace('#([^<]*]+>)#', "$1$stylesheet", $buffer); + } +} // 휴대폰번호의 숫자만 취한 후 중간에 하이픈(-)을 넣는다. function hyphen_hp_number($hp) From 294d8ad651ec1a5d5bad68171a47b31ed4029d35 Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 13 Feb 2014 16:43:26 +0900 Subject: [PATCH 03/34] =?UTF-8?q?=EC=8A=A4=ED=82=A8=EC=9D=98=20css=20?= =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EC=A7=80=EC=A0=95=20=EB=B0=A9=EB=B2=95=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common.php | 2 + lib/common.lib.php | 68 +++++++++++-------- mobile/skin/board/basic/list.skin.php | 5 +- mobile/skin/board/basic/view.skin.php | 4 +- mobile/skin/board/basic/write.skin.php | 5 +- mobile/skin/connect/basic/connect.skin.php | 5 +- .../connect/basic/current_connect.skin.php | 5 +- mobile/skin/latest/basic/latest.skin.php | 5 +- mobile/skin/member/basic/formmail.skin.php | 5 +- mobile/skin/member/basic/login.skin.php | 5 +- .../skin/member/basic/member_confirm.skin.php | 5 +- mobile/skin/member/basic/memo.skin.php | 5 +- mobile/skin/member/basic/memo_form.skin.php | 5 +- mobile/skin/member/basic/memo_view.skin.php | 5 +- mobile/skin/member/basic/password.skin.php | 5 +- .../skin/member/basic/password_lost.skin.php | 7 +- mobile/skin/member/basic/profile.skin.php | 5 +- mobile/skin/member/basic/register.skin.php | 9 +-- .../skin/member/basic/register_form.skin.php | 5 +- .../member/basic/register_result.skin.php | 5 +- mobile/skin/member/basic/scrap.skin.php | 5 +- mobile/skin/member/basic/scrap_popin.skin.php | 5 +- mobile/skin/member/basic/zip.skin.php | 4 +- mobile/skin/new/basic/new.skin.php | 9 +-- .../skin/outlogin/basic/outlogin.skin.1.php | 5 +- .../skin/outlogin/basic/outlogin.skin.2.php | 5 +- mobile/skin/poll/basic/poll.skin.php | 9 +-- mobile/skin/poll/basic/poll_result.skin.php | 5 +- mobile/skin/popular/basic/popular.skin.php | 7 +- mobile/skin/qa/basic/list.skin.php | 5 +- mobile/skin/qa/basic/view.skin.php | 4 +- mobile/skin/qa/basic/write.skin.php | 5 +- mobile/skin/search/basic/search.skin.php | 11 +-- mobile/skin/visit/basic/visit.skin.php | 5 +- skin/board/basic/list.skin.php | 5 +- skin/board/basic/view.skin.php | 4 +- skin/board/basic/write.skin.php | 5 +- skin/board/gallery/list.skin.php | 5 +- skin/board/gallery/view.skin.php | 4 +- skin/board/gallery/write.skin.php | 5 +- skin/connect/basic/connect.skin.php | 5 +- skin/connect/basic/current_connect.skin.php | 5 +- skin/latest/basic/latest.skin.php | 5 +- skin/member/basic/formmail.skin.php | 5 +- skin/member/basic/login.skin.php | 5 +- skin/member/basic/member_confirm.skin.php | 5 +- skin/member/basic/memo.skin.php | 5 +- skin/member/basic/memo_form.skin.php | 5 +- skin/member/basic/memo_view.skin.php | 5 +- skin/member/basic/password.skin.php | 5 +- skin/member/basic/password_lost.skin.php | 7 +- skin/member/basic/profile.skin.php | 5 +- skin/member/basic/register.skin.php | 9 +-- skin/member/basic/register_form.skin.php | 5 +- skin/member/basic/register_result.skin.php | 5 +- skin/member/basic/scrap.skin.php | 5 +- skin/member/basic/scrap_popin.skin.php | 7 +- skin/member/basic/zip.skin.php | 4 +- skin/new/basic/new.skin.php | 9 +-- skin/outlogin/basic/outlogin.skin.1.php | 5 +- skin/outlogin/basic/outlogin.skin.2.php | 3 + skin/poll/basic/poll.skin.php | 9 +-- skin/poll/basic/poll_result.skin.php | 5 +- skin/popular/basic/popular.skin.php | 7 +- skin/qa/basic/list.skin.php | 5 +- skin/qa/basic/view.skin.php | 4 +- skin/qa/basic/write.skin.php | 5 +- skin/search/basic/search.skin.php | 11 +-- skin/visit/basic/visit.skin.php | 5 +- 69 files changed, 266 insertions(+), 176 deletions(-) diff --git a/common.php b/common.php index 82847dfc6..a1c2fa1a1 100644 --- a/common.php +++ b/common.php @@ -489,4 +489,6 @@ header('Last-Modified: ' . $gmnow); header('Cache-Control: no-store, no-cache, must-revalidate'); // HTTP/1.1 header('Cache-Control: pre-check=0, post-check=0, max-age=0'); // HTTP/1.1 header('Pragma: no-cache'); // HTTP/1.0 + +$html_process = new html_process(); ?> \ No newline at end of file diff --git a/lib/common.lib.php b/lib/common.lib.php index 1891e2495..29c7e7b01 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -2170,30 +2170,41 @@ if (!function_exists('file_put_contents')) { // HTML 마지막 처리 function html_end() { - $end = new html_process(); - return $end->run(); + global $html_process; + + return $html_process->run(); +} + +function add_stylesheet($stylesheet, $order=0) +{ + global $html_process; + + if(trim($stylesheet)) + $html_process->merge_stylesheet($stylesheet, $order); } class html_process { - protected $links = array(); + protected $css = array(); - function css_callback1($m) { - $s = $m[0]; - if(preg_match('/]+>/i', $s)) { - preg_match_all("/(]+>)|(]+>)/is", $s, $m); - $this->links = array_merge($this->links, $m[0]); + function merge_stylesheet($stylesheet, $order) + { + $links = $this->css; + $is_merge = true; + + foreach($links as $link) { + if($link[1] == $stylesheet) { + $is_merge = false; + break; + } } - return ''; - } - function css_callback2($m) { - $this->links = array_merge($this->links, array($m[0])); - return ''; + if($is_merge) + $this->css[] = array($order, $stylesheet); } function run() { - global $config, $g5, $member, $css; + global $config, $g5, $member; // 현재접속자 처리 $tmp_sql = " select count(*) as cnt from {$g5['login_table']} where lo_ip = '{$_SERVER['REMOTE_ADDR']}' "; @@ -2214,28 +2225,29 @@ class html_process { //if ($row['Data_free'] > 0) sql_query(" OPTIMIZE TABLE $g5['login_table'] "); } - // 버퍼의 내용에서 body 태그 중간의 외부 css 파일을 CAPTURE 하여 head 태그로 이동시켜준다. $buffer = ob_get_contents(); ob_end_clean(); - preg_match('#(.*)#is', $buffer, $bodys); - - $bodys = preg_replace_callback("//is", 'html_process::css_callback1', $bodys); - $bodys = preg_replace_callback("//is", 'html_process::css_callback2', $bodys); - $bodys = preg_replace_callback("/]+>/is", 'html_process::css_callback2', $bodys); - - $links = array_unique($this->links); $stylesheet = ''; + $links = $this->css; - foreach($links as $link) { - if(!trim($link)) - continue; + if(!empty($links)) { + foreach ($links as $key => $row) { + $order[$key] = $row[0]; + $index[$key] = $key; + $style[$key] = $row[1]; + } - if(preg_match('/]+>/i', $link)) - $buffer = preg_replace('#'.$link.'#', '', $buffer); + array_multisort($order, SORT_ASC, $index, SORT_ASC, $links); - $stylesheet .= PHP_EOL.$link; + foreach($links as $link) { + if(!trim($link[1])) + continue; + + $stylesheet .= PHP_EOL.$link[1]; + } } + /* diff --git a/mobile/skin/board/basic/list.skin.php b/mobile/skin/board/basic/list.skin.php index 7d2d690aa..5b72909c1 100644 --- a/mobile/skin/board/basic/list.skin.php +++ b/mobile/skin/board/basic/list.skin.php @@ -7,9 +7,10 @@ $colspan = 5; if ($is_checkbox) $colspan++; if ($is_good) $colspan++; if ($is_nogood) $colspan++; -?> - +// add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨 +add_stylesheet('', 0); +?>

    목록

    diff --git a/mobile/skin/board/basic/view.skin.php b/mobile/skin/board/basic/view.skin.php index 891d13005..fd6192049 100644 --- a/mobile/skin/board/basic/view.skin.php +++ b/mobile/skin/board/basic/view.skin.php @@ -1,9 +1,11 @@ ', 0); ?> -
    diff --git a/mobile/skin/board/basic/write.skin.php b/mobile/skin/board/basic/write.skin.php index da1589e9b..b15f921b7 100644 --- a/mobile/skin/board/basic/write.skin.php +++ b/mobile/skin/board/basic/write.skin.php @@ -1,8 +1,9 @@ - +// add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨 +add_stylesheet('', 0); +?>

    diff --git a/mobile/skin/connect/basic/connect.skin.php b/mobile/skin/connect/basic/connect.skin.php index c74b4f8ef..55849443c 100644 --- a/mobile/skin/connect/basic/connect.skin.php +++ b/mobile/skin/connect/basic/connect.skin.php @@ -1,8 +1,9 @@ ', 0); ?> - - diff --git a/mobile/skin/connect/basic/current_connect.skin.php b/mobile/skin/connect/basic/current_connect.skin.php index 344b6f9cc..5d47774b7 100644 --- a/mobile/skin/connect/basic/current_connect.skin.php +++ b/mobile/skin/connect/basic/current_connect.skin.php @@ -1,8 +1,9 @@ - +// add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨 +add_stylesheet('', 0); +?>
    diff --git a/mobile/skin/latest/basic/latest.skin.php b/mobile/skin/latest/basic/latest.skin.php index 373997428..89ac1b4b8 100644 --- a/mobile/skin/latest/basic/latest.skin.php +++ b/mobile/skin/latest/basic/latest.skin.php @@ -1,8 +1,9 @@ - +// add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨 +add_stylesheet('', 0); +?>
    diff --git a/mobile/skin/member/basic/formmail.skin.php b/mobile/skin/member/basic/formmail.skin.php index e25d4c997..3add8546b 100644 --- a/mobile/skin/member/basic/formmail.skin.php +++ b/mobile/skin/member/basic/formmail.skin.php @@ -1,8 +1,9 @@ - +// add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨 +add_stylesheet('', 0); +?>

    님께 메일보내기

    diff --git a/mobile/skin/member/basic/login.skin.php b/mobile/skin/member/basic/login.skin.php index 3a0ac2d2f..3274b7dd8 100644 --- a/mobile/skin/member/basic/login.skin.php +++ b/mobile/skin/member/basic/login.skin.php @@ -1,8 +1,9 @@ - +// add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨 +add_stylesheet('', 0); +?>

    diff --git a/mobile/skin/member/basic/member_confirm.skin.php b/mobile/skin/member/basic/member_confirm.skin.php index b792be152..467b801e0 100644 --- a/mobile/skin/member/basic/member_confirm.skin.php +++ b/mobile/skin/member/basic/member_confirm.skin.php @@ -1,8 +1,9 @@ - +// add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨 +add_stylesheet('', 0); +?>

    diff --git a/mobile/skin/member/basic/memo.skin.php b/mobile/skin/member/basic/memo.skin.php index ece3e6aca..f6cbbb7af 100644 --- a/mobile/skin/member/basic/memo.skin.php +++ b/mobile/skin/member/basic/memo.skin.php @@ -1,8 +1,9 @@ - +// add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨 +add_stylesheet('', 0); +?>

    diff --git a/mobile/skin/member/basic/memo_form.skin.php b/mobile/skin/member/basic/memo_form.skin.php index 2edb425ef..47d0355f0 100644 --- a/mobile/skin/member/basic/memo_form.skin.php +++ b/mobile/skin/member/basic/memo_form.skin.php @@ -1,8 +1,9 @@ - +// add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨 +add_stylesheet('', 0); +?>

    쪽지보내기

    diff --git a/mobile/skin/member/basic/memo_view.skin.php b/mobile/skin/member/basic/memo_view.skin.php index cca59b368..13e7bc542 100644 --- a/mobile/skin/member/basic/memo_view.skin.php +++ b/mobile/skin/member/basic/memo_view.skin.php @@ -9,9 +9,10 @@ else { $kind_str = "받는"; $kind_date = "보낸"; } -?> - +// add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨 +add_stylesheet('', 0); +?>

    diff --git a/mobile/skin/member/basic/password.skin.php b/mobile/skin/member/basic/password.skin.php index a92dc1bc6..7a73f21e9 100644 --- a/mobile/skin/member/basic/password.skin.php +++ b/mobile/skin/member/basic/password.skin.php @@ -5,9 +5,10 @@ if ($w == 'x') $delete_str = "댓"; if ($w == 'u') $g5['title'] = $delete_str."글 수정"; else if ($w == 'd' || $w == 'x') $g5['title'] = $delete_str."글 삭제"; else $g5['title'] = $g5['title']; -?> - +// add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨 +add_stylesheet('', 0); +?>

    diff --git a/mobile/skin/member/basic/password_lost.skin.php b/mobile/skin/member/basic/password_lost.skin.php index c710e7c47..a4e1d11ef 100644 --- a/mobile/skin/member/basic/password_lost.skin.php +++ b/mobile/skin/member/basic/password_lost.skin.php @@ -1,8 +1,9 @@ +if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 - +// add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨 +add_stylesheet('', 0); +?>

    아이디/비밀번호 찾기

    diff --git a/mobile/skin/member/basic/profile.skin.php b/mobile/skin/member/basic/profile.skin.php index a4879270c..0cc8d8d02 100644 --- a/mobile/skin/member/basic/profile.skin.php +++ b/mobile/skin/member/basic/profile.skin.php @@ -1,8 +1,9 @@ - +// add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨 +add_stylesheet('', 0); +?>

    님의 프로필

    diff --git a/mobile/skin/member/basic/register.skin.php b/mobile/skin/member/basic/register.skin.php index 7026c0caa..76069e2df 100644 --- a/mobile/skin/member/basic/register.skin.php +++ b/mobile/skin/member/basic/register.skin.php @@ -1,8 +1,9 @@ +if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 - +// add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨 +add_stylesheet('', 0); +?>
    @@ -35,7 +36,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 diff --git a/mobile/skin/member/basic/register_result.skin.php b/mobile/skin/member/basic/register_result.skin.php index d7472f2fc..70c88f602 100644 --- a/mobile/skin/member/basic/register_result.skin.php +++ b/mobile/skin/member/basic/register_result.skin.php @@ -1,8 +1,9 @@ - +// add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨 +add_stylesheet('', 0); +?>
    diff --git a/mobile/skin/member/basic/scrap.skin.php b/mobile/skin/member/basic/scrap.skin.php index b7c3d4fa7..c47e3cd80 100644 --- a/mobile/skin/member/basic/scrap.skin.php +++ b/mobile/skin/member/basic/scrap.skin.php @@ -1,8 +1,9 @@ - +// add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨 +add_stylesheet('', 0); +?>

    diff --git a/mobile/skin/member/basic/scrap_popin.skin.php b/mobile/skin/member/basic/scrap_popin.skin.php index 833f1e128..04dfd5fd3 100644 --- a/mobile/skin/member/basic/scrap_popin.skin.php +++ b/mobile/skin/member/basic/scrap_popin.skin.php @@ -1,8 +1,9 @@ - +// add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨 +add_stylesheet('', 0); +?>

    스크랩하기

    diff --git a/mobile/skin/member/basic/zip.skin.php b/mobile/skin/member/basic/zip.skin.php index c4fa75a77..4a1413b95 100644 --- a/mobile/skin/member/basic/zip.skin.php +++ b/mobile/skin/member/basic/zip.skin.php @@ -1,9 +1,11 @@ ', 0); ?> -
    diff --git a/mobile/skin/new/basic/new.skin.php b/mobile/skin/new/basic/new.skin.php index 120d71fd2..30d3aee83 100644 --- a/mobile/skin/new/basic/new.skin.php +++ b/mobile/skin/new/basic/new.skin.php @@ -1,8 +1,9 @@ +if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 - +// add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨 +add_stylesheet('', 0); +?>
    @@ -41,7 +42,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
    - +// add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨 +add_stylesheet('', 0); +?> - +
    diff --git a/skin/member/basic/zip.skin.php b/skin/member/basic/zip.skin.php index 8586bc4e0..a99a6ae79 100644 --- a/skin/member/basic/zip.skin.php +++ b/skin/member/basic/zip.skin.php @@ -1,9 +1,11 @@ ', 0); ?> -
    diff --git a/skin/new/basic/new.skin.php b/skin/new/basic/new.skin.php index 935377785..da1e31a75 100644 --- a/skin/new/basic/new.skin.php +++ b/skin/new/basic/new.skin.php @@ -1,8 +1,9 @@ +if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 - +// add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨 +add_stylesheet('', 0); +?>
    @@ -63,7 +64,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 ', 0); ?> - -

    회원로그인

    diff --git a/skin/outlogin/basic/outlogin.skin.2.php b/skin/outlogin/basic/outlogin.skin.2.php index 3631ab5fc..fc508b166 100644 --- a/skin/outlogin/basic/outlogin.skin.2.php +++ b/skin/outlogin/basic/outlogin.skin.2.php @@ -1,5 +1,8 @@ ', 0); ?> diff --git a/skin/poll/basic/poll.skin.php b/skin/poll/basic/poll.skin.php index 87848f54e..05d3260e1 100644 --- a/skin/poll/basic/poll.skin.php +++ b/skin/poll/basic/poll.skin.php @@ -1,10 +1,11 @@ ', 0); ?> - - @@ -47,8 +48,8 @@ function fpoll_submit(f) return false; } - var new_win = window.open("about:blank", "win_poll", "width=616,height=500,scrollbars=yes,resizable=yes"); - f.target = "win_poll"; + var new_win = window.open("about:blank", "win_poll", "width=616,height=500,scrollbars=yes,resizable=yes"); + f.target = "win_poll"; return true; } diff --git a/skin/poll/basic/poll_result.skin.php b/skin/poll/basic/poll_result.skin.php index 9de3d6a6c..4741f5941 100644 --- a/skin/poll/basic/poll_result.skin.php +++ b/skin/poll/basic/poll_result.skin.php @@ -1,10 +1,11 @@ ', 0); ?> - -

    diff --git a/skin/popular/basic/popular.skin.php b/skin/popular/basic/popular.skin.php index f254bb432..14fe12281 100644 --- a/skin/popular/basic/popular.skin.php +++ b/skin/popular/basic/popular.skin.php @@ -1,10 +1,11 @@ ', 0); ?> - -
    '; + echo '
    FAQ 수정
    '; include_once('./_tail.php'); ?> diff --git a/bbs/newwin.inc.php b/bbs/newwin.inc.php new file mode 100644 index 000000000..98775d024 --- /dev/null +++ b/bbs/newwin.inc.php @@ -0,0 +1,48 @@ + + + +
    +
    + +
    +
    + + +
    +
    +팝업레이어 알림이 없습니다.'; +?> + + + \ No newline at end of file diff --git a/css/default.css b/css/default.css index 7b90112b3..2611c4942 100644 --- a/css/default.css +++ b/css/default.css @@ -28,6 +28,13 @@ a:hover, a:focus, a:active {color:#000;text-decoration:underline} #hd_wrapper {position:relative;margin:0 auto;padding:26px 0;width:970px;zoom:1} #hd_wrapper:after {display:block;visibility:hidden;clear:both;content:""} +#hd_pop {z-index:1000;position:relative;margin:0 auto;width:1000px;height:0} +#hd_pop h2 {position:absolute;font-size:0;line-height:0;overflow:hidden} +.hd_pops {position:absolute;border:1px solid #e9e9e9;background:#fff} +.hd_pops_con {margin:0 0 30px} +.hd_pops_footer {position:absolute;bottom:0;left:0;padding:10px 0;width:100%;background:#000;color:#fff;text-align:right} +.hd_pops_footer button {margin-right:5px;padding:5px 10px;border:0;background:#393939;color:#fff} + #logo {float:left;padding:5px 0 0} /* 전체 검색 */ @@ -93,41 +100,20 @@ a:hover, a:focus, a:active {color:#000;text-decoration:underline} #ft h1 {position:absolute;font-size:0;line-height:0;overflow:hidden} #ft p {margin:0;padding:10px 0;line-height:1.8em} -#ft_catch {position:relative;margin:0 auto;padding:20px 0;width:970px;text-align:center} +#ft_catch {position:relative;margin:0 auto;padding:20px 0 0;width:970px;text-align:center} + +#ft_company {text-align:center} #ft_copy {background:#414141} -#ft_copy p {position:relative;margin:0 auto;padding:10px 0;width:970px;color:#fff} -#ft_copy a {position:absolute;top:10px;right:0;color:#fff} +#ft_copy div {position:relative;margin:0 auto;padding:10px 0;width:970px;color:#fff} +#ft_copy a {display:inline-block;margin:0 10px 0 0;color:inherit} +#ft_copy #ft_totop {position:absolute;top:10px;right:0} /* 게시물 선택복사 선택이동 */ #copymove {} .copymove_current {float:right;color:#ff3061} .copymove_currentbg {background:#f4f4f4} -/* 내용관리 */ -#socc {margin:10px 0;padding:10px;border:1px solid #e9e9e9} -.socc_admin {text-align:right} -#socc header h1 {position:absolute;font-size:0;line-height:0;overflow:hidden} -#socc_con {padding:10px 0} -.socc_img {text-align:center} - -/* FAQ 관리 */ -#sfaq_wrap {margin:10px 0} -#sfaq_wrap h2 {position:absolute;font-size:0;line-height:0;overflow:hidden} -.sfaq_admin {text-align:right} -#sfaq_wrap ol {margin:0;padding:0;list-style:none} -#sfaq_list {margin:0 0 10px;border:1px solid #ccc} -#sfaq_list li {border-bottom:1px solid #fff;background:#f2f5f9} -#sfaq_list a {display:block;padding:10px;font-weight:bold;text-decoration:none} -#sfaq_list a:focus, -#sfaq_list a:hover {background:#626870;color:#fff} -#sfaq_con {border:1px solid #e9e9e9;border-top:0} -#sfaq_con li {padding:0 0 10px} -#sfaq_con h3 {padding:10px;background:#f2f5f9;border-top:1px solid #e9e9e9} -#sfaq_con p {padding:10px} -.sfaq_tolist {padding:0 10px;text-align:right} -.sfaq_img {text-align:center} - /* 화면낭독기 사용자용 */ #hd_login_msg {position:absolute;top:0;left:0;font-size:0;line-height:0;overflow:hidden} .msg_sound_only, .sound_only {display:inline-block !important;position:absolute;top:0;left:0;margin:0 !important;padding:0 !important;font-size:0;line-height:0;border:0 !important;overflow:hidden !important} @@ -271,6 +257,29 @@ a.btn_admin:focus, a.btn_admin:hover {text-decoration:none} .new_win .win_btn a {display:inline-block;padding:0 10px;height:30px;background:#4b545e;color:#fff;vertical-align:middle;line-height:2.4em} .new_win .win_btn a:focus, .new_win .win_btn a:hover {text-decoration:none} +/* 내용관리 */ +#ctt {margin:10px 0;padding:10px;border:1px solid #e9e9e9} +.ctt_admin {text-align:right} +#ctt header h1 {position:absolute;font-size:0;line-height:0;overflow:hidden} +#ctt_con {padding:10px 0} +.ctt_img {text-align:center} + +/* FAQ 관리 */ +#faq_wrap {margin:10px 0} +#faq_wrap h2 {position:absolute;font-size:0;line-height:0;overflow:hidden} +.faq_admin {text-align:right} +#faq_wrap ol {margin:0;padding:0;list-style:none} +#faq_list {margin:0 0 10px;border:1px solid #ccc} +#faq_list li {border-bottom:1px solid #fff;background:#f2f5f9} +#faq_list a {display:block;padding:10px;font-weight:bold;text-decoration:none} +#faq_list a:focus, #faq_list a:hover {background:#626870;color:#fff} +#faq_con {border:1px solid #e9e9e9;border-top:0} +#faq_con li {padding:0 0 10px} +#faq_con h3 {padding:10px;background:#f2f5f9;border-top:1px solid #e9e9e9} +#faq_con #con_inner {padding:10px;line-height:1.8em} +.faq_tolist {padding:0 10px;text-align:right} +.faq_img {text-align:center} + /* 자바스크립트 alert 대안 */ #validation_check {margin:100px auto;width:500px} #validation_check h1 {margin-bottom:20px;font-size:1.3em} diff --git a/css/mobile.css b/css/mobile.css index 6d3cb8d55..1019c216b 100644 --- a/css/mobile.css +++ b/css/mobile.css @@ -96,10 +96,11 @@ a:hover, a:focus, a:active {color:#000;text-decoration:underline} #ft h1 {width:0;height:0;font-size:0;line-height:0;overflow:hidden} #ft p {margin:0;padding:10px 0;line-height:1.8em} -#ft_copy {background:#414141} -#ft_copy p {position:relative;padding:10px;color:#fff} -#ft_copy b {color:#fff} -#ft_copy a {color:#fff;text-decoration:none} +#ft_copy {padding:10px;background:#414141;color:#fff;line-height:2em} +#ft_copy #ft_company {text-align:center} +#ft_copy #ft_company a {display:inline-block;padding:5px 10px} +#ft_copy b {color:inherit} +#ft_copy a {color:inherit;text-decoration:none} /* 게시물 선택복사 선택이동 */ #copymove {} @@ -214,6 +215,30 @@ a.btn_admin:focus, a.btn_admin:hover {text-decoration:none} .new_win .win_btn button {display:inline-block;padding:0 10px;height:2.5em;border:0;background:#666;color:#fff;text-decoration:none;line-height:2.5em} .new_win .win_btn input {padding:0 10px;height:2.5em;line-height:2.5em} +/* 내용관리 */ +#ctt {margin:10px 0;padding:10px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9} +.ctt_admin {margin:0 5px;text-align:right} +#ctt header h1 {position:absolute;font-size:0;line-height:0;overflow:hidden} +#ctt_con {padding:10px 0} +.ctt_img {text-align:center} + +/* FAQ 관리 */ +#faq_wrap {margin:10px 5px} +#faq_wrap h2 {position:absolute;font-size:0;line-height:0;overflow:hidden} +.faq_admin {margin:0 5px;text-align:right} +#faq_wrap p {line-height:1.8em} +#faq_wrap ol {margin:0;padding:0;list-style:none} +#faq_list {margin:0 0 10px;border:1px solid #ccc} +#faq_list li {border-bottom:1px solid #fff;background:#f2f5f9} +#faq_list a {display:block;padding:10px;font-weight:bold;text-decoration:none} +#faq_list a:focus, #faq_list a:hover {background:#626870;color:#fff} +#faq_con {border:1px solid #e9e9e9;border-top:0} +#faq_con li {padding:0 0 10px} +#faq_con h3 {padding:10px;background:#f2f5f9;border-top:1px solid #e9e9e9} +#faq_con #con_inner {padding:10px;line-height:1.8em} +.faq_tolist {padding:0 10px;text-align:right} +.faq_img {text-align:center} + /* 사이드뷰 */ .sv_wrap {display:inline-block;position:relative;font-weight:normal} .sv_wrap .sv {z-index:1000;display:none;margin:5px 0 0;border:1px solid #283646} diff --git a/head.php b/head.php index 736449e8d..547fd00ec 100644 --- a/head.php +++ b/head.php @@ -29,6 +29,13 @@ if (G5_IS_MOBILE) { + +
    +

    팝업레이어 알림

    + +
    + +
    diff --git a/skin/search/basic/search.skin.php b/skin/search/basic/search.skin.php index 609b88cc3..c88dbde84 100644 --- a/skin/search/basic/search.skin.php +++ b/skin/search/basic/search.skin.php @@ -93,7 +93,7 @@ add_stylesheet('', -

    검색된 자료가 하나도 없습니다.

    +
    검색된 자료가 하나도 없습니다.
    diff --git a/tail.php b/tail.php index 0c06084f9..e579db0bc 100644 --- a/tail.php +++ b/tail.php @@ -24,13 +24,18 @@ if (G5_IS_MOBILE) {
    - +
    <?php echo G5_VERSION ?>
    +
    +
    -

    +

    + 회사소개 + 개인정보취급방침 + 서비스이용약관 Copyright © 소유하신 도메인. All rights reserved.
    - 상단으로 -

    + 상단으로 +
    From 2c223a90e645c7499d875b37f91a966397c9d5ac Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 14 Feb 2014 13:48:05 +0900 Subject: [PATCH 08/34] =?UTF-8?q?=ED=8C=9D=EC=97=85=EB=A0=88=EC=9D=B4?= =?UTF-8?q?=EC=96=B4=20=EB=B0=B0=EA=B2=BD=EC=83=89=20=EC=A7=80=EC=A0=95=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 --- adm/admin.menu100.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adm/admin.menu100.php b/adm/admin.menu100.php index 4d657b4c1..217dfe9c3 100644 --- a/adm/admin.menu100.php +++ b/adm/admin.menu100.php @@ -4,7 +4,7 @@ $menu['menu100'] = array ( array('', '기본환경설정', G5_ADMIN_URL.'/config_form.php', 'cf_basic'), array('', '관리권한설정', G5_ADMIN_URL.'/auth_list.php', 'cf_auth'), array('100300', '메일 테스트', G5_ADMIN_URL.'/sendmail_test.php', 'cf_mailtest'), - array('100310', '팝업레이어관리', G5_ADMIN_URL.'/newwinlist.php', 'scf_poplayer', 1), + array('100310', '팝업레이어관리', G5_ADMIN_URL.'/newwinlist.php', 'scf_poplayer'), //array('100400', '버전정보', G5_ADMIN_URL.'/version.php', 'cf_version'), array('100800', '세션파일 일괄삭제',G5_ADMIN_URL.'/session_file_delete.php', 'cf_session', 1), array('100900', '캐시파일 일괄삭제',G5_ADMIN_URL.'/cache_file_delete.php', 'cf_cache', 1), From 7c7d3295419176c72bfe8e82b887fd628251aa2d Mon Sep 17 00:00:00 2001 From: thisgun Date: Fri, 14 Feb 2014 14:14:50 +0900 Subject: [PATCH 09/34] =?UTF-8?q?bbs/newwin.inc.php=20=ED=8C=8C=EC=9D=BC?= =?UTF-8?q?=EC=97=90=EC=84=9C=20=ED=8C=9D=EC=97=85=ED=85=8C=EC=9D=B4?= =?UTF-8?q?=EB=B8=94=EC=9D=B4=20=EC=A1=B4=EC=9E=AC=ED=95=98=EC=A7=80=20?= =?UTF-8?q?=EC=95=8A=EC=9D=84=EA=B2=BD=EC=9A=B0=EB=A5=BC=20=EB=8C=80?= =?UTF-8?q?=EB=B9=84=ED=95=98=EC=97=AC=20=EC=A1=B0=ED=9A=8C=EB=AC=B8?= =?UTF-8?q?=EC=97=90=20false=EC=98=B5=EC=85=98=EC=9D=84=20=EC=A3=BC?= =?UTF-8?q?=EC=96=B4=20=EC=98=A4=EB=A5=98=EA=B0=80=20=EC=9D=BC=EC=96=B4?= =?UTF-8?q?=EB=82=98=EC=A7=80=20=EC=95=8A=EA=B2=8C=20=ED=95=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/newwin.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bbs/newwin.inc.php b/bbs/newwin.inc.php index 98775d024..176638c70 100644 --- a/bbs/newwin.inc.php +++ b/bbs/newwin.inc.php @@ -5,7 +5,7 @@ $sql = " select * from {$g5['new_win_table']} where '".G5_TIME_YMDHIS."' between nw_begin_time and nw_end_time and nw_device IN ( 'both', 'pc' ) order by nw_id asc "; -$result = sql_query($sql); +$result = sql_query($sql, false); for ($i=0; $row_nw=sql_fetch_array($result); $i++) { // 이미 체크 되었다면 Continue From a770007e4d3e92ff2fb110dab10267b7a45948b1 Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 14 Feb 2014 14:44:01 +0900 Subject: [PATCH 10/34] =?UTF-8?q?=EC=B5=9C=EC=8B=A0=EA=B8=80=20=EC=BA=90?= =?UTF-8?q?=EC=8B=9C=ED=8C=8C=EC=9D=BC=20include=EB=A1=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/latest.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/latest.lib.php b/lib/latest.lib.php index 71dad15bc..214147b02 100644 --- a/lib/latest.lib.php +++ b/lib/latest.lib.php @@ -34,7 +34,7 @@ function latest($skin_dir='', $bo_table, $rows=10, $subject_len=40, $cache_time= } if(!$cache_fwrite) - include_once($cache_file); + include($cache_file); } } From ca51542b1671f104773d4353337d722bfe1a2763 Mon Sep 17 00:00:00 2001 From: thisgun Date: Fri, 14 Feb 2014 14:57:09 +0900 Subject: [PATCH 11/34] =?UTF-8?q?g5=EB=AA=A8=EB=B0=94=EC=9D=BC=EC=97=90?= =?UTF-8?q?=EC=84=9C=20=ED=8C=9D=EC=97=85=EB=A0=88=EC=9D=B4=EC=96=B4=20?= =?UTF-8?q?=EB=82=B4=EC=9A=A9=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/mobile.css | 7 +++++++ mobile/head.php | 7 +++++++ mobile/newwin.inc.php | 48 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 62 insertions(+) create mode 100644 mobile/newwin.inc.php diff --git a/css/mobile.css b/css/mobile.css index 1019c216b..5f5647302 100644 --- a/css/mobile.css +++ b/css/mobile.css @@ -45,6 +45,13 @@ a:hover, a:focus, a:active {color:#000;text-decoration:underline} #hd:after {display:block;visibility:hidden;clear:both;content:""} #hd_h1 {position:absolute;font-size:0;text-indent:-9999em;line-height:0;overflow:hidden} +#hd_pop {z-index:1000;position:relative;margin:0 auto;width:100%;height:1px} +#hd_pop h2 {position:absolute;font-size:0;text-indent:-9999em;line-height:0;overflow:hidden} +.hd_pops {position:absolute;border:1px solid #e9e9e9;background:#fff} +.hd_pops_con {margin:0 0 30px} +.hd_pops_footer {position:absolute;bottom:0;left:0;padding:10px 0;width:100%;background:#000;color:#fff;text-align:right} +.hd_pops_footer button {margin-right:5px;padding:5px 10px;border:0;background:#393939;color:#fff} + #logo {float:left;padding:15px 0;margin-left:5px} #hd_sch_open {position:absolute;top:10px;right:10px;padding:0 10px;height:2.6em;border:0;background:#333;color:#fff;font-size:1em;letter-spacing:-0.1em;vertical-align:top;-webkit-appearance:none} diff --git a/mobile/head.php b/mobile/head.php index de217d74c..01c70c8d4 100644 --- a/mobile/head.php +++ b/mobile/head.php @@ -14,6 +14,13 @@ include_once(G5_LIB_PATH.'/popular.lib.php');

    본문 바로가기
    + + +
    +

    팝업레이어 알림

    + +
    +
    메인메뉴 바로가기
    diff --git a/mobile/newwin.inc.php b/mobile/newwin.inc.php new file mode 100644 index 000000000..1f2af0357 --- /dev/null +++ b/mobile/newwin.inc.php @@ -0,0 +1,48 @@ + + + +
    +
    + +
    +
    + + +
    +
    +팝업레이어 알림이 없습니다.'; +?> + + + \ No newline at end of file From 920d7d4f079fae12f77082e0f884e4e2cb6112e3 Mon Sep 17 00:00:00 2001 From: whitedot Date: Fri, 14 Feb 2014 15:35:02 +0900 Subject: [PATCH 12/34] =?UTF-8?q?=EA=B3=B5=ED=86=B5:=20=ED=8C=9D=EC=97=85?= =?UTF-8?q?=EA=B4=80=EB=A6=AC=20g5=20=EC=9D=B4=EB=8F=99=EC=97=90=20?= =?UTF-8?q?=EB=94=B0=EB=A5=B8=20=EC=8A=A4=ED=83=80=EC=9D=BC=20=EC=A0=95?= =?UTF-8?q?=EB=A6=AC=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/default.css | 13 +++++++------ css/mobile.css | 47 ++++++++++++++++++++++++----------------------- 2 files changed, 31 insertions(+), 29 deletions(-) diff --git a/css/default.css b/css/default.css index 2611c4942..20618c8ec 100644 --- a/css/default.css +++ b/css/default.css @@ -22,12 +22,7 @@ pre {overflow-x:scroll;font-size:1.1em} a:link, a:visited {color:#000;text-decoration:none} a:hover, a:focus, a:active {color:#000;text-decoration:underline} -/* 상단 레이아웃 */ -#hd {z-index:10;position:relative;min-width:970px;background:#fff} -#hd_h1 {position:absolute;font-size:0;line-height:0;overflow:hidden} -#hd_wrapper {position:relative;margin:0 auto;padding:26px 0;width:970px;zoom:1} -#hd_wrapper:after {display:block;visibility:hidden;clear:both;content:""} - +/* 팝업레이어 */ #hd_pop {z-index:1000;position:relative;margin:0 auto;width:1000px;height:0} #hd_pop h2 {position:absolute;font-size:0;line-height:0;overflow:hidden} .hd_pops {position:absolute;border:1px solid #e9e9e9;background:#fff} @@ -35,6 +30,12 @@ a:hover, a:focus, a:active {color:#000;text-decoration:underline} .hd_pops_footer {position:absolute;bottom:0;left:0;padding:10px 0;width:100%;background:#000;color:#fff;text-align:right} .hd_pops_footer button {margin-right:5px;padding:5px 10px;border:0;background:#393939;color:#fff} +/* 상단 레이아웃 */ +#hd {z-index:10;position:relative;min-width:970px;background:#fff} +#hd_h1 {position:absolute;font-size:0;line-height:0;overflow:hidden} +#hd_wrapper {position:relative;margin:0 auto;padding:26px 0;width:970px;zoom:1} +#hd_wrapper:after {display:block;visibility:hidden;clear:both;content:""} + #logo {float:left;padding:5px 0 0} /* 전체 검색 */ diff --git a/css/mobile.css b/css/mobile.css index 5f5647302..5d8f18744 100644 --- a/css/mobile.css +++ b/css/mobile.css @@ -22,29 +22,7 @@ pre {overflow-x:scroll;font-size:1.1em} a:link, a:visited {color:#000;text-decoration:none} a:hover, a:focus, a:active {color:#000;text-decoration:underline} -/* 화면낭독기 사용자용 */ -#hd_login_msg {position:absolute;top:0;left:0;width:0;height:0;overflow:hidden} -.msg_sound_only, .sound_only {display:inline-block;position:absolute;top:0;left:0;margin:0 !important;padding:0 !important;width:1px !important;height:1px !important;font-size:0 !important;line-height:0 !important;overflow:hidden} -/* 본문 바로가기 */ -.to_content a {z-index:100000;position:absolute;top:0;left:0;width:0;height:0;font-size:0;line-height:0;overflow:hidden} - -/* 이미지 등비율 리사이징 */ -.img_fix {width:100%;height:auto} - -/* 캡챠 자동등록(입력)방지 기본 */ -#captcha {display:inline-block;position:relative} -#captcha legend {position:absolute;margin:0;padding:0;font-size:0;line-height:0;text-indent:-9999em;overflow:hidden} -#captcha audio {display:block;margin:0 0 5px;width:187px} -#captcha #captcha_img {width:60px;height:30px;border:1px solid #e9e9e9} -#captcha #captcha_reload {margin:0;padding:0 5px;height:32px;border:0;background:#e4eaec;vertical-align:middle;overflow:hidden;cursor:pointer} -#captcha #captcha_key {margin:0 0 0 4px;padding:0 5px;width:50px;height:30px;border:1px solid #b8c9c2;background:#f7f7f7;font-size:1.333em;font-weight:bold;text-align:center;line-height:2.8em} -#captcha #captcha_info {display:block;margin:5px 0 0;font-size:0.95em;letter-spacing:-0.1em} - -/* 상단 레이아웃 */ -#hd {position:relative;background:#fff} -#hd:after {display:block;visibility:hidden;clear:both;content:""} -#hd_h1 {position:absolute;font-size:0;text-indent:-9999em;line-height:0;overflow:hidden} - +/* 팝업레이어 */ #hd_pop {z-index:1000;position:relative;margin:0 auto;width:100%;height:1px} #hd_pop h2 {position:absolute;font-size:0;text-indent:-9999em;line-height:0;overflow:hidden} .hd_pops {position:absolute;border:1px solid #e9e9e9;background:#fff} @@ -52,6 +30,11 @@ a:hover, a:focus, a:active {color:#000;text-decoration:underline} .hd_pops_footer {position:absolute;bottom:0;left:0;padding:10px 0;width:100%;background:#000;color:#fff;text-align:right} .hd_pops_footer button {margin-right:5px;padding:5px 10px;border:0;background:#393939;color:#fff} +/* 상단 레이아웃 */ +#hd {position:relative;background:#fff} +#hd:after {display:block;visibility:hidden;clear:both;content:""} +#hd_h1 {position:absolute;font-size:0;text-indent:-9999em;line-height:0;overflow:hidden} + #logo {float:left;padding:15px 0;margin-left:5px} #hd_sch_open {position:absolute;top:10px;right:10px;padding:0 10px;height:2.6em;border:0;background:#333;color:#fff;font-size:1em;letter-spacing:-0.1em;vertical-align:top;-webkit-appearance:none} @@ -114,6 +97,24 @@ a:hover, a:focus, a:active {color:#000;text-decoration:underline} .copymove_current {float:right;color:#ff3061} .copymove_currentbg {background:#f4f4f4} +/* 화면낭독기 사용자용 */ +#hd_login_msg {position:absolute;top:0;left:0;width:0;height:0;overflow:hidden} +.msg_sound_only, .sound_only {display:inline-block;position:absolute;top:0;left:0;margin:0 !important;padding:0 !important;width:1px !important;height:1px !important;font-size:0 !important;line-height:0 !important;overflow:hidden} +/* 본문 바로가기 */ +.to_content a {z-index:100000;position:absolute;top:0;left:0;width:0;height:0;font-size:0;line-height:0;overflow:hidden} + +/* 이미지 등비율 리사이징 */ +.img_fix {width:100%;height:auto} + +/* 캡챠 자동등록(입력)방지 기본 */ +#captcha {display:inline-block;position:relative} +#captcha legend {position:absolute;margin:0;padding:0;font-size:0;line-height:0;text-indent:-9999em;overflow:hidden} +#captcha audio {display:block;margin:0 0 5px;width:187px} +#captcha #captcha_img {width:60px;height:30px;border:1px solid #e9e9e9} +#captcha #captcha_reload {margin:0;padding:0 5px;height:32px;border:0;background:#e4eaec;vertical-align:middle;overflow:hidden;cursor:pointer} +#captcha #captcha_key {margin:0 0 0 4px;padding:0 5px;width:50px;height:30px;border:1px solid #b8c9c2;background:#f7f7f7;font-size:1.333em;font-weight:bold;text-align:center;line-height:2.8em} +#captcha #captcha_info {display:block;margin:5px 0 0;font-size:0.95em;letter-spacing:-0.1em} + /* 버튼 */ a.btn01 {display:inline-block;padding:8px 7px 7px;border:1px solid #ccc;background:#fafafa;color:#000;text-decoration:none;vertical-align:middle} a.btn01:focus, a.btn01:hover {text-decoration:none} From f15e41f8d99e026f60f1a33f987d44cccc56550e Mon Sep 17 00:00:00 2001 From: chicpro Date: Mon, 17 Feb 2014 17:43:40 +0900 Subject: [PATCH 13/34] =?UTF-8?q?=EC=82=AD=EC=A0=9C=EB=90=98=EC=A7=80=20?= =?UTF-8?q?=EC=95=8A=EB=8A=94=20style.css=20=EB=A7=81=ED=81=AC=20=EC=A0=9C?= =?UTF-8?q?=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- skin/outlogin/basic/outlogin.skin.2.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/skin/outlogin/basic/outlogin.skin.2.php b/skin/outlogin/basic/outlogin.skin.2.php index fc508b166..ab1286c7d 100644 --- a/skin/outlogin/basic/outlogin.skin.2.php +++ b/skin/outlogin/basic/outlogin.skin.2.php @@ -6,8 +6,6 @@ add_stylesheet('' ?> - -

    나의 회원정보

    From a7604e02c4f9036069d44814542445c9a2a04f09 Mon Sep 17 00:00:00 2001 From: chicpro Date: Wed, 19 Feb 2014 08:58:45 +0900 Subject: [PATCH 14/34] =?UTF-8?q?mysql=5Freal=5Fescape=5Fstring=20?= =?UTF-8?q?=ED=95=A8=EC=88=98=20=EC=A0=81=EC=9A=A9=20=EC=BD=94=EB=93=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 | 54 +++++++++++++++++++++------------------------- lib/common.lib.php | 18 ++++++++++++++++ 2 files changed, 42 insertions(+), 30 deletions(-) diff --git a/common.php b/common.php index a1c2fa1a1..3f8a74a56 100644 --- a/common.php +++ b/common.php @@ -11,30 +11,6 @@ if (!defined('G5_SET_TIME_LIMIT')) define('G5_SET_TIME_LIMIT', 0); @set_time_limit(G5_SET_TIME_LIMIT); -//============================================================================== -// php.ini 의 magic_quotes_gpc 값이 Off 인 경우 addslashes() 적용 -// SQL Injection 등으로 부터 보호 -// http://kr.php.net/manual/en/function.get-magic-quotes-gpc.php#97783 -//------------------------------------------------------------------------------ -if (!get_magic_quotes_gpc()) { - $escape_function = 'addslashes($value)'; - $addslashes_deep = create_function('&$value, $fn', ' - if (is_string($value)) { - $value = ' . $escape_function . '; - } else if (is_array($value)) { - foreach ($value as &$v) $fn($v, $fn); - } - '); - - // Escape data - $addslashes_deep($_POST, $addslashes_deep); - $addslashes_deep($_GET, $addslashes_deep); - $addslashes_deep($_COOKIE, $addslashes_deep); - $addslashes_deep($_REQUEST, $addslashes_deep); -} -//============================================================================== - - //========================================================================================================================== // extract($_GET); 명령으로 인해 page.php?_POST[var1]=data1&_POST[var2]=data2 와 같은 코드가 _POST 변수로 사용되는 것을 막음 // 081029 : letsgolee 님께서 도움 주셨습니다. @@ -49,12 +25,6 @@ for ($i=0; $i<$ext_cnt; $i++) { } //========================================================================================================================== -// PHP 4.1.0 부터 지원됨 -// php.ini 의 register_globals=off 일 경우 -@extract($_GET); -@extract($_POST); -@extract($_SERVER); - // 완두콩님이 알려주신 보안관련 오류 수정 // $member 에 값을 직접 넘길 수 있음 $config = array(); @@ -97,6 +67,30 @@ if (file_exists($dbconfig_file)) { @mysql_query(" set names utf8 "); if(defined('G5_MYSQL_SET_MODE') && G5_MYSQL_SET_MODE) @mysql_query("SET SESSION sql_mode = ''"); if (defined(G5_TIMEZONE)) @mysql_query(" set time_zone = '".G5_TIMEZONE."'"); + + //============================================================================== + // SQL Injection 등으로 부터 보호를 위해 mysql_real_escape_string() 적용 + //------------------------------------------------------------------------------ + // magic_quotes_gpc 에 의한 backslashes 제거 + if (get_magic_quotes_gpc()) { + $_POST = array_map_deep('stripslashes', $_POST); + $_GET = array_map_deep('stripslashes', $_GET); + $_COOKIE = array_map_deep('stripslashes', $_COOKIE); + $_REQUEST = array_map_deep('stripslashes', $_REQUEST); + } + + // mysql_real_escape_string 적용 + $_POST = array_map_deep('mysql_real_escape_string', $_POST); + $_GET = array_map_deep('mysql_real_escape_string', $_GET); + $_COOKIE = array_map_deep('mysql_real_escape_string', $_COOKIE); + $_REQUEST = array_map_deep('mysql_real_escape_string', $_REQUEST); + //============================================================================== + + // PHP 4.1.0 부터 지원됨 + // php.ini 의 register_globals=off 일 경우 + @extract($_GET); + @extract($_POST); + @extract($_SERVER); } else { ?> diff --git a/lib/common.lib.php b/lib/common.lib.php index e22a53413..8f70a6a34 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -7,6 +7,24 @@ if (!defined('_GNUBOARD_')) exit; ** *************************************************************************/ +// multi-dimensional array에 사용자지정 함수적용 +function array_map_deep($fn, $array) +{ + if(is_array($array)) { + foreach($array as $key => $value) { + if(is_array($value)) { + $array[$key] = array_map_deep($fn, $value); + } else { + $array[$key] = call_user_func($fn, $value); + } + } + } else { + $array = call_user_func($fn, $array); + } + + return $array; +} + // 마이크로 타임을 얻어 계산 형식으로 만듦 function get_microtime() { From 95d697a99aecaa4498a17ae010e3fa643dc94a57 Mon Sep 17 00:00:00 2001 From: chicpro Date: Wed, 19 Feb 2014 08:59:18 +0900 Subject: [PATCH 15/34] =?UTF-8?q?=EA=B2=8C=EC=8B=9C=EA=B8=80=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20=EC=8B=9C=20=EA=B3=B5=EC=A7=80=EC=B2=B4=ED=81=AC=20?= =?UTF-8?q?=ED=95=B4=EC=A0=9C=EB=90=98=EC=A7=80=20=EC=95=8A=EB=8A=94=20?= =?UTF-8?q?=EC=98=A4=EB=A5=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 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/common.lib.php b/lib/common.lib.php index 8f70a6a34..624017d40 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -2320,10 +2320,11 @@ function https_url($dir, $https=true) // 게시판의 공지사항을 , 로 구분하여 업데이트 한다. function board_notice($bo_notice, $wr_id, $insert=false) { - if(strpos($bo_notice, strval($wr_id)) !== false) + $notice_array = explode(",", trim($bo_notice)); + + if($insert && in_array($wr_id, $notice_array)) return $bo_notice; - $notice_array = explode(",", trim($bo_notice)); $notice_array = array_merge(array($wr_id), $notice_array); $notice_array = array_unique($notice_array); foreach ($notice_array as $key=>$value) { From 847df782b51cce653c3a87a6789b81923737eeb0 Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 20 Feb 2014 08:52:29 +0900 Subject: [PATCH 16/34] =?UTF-8?q?=EA=B2=8C=EC=8B=9C=ED=8C=90=20=EB=B3=B5?= =?UTF-8?q?=EC=82=AC=20=EC=98=A4=ED=83=80=20=EC=88=98=EC=A0=95=20-=20?= =?UTF-8?q?=EC=B0=B8=EC=97=86=EB=8B=A4=EB=8B=98=20=EB=B3=B4=EA=B3=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/board_copy_update.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adm/board_copy_update.php b/adm/board_copy_update.php index e89c4468b..9537ed786 100644 --- a/adm/board_copy_update.php +++ b/adm/board_copy_update.php @@ -61,7 +61,7 @@ $sql = " insert into {$g5['board_table']} bo_use_nogood = '{$board[bo_use_nogood]}', bo_use_signature = '{$board[bo_use_signature]}', bo_use_ip_view = '{$board[bo_use_ip_view]}', - bo_use_list_view = '{$board['o_use_list_view']}', + bo_use_list_view = '{$board['bo_use_list_view']}', bo_use_list_content = '{$board[bo_use_list_content]}', bo_table_width = '{$board[bo_table_width]}', bo_subject_len = '{$board[bo_subject_len]}', From aa66a8757991e3cda0f2e1b25c904aed7e52325c Mon Sep 17 00:00:00 2001 From: whitedot Date: Thu, 20 Feb 2014 09:45:37 +0900 Subject: [PATCH 17/34] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90:=20btn=5Fcanc?= =?UTF-8?q?el=20=EC=8A=A4=ED=83=80=EC=9D=BC=20a=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/admin.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/css/admin.css b/css/admin.css index ede367374..3b42d12a9 100644 --- a/css/admin.css +++ b/css/admin.css @@ -135,7 +135,8 @@ h2.h2_frm {padding-top:15px} .btn_submit {background:#ff3061;cursor:pointer} .btn_confirm .btn_submit {padding:0 15px;border:0;height:30px;color:#fff} -.btn_cancel {display:inline-block;padding:0 15px;height:30px;border:0;background:#617d46;color:#fff;text-decoration:none;line-height:2.5em;vertical-align:middle} +.btn_cancel {display:inline-block;padding:0 15px;height:30px;border:0;background:#617d46;color:#fff;text-decoration:none} +a.btn_cancel {line-height:2.5em;vertical-align:middle} .btn_frmline {display:inline-block;padding:0 7px;height:24px;border:0;background:#444;color:#fff !important;letter-spacing:-0.1em;text-decoration:none;vertical-align:middle;line-height:2em} /* 우편번호검색버튼 등 */ .btn_frmline:focus, .btn_frmline:hover, .btn_frmline:active {text-decoration:none} From 7bd383b7cf9d64bcd513674536542eb976430b2b Mon Sep 17 00:00:00 2001 From: whitedot Date: Thu, 20 Feb 2014 10:14:41 +0900 Subject: [PATCH 18/34] =?UTF-8?q?=EA=B3=B5=ED=86=B5:=20=ED=8C=9D=EC=97=85?= =?UTF-8?q?=EB=A0=88=EC=9D=B4=EC=96=B4=20=EC=9E=85=EB=A0=A5=EB=90=9C=20?= =?UTF-8?q?=EB=82=B4=EC=9A=A9=EC=9D=B4=20=EC=84=A4=EC=A0=95=EB=90=9C=20?= =?UTF-8?q?=EB=86=92=EC=9D=B4=EB=B3=B4=EB=8B=A4=20=EA=B8=B8=20=EB=95=8C=20?= =?UTF-8?q?=EB=8B=AB=EA=B8=B0=20=EB=B2=84=ED=8A=BC=20=EA=B0=80=EB=A0=A4?= =?UTF-8?q?=EC=A7=80=EB=8A=94=20=ED=98=84=EC=83=81=20=EC=88=98=EC=A0=95,?= =?UTF-8?q?=20=EC=B0=B8=EC=97=86=EB=8B=A4(uyong)=EB=8B=98=20=EC=A0=9C?= =?UTF-8?q?=EB=B3=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/newwin.inc.php | 4 ++-- css/default.css | 4 ++-- css/mobile.css | 4 ++-- mobile/newwin.inc.php | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bbs/newwin.inc.php b/bbs/newwin.inc.php index 176638c70..139fbfa17 100644 --- a/bbs/newwin.inc.php +++ b/bbs/newwin.inc.php @@ -17,8 +17,8 @@ for ($i=0; $row_nw=sql_fetch_array($result); $i++) ?> -
    -
    +
    +
    diff --git a/css/default.css b/css/default.css index 20618c8ec..938c3a203 100644 --- a/css/default.css +++ b/css/default.css @@ -26,8 +26,8 @@ a:hover, a:focus, a:active {color:#000;text-decoration:underline} #hd_pop {z-index:1000;position:relative;margin:0 auto;width:1000px;height:0} #hd_pop h2 {position:absolute;font-size:0;line-height:0;overflow:hidden} .hd_pops {position:absolute;border:1px solid #e9e9e9;background:#fff} -.hd_pops_con {margin:0 0 30px} -.hd_pops_footer {position:absolute;bottom:0;left:0;padding:10px 0;width:100%;background:#000;color:#fff;text-align:right} +.hd_pops_con {} +.hd_pops_footer {padding:10px 0;background:#000;color:#fff;text-align:right} .hd_pops_footer button {margin-right:5px;padding:5px 10px;border:0;background:#393939;color:#fff} /* 상단 레이아웃 */ diff --git a/css/mobile.css b/css/mobile.css index 5d8f18744..975ed6ca9 100644 --- a/css/mobile.css +++ b/css/mobile.css @@ -26,8 +26,8 @@ a:hover, a:focus, a:active {color:#000;text-decoration:underline} #hd_pop {z-index:1000;position:relative;margin:0 auto;width:100%;height:1px} #hd_pop h2 {position:absolute;font-size:0;text-indent:-9999em;line-height:0;overflow:hidden} .hd_pops {position:absolute;border:1px solid #e9e9e9;background:#fff} -.hd_pops_con {margin:0 0 30px} -.hd_pops_footer {position:absolute;bottom:0;left:0;padding:10px 0;width:100%;background:#000;color:#fff;text-align:right} +.hd_pops_con {} +.hd_pops_footer {padding:10px 0;background:#000;color:#fff;text-align:right} .hd_pops_footer button {margin-right:5px;padding:5px 10px;border:0;background:#393939;color:#fff} /* 상단 레이아웃 */ diff --git a/mobile/newwin.inc.php b/mobile/newwin.inc.php index 1f2af0357..78c27d878 100644 --- a/mobile/newwin.inc.php +++ b/mobile/newwin.inc.php @@ -17,8 +17,8 @@ for ($i=0; $row_nw=sql_fetch_array($result); $i++) ?> -
    -
    +
    +
    From bc1cfad1c21f1109fc8f4ebe4c2b37292fb5ca64 Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 20 Feb 2014 11:29:19 +0900 Subject: [PATCH 19/34] =?UTF-8?q?post=20=EB=93=B1=EC=97=90=20mysql=5Freal?= =?UTF-8?q?=5Fescape=5Fstring=20=EC=A0=81=EC=9A=A9=ED=95=98=EB=8A=94=20?= =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/board_copy_update.php | 4 +-- adm/board_list_update.php | 2 +- adm/member_form_update.php | 2 +- adm/visit_search.php | 4 +-- bbs/ajax.autosave.php | 6 ++-- bbs/ajax.mb_email.php | 4 +-- bbs/ajax.mb_hp.php | 4 +-- bbs/ajax.mb_id.php | 2 +- bbs/ajax.mb_nick.php | 4 +-- bbs/ajax.mb_recommend.php | 2 +- bbs/login_check.php | 6 ++-- bbs/password_lost2.php | 2 +- bbs/qawrite_update.php | 2 +- bbs/register_email_update.php | 4 +-- bbs/register_form_update.php | 64 +++++++++++++++++------------------ bbs/visit_insert.inc.php | 10 +++--- bbs/write_comment_update.php | 4 +-- bbs/write_update.php | 8 ++--- common.php | 14 ++++---- lib/common.lib.php | 4 +-- 20 files changed, 76 insertions(+), 76 deletions(-) diff --git a/adm/board_copy_update.php b/adm/board_copy_update.php index 9537ed786..5636b1cae 100644 --- a/adm/board_copy_update.php +++ b/adm/board_copy_update.php @@ -4,8 +4,8 @@ include_once('./_common.php'); auth_check($auth[$sub_menu], 'w'); -$target_table = escape_trim($_POST['target_table']); -$target_subject = escape_trim($_POST['target_subject']); +$target_table = trim($_POST['target_table']); +$target_subject = trim($_POST['target_subject']); if (!preg_match('/[A-Za-z0-9_]{1,20}/', $target_table)) { alert('게시판 TABLE명은 공백없이 영문자, 숫자, _ 만 사용 가능합니다. (20자 이내)'); diff --git a/adm/board_list_update.php b/adm/board_list_update.php index 5754db411..0cf509bd7 100644 --- a/adm/board_list_update.php +++ b/adm/board_list_update.php @@ -62,7 +62,7 @@ if ($_POST['act_button'] == "선택수정") { $k = $_POST['chk'][$i]; // include 전에 $bo_table 값을 반드시 넘겨야 함 - $tmp_bo_table = escape_trim($_POST['board_table'][$k]); + $tmp_bo_table = trim($_POST['board_table'][$k]); include ('./board_delete.inc.php'); } diff --git a/adm/member_form_update.php b/adm/member_form_update.php index 18a40b548..50543e0d7 100644 --- a/adm/member_form_update.php +++ b/adm/member_form_update.php @@ -10,7 +10,7 @@ auth_check($auth[$sub_menu], 'w'); check_token(); -$mb_id = escape_trim($_POST['mb_id']); +$mb_id = trim($_POST['mb_id']); // 휴대폰번호 체크 $mb_hp = $_POST['mb_hp']; diff --git a/adm/visit_search.php b/adm/visit_search.php index 1750956e2..fa01682f4 100644 --- a/adm/visit_search.php +++ b/adm/visit_search.php @@ -9,8 +9,8 @@ $g5['title'] = '접속자검색'; include_once('./admin.head.php'); include_once(G5_PLUGIN_PATH.'/jquery-ui/datepicker.php'); -$search_word = escape_trim($_GET['search_word']); -$search_sort = escape_trim($_GET['search_sort']); +$search_word = trim($_GET['search_word']); +$search_sort = trim($_GET['search_sort']); $colspan = 5; $qstr = 'search_word='.$search_word.'&search_sort='.$search_sort; //페이징 처리관련 변수 diff --git a/bbs/ajax.autosave.php b/bbs/ajax.autosave.php index 2073c1f86..2222a86b3 100644 --- a/bbs/ajax.autosave.php +++ b/bbs/ajax.autosave.php @@ -3,9 +3,9 @@ include_once('./_common.php'); if (!$is_member) die('0'); -$uid = escape_trim($_REQUEST['uid']); -$subject = escape_trim(stripslashes($_REQUEST['subject'])); -$content = escape_trim(stripslashes($_REQUEST['content'])); +$uid = trim($_REQUEST['uid']); +$subject = trim(stripslashes($_REQUEST['subject'])); +$content = trim(stripslashes($_REQUEST['content'])); if ($subject && $content) { $sql = " select count(*) as cnt from {$g5['autosave_table']} where mb_id = '{$member['mb_id']}' and as_subject = '$subject' and as_content = '$content' "; diff --git a/bbs/ajax.mb_email.php b/bbs/ajax.mb_email.php index b6673ee51..6c50300cc 100644 --- a/bbs/ajax.mb_email.php +++ b/bbs/ajax.mb_email.php @@ -2,8 +2,8 @@ include_once('./_common.php'); include_once(G5_LIB_PATH.'/register.lib.php'); -$mb_email = escape_trim($_POST['reg_mb_email']); -$mb_id = escape_trim($_POST['reg_mb_id']); +$mb_email = trim($_POST['reg_mb_email']); +$mb_id = trim($_POST['reg_mb_id']); if ($msg = empty_mb_email($mb_email)) die($msg); if ($msg = valid_mb_email($mb_email)) die($msg); diff --git a/bbs/ajax.mb_hp.php b/bbs/ajax.mb_hp.php index 635bef022..5f4c9ffb6 100644 --- a/bbs/ajax.mb_hp.php +++ b/bbs/ajax.mb_hp.php @@ -2,8 +2,8 @@ include_once('./_common.php'); include_once(G5_LIB_PATH.'/register.lib.php'); -$mb_hp = escape_trim($_POST['reg_mb_hp']); -$mb_id = escape_trim($_POST['reg_mb_id']); +$mb_hp = trim($_POST['reg_mb_hp']); +$mb_id = trim($_POST['reg_mb_id']); if ($msg = valid_mb_hp($mb_hp)) die($msg); if ($msg = exist_mb_hp($mb_hp, $mb_id)) die($msg); diff --git a/bbs/ajax.mb_id.php b/bbs/ajax.mb_id.php index 3e4025dbf..6b0badd06 100644 --- a/bbs/ajax.mb_id.php +++ b/bbs/ajax.mb_id.php @@ -2,7 +2,7 @@ include_once('./_common.php'); include_once(G5_LIB_PATH.'/register.lib.php'); -$mb_id = escape_trim($_POST['reg_mb_id']); +$mb_id = trim($_POST['reg_mb_id']); if ($msg = empty_mb_id($mb_id)) die($msg); if ($msg = valid_mb_id($mb_id)) die($msg); diff --git a/bbs/ajax.mb_nick.php b/bbs/ajax.mb_nick.php index b3757dfac..50a90f037 100644 --- a/bbs/ajax.mb_nick.php +++ b/bbs/ajax.mb_nick.php @@ -2,8 +2,8 @@ include_once('./_common.php'); include_once(G5_LIB_PATH.'/register.lib.php'); -$mb_nick = escape_trim($_POST['reg_mb_nick']); -$mb_id = escape_trim($_POST['reg_mb_id']); +$mb_nick = trim($_POST['reg_mb_nick']); +$mb_id = trim($_POST['reg_mb_id']); if ($msg = empty_mb_nick($mb_nick)) die($msg); if ($msg = valid_mb_nick($mb_nick)) die($msg); diff --git a/bbs/ajax.mb_recommend.php b/bbs/ajax.mb_recommend.php index f7e1062e4..c19470fa0 100644 --- a/bbs/ajax.mb_recommend.php +++ b/bbs/ajax.mb_recommend.php @@ -2,7 +2,7 @@ include_once("./_common.php"); include_once(G5_LIB_PATH."/register.lib.php"); -$mb_recommend = escape_trim($_POST["reg_mb_recommend"]); +$mb_recommend = trim($_POST["reg_mb_recommend"]); if ($msg = valid_mb_id($mb_recommend)) { die("추천인의 아이디는 영문자, 숫자, _ 만 입력하세요."); diff --git a/bbs/login_check.php b/bbs/login_check.php index 2e5ed57a3..4defcc399 100644 --- a/bbs/login_check.php +++ b/bbs/login_check.php @@ -3,10 +3,10 @@ include_once('./_common.php'); $g5['title'] = "로그인 검사"; -$mb_id = escape_trim($_POST['mb_id']); -$mb_password = escape_trim($_POST['mb_password']); +$mb_id = trim($_POST['mb_id']); +$mb_password = trim($_POST['mb_password']); -if (!trim($mb_id) || !trim($mb_password)) +if (!$mb_id || !$mb_password) alert('회원아이디나 비밀번호가 공백이면 안됩니다.'); $mb = get_member($mb_id); diff --git a/bbs/password_lost2.php b/bbs/password_lost2.php index f56927427..074e2bfd7 100644 --- a/bbs/password_lost2.php +++ b/bbs/password_lost2.php @@ -11,7 +11,7 @@ if (!chk_captcha()) { alert('자동등록방지 숫자가 틀렸습니다.'); } -$email = escape_trim($_POST['mb_email']); +$email = trim($_POST['mb_email']); if (!$email) alert_close('메일주소 오류입니다.'); diff --git a/bbs/qawrite_update.php b/bbs/qawrite_update.php index c6fde25d5..c7fa45225 100644 --- a/bbs/qawrite_update.php +++ b/bbs/qawrite_update.php @@ -52,7 +52,7 @@ for ($i=1; $i<=5; $i++) { $var = "qa_$i"; $$var = ""; if (isset($_POST['qa_'.$i]) && $_POST['qa_'.$i]) { - $$var = escape_trim($_POST['qa_'.$i]); + $$var = trim($_POST['qa_'.$i]); } } diff --git a/bbs/register_email_update.php b/bbs/register_email_update.php index 240fd0a26..7f59541e9 100644 --- a/bbs/register_email_update.php +++ b/bbs/register_email_update.php @@ -3,8 +3,8 @@ include_once('./_common.php'); include_once(G5_CAPTCHA_PATH.'/captcha.lib.php'); include_once(G5_LIB_PATH.'/mailer.lib.php'); -$mb_id = escape_trim($_POST['mb_id']); -$mb_email = escape_trim($_POST['mb_email']); +$mb_id = trim($_POST['mb_id']); +$mb_email = trim($_POST['mb_email']); $sql = " select mb_name, mb_datetime from {$g5['member_table']} where mb_id = '{$mb_id}' and mb_email_certify <> '' "; $mb = sql_fetch($sql); diff --git a/bbs/register_form_update.php b/bbs/register_form_update.php index 31bda65a0..b593792cc 100644 --- a/bbs/register_form_update.php +++ b/bbs/register_form_update.php @@ -20,38 +20,38 @@ if (!chk_captcha()) { alert('자동등록방지 숫자가 틀렸습니다.'); } -$mb_id = escape_trim($_POST['mb_id']); -$mb_password = escape_trim($_POST['mb_password']); -$mb_password_re = escape_trim($_POST['mb_password_re']); -$mb_name = escape_trim($_POST['mb_name']); -$mb_nick = escape_trim($_POST['mb_nick']); -$mb_email = escape_trim($_POST['mb_email']); -$mb_sex = isset($_POST['mb_sex']) ? escape_trim($_POST['mb_sex']) : ""; -$mb_birth = isset($_POST['mb_birth']) ? escape_trim($_POST['mb_birth']) : ""; -$mb_homepage = isset($_POST['mb_homepage']) ? escape_trim($_POST['mb_homepage']) : ""; -$mb_tel = isset($_POST['mb_tel']) ? escape_trim($_POST['mb_tel']) : ""; -$mb_hp = isset($_POST['mb_hp']) ? escape_trim($_POST['mb_hp']) : ""; -$mb_zip1 = isset($_POST['mb_zip1']) ? escape_trim($_POST['mb_zip1']) : ""; -$mb_zip2 = isset($_POST['mb_zip2']) ? escape_trim($_POST['mb_zip2']) : ""; -$mb_addr1 = isset($_POST['mb_addr1']) ? escape_trim($_POST['mb_addr1']) : ""; -$mb_addr2 = isset($_POST['mb_addr2']) ? escape_trim($_POST['mb_addr2']) : ""; -$mb_addr3 = isset($_POST['mb_addr3']) ? escape_trim($_POST['mb_addr3']) : ""; -$mb_addr_jibeon = isset($_POST['mb_addr_jibeon']) ? escape_trim($_POST['mb_addr_jibeon']) : ""; -$mb_signature = isset($_POST['mb_signature']) ? escape_trim($_POST['mb_signature']) : ""; -$mb_profile = isset($_POST['mb_profile']) ? escape_trim($_POST['mb_profile']) : ""; -$mb_recommend = isset($_POST['mb_recommend']) ? escape_trim($_POST['mb_recommend']) : ""; -$mb_mailling = isset($_POST['mb_mailling']) ? escape_trim($_POST['mb_mailling']) : ""; -$mb_sms = isset($_POST['mb_sms']) ? escape_trim($_POST['mb_sms']) : ""; -$mb_1 = isset($_POST['mb_1']) ? escape_trim($_POST['mb_1']) : ""; -$mb_2 = isset($_POST['mb_2']) ? escape_trim($_POST['mb_2']) : ""; -$mb_3 = isset($_POST['mb_3']) ? escape_trim($_POST['mb_3']) : ""; -$mb_4 = isset($_POST['mb_4']) ? escape_trim($_POST['mb_4']) : ""; -$mb_5 = isset($_POST['mb_5']) ? escape_trim($_POST['mb_5']) : ""; -$mb_6 = isset($_POST['mb_6']) ? escape_trim($_POST['mb_6']) : ""; -$mb_7 = isset($_POST['mb_7']) ? escape_trim($_POST['mb_7']) : ""; -$mb_8 = isset($_POST['mb_8']) ? escape_trim($_POST['mb_8']) : ""; -$mb_9 = isset($_POST['mb_9']) ? escape_trim($_POST['mb_9']) : ""; -$mb_10 = isset($_POST['mb_10']) ? escape_trim($_POST['mb_10']) : ""; +$mb_id = trim($_POST['mb_id']); +$mb_password = trim($_POST['mb_password']); +$mb_password_re = trim($_POST['mb_password_re']); +$mb_name = trim($_POST['mb_name']); +$mb_nick = trim($_POST['mb_nick']); +$mb_email = trim($_POST['mb_email']); +$mb_sex = isset($_POST['mb_sex']) ? trim($_POST['mb_sex']) : ""; +$mb_birth = isset($_POST['mb_birth']) ? trim($_POST['mb_birth']) : ""; +$mb_homepage = isset($_POST['mb_homepage']) ? trim($_POST['mb_homepage']) : ""; +$mb_tel = isset($_POST['mb_tel']) ? trim($_POST['mb_tel']) : ""; +$mb_hp = isset($_POST['mb_hp']) ? trim($_POST['mb_hp']) : ""; +$mb_zip1 = isset($_POST['mb_zip1']) ? trim($_POST['mb_zip1']) : ""; +$mb_zip2 = isset($_POST['mb_zip2']) ? trim($_POST['mb_zip2']) : ""; +$mb_addr1 = isset($_POST['mb_addr1']) ? trim($_POST['mb_addr1']) : ""; +$mb_addr2 = isset($_POST['mb_addr2']) ? trim($_POST['mb_addr2']) : ""; +$mb_addr3 = isset($_POST['mb_addr3']) ? trim($_POST['mb_addr3']) : ""; +$mb_addr_jibeon = isset($_POST['mb_addr_jibeon']) ? trim($_POST['mb_addr_jibeon']) : ""; +$mb_signature = isset($_POST['mb_signature']) ? trim($_POST['mb_signature']) : ""; +$mb_profile = isset($_POST['mb_profile']) ? trim($_POST['mb_profile']) : ""; +$mb_recommend = isset($_POST['mb_recommend']) ? trim($_POST['mb_recommend']) : ""; +$mb_mailling = isset($_POST['mb_mailling']) ? trim($_POST['mb_mailling']) : ""; +$mb_sms = isset($_POST['mb_sms']) ? trim($_POST['mb_sms']) : ""; +$mb_1 = isset($_POST['mb_1']) ? trim($_POST['mb_1']) : ""; +$mb_2 = isset($_POST['mb_2']) ? trim($_POST['mb_2']) : ""; +$mb_3 = isset($_POST['mb_3']) ? trim($_POST['mb_3']) : ""; +$mb_4 = isset($_POST['mb_4']) ? trim($_POST['mb_4']) : ""; +$mb_5 = isset($_POST['mb_5']) ? trim($_POST['mb_5']) : ""; +$mb_6 = isset($_POST['mb_6']) ? trim($_POST['mb_6']) : ""; +$mb_7 = isset($_POST['mb_7']) ? trim($_POST['mb_7']) : ""; +$mb_8 = isset($_POST['mb_8']) ? trim($_POST['mb_8']) : ""; +$mb_9 = isset($_POST['mb_9']) ? trim($_POST['mb_9']) : ""; +$mb_10 = isset($_POST['mb_10']) ? trim($_POST['mb_10']) : ""; if ($w == '' || $w == 'u') { diff --git a/bbs/visit_insert.inc.php b/bbs/visit_insert.inc.php index e0698f75c..dccd1326f 100644 --- a/bbs/visit_insert.inc.php +++ b/bbs/visit_insert.inc.php @@ -1,8 +1,8 @@ 50) { @include_once($board_skin_path.'/write_comment_update.head.skin.php'); $w = $_POST["w"]; -$wr_name = escape_trim($_POST['wr_name']); +$wr_name = trim($_POST['wr_name']); $wr_email = ''; if (!empty($_POST['wr_email'])) - $wr_email = escape_trim($_POST['wr_email']); + $wr_email = trim($_POST['wr_email']); // 비회원의 경우 이름이 누락되는 경우가 있음 if ($is_guest) { diff --git a/bbs/write_update.php b/bbs/write_update.php index 0b71d3306..2caae2308 100644 --- a/bbs/write_update.php +++ b/bbs/write_update.php @@ -50,8 +50,8 @@ if (empty($_POST)) { } $w = $_POST['w']; -$wr_link1 = escape_trim(strip_tags($_POST['wr_link1'])); -$wr_link2 = escape_trim(strip_tags($_POST['wr_link2'])); +$wr_link1 = trim(strip_tags($_POST['wr_link1'])); +$wr_link2 = trim(strip_tags($_POST['wr_link2'])); $notice_array = explode(",", $board['bo_notice']); @@ -91,7 +91,7 @@ for ($i=1; $i<=10; $i++) { $var = "wr_$i"; $$var = ""; if (isset($_POST['wr_'.$i]) && $_POST['wr_'.$i]) { - $$var = escape_trim($_POST['wr_'.$i]); + $$var = trim($_POST['wr_'.$i]); } } @@ -291,7 +291,7 @@ if ($w == '' || $w == 'r') { } else { $mb_id = ''; // 비회원의 경우 이름이 누락되는 경우가 있음 - $wr_name = escape_trim($_POST['wr_name']); + $wr_name = trim($_POST['wr_name']); if (!$wr_name) alert('이름은 필히 입력하셔야 합니다.'); $wr_password = sql_password($wr_password); diff --git a/common.php b/common.php index 3f8a74a56..7e2db059a 100644 --- a/common.php +++ b/common.php @@ -205,7 +205,7 @@ if (isset($_REQUEST['PHPSESSID']) && $_REQUEST['PHPSESSID'] != session_id()) $qstr = ''; if (isset($_REQUEST['sca'])) { - $sca = escape_trim($_REQUEST['sca']); + $sca = trim($_REQUEST['sca']); if ($sca) $qstr .= '&sca=' . urlencode($sca); } else { @@ -213,7 +213,7 @@ if (isset($_REQUEST['sca'])) { } if (isset($_REQUEST['sfl'])) { - $sfl = escape_trim($_REQUEST['sfl']); + $sfl = trim($_REQUEST['sfl']); $sfl = preg_replace("/[\<\>\'\"\%\=\(\)\s]/", "", $sfl); if ($sfl) $qstr .= '&sfl=' . urlencode($sfl); // search field (검색 필드) @@ -223,7 +223,7 @@ if (isset($_REQUEST['sfl'])) { if (isset($_REQUEST['stx'])) { // search text (검색어) - $stx = escape_trim($_REQUEST['stx']); + $stx = trim($_REQUEST['stx']); if ($stx) $qstr .= '&stx=' . urlencode($stx); } else { @@ -231,7 +231,7 @@ if (isset($_REQUEST['stx'])) { // search text (검색어) } if (isset($_REQUEST['sst'])) { - $sst = escape_trim($_REQUEST['sst']); + $sst = trim($_REQUEST['sst']); if ($sst) $qstr .= '&sst=' . urlencode($sst); // search sort (검색 정렬 필드) } else { @@ -283,7 +283,7 @@ if (isset($_REQUEST['wr_id'])) { } if (isset($_REQUEST['bo_table'])) { - $bo_table = escape_trim($_REQUEST['bo_table']); + $bo_table = trim($_REQUEST['bo_table']); $bo_table = substr($bo_table, 0, 20); } else { $bo_table = ''; @@ -291,7 +291,7 @@ if (isset($_REQUEST['bo_table'])) { // URL ENCODING if (isset($_REQUEST['url'])) { - $url = escape_trim($_REQUEST['url']); + $url = trim($_REQUEST['url']); $urlencode = urlencode($url); } else { $url = ''; @@ -303,7 +303,7 @@ if (isset($_REQUEST['url'])) { } if (isset($_REQUEST['gr_id'])) { - $gr_id = escape_trim($_REQUEST['gr_id']); + $gr_id = trim($_REQUEST['gr_id']); } else { $gr_id = ''; } diff --git a/lib/common.lib.php b/lib/common.lib.php index 624017d40..de725408f 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -1885,8 +1885,8 @@ function escape_trim($field) if ($field) { $str = mysql_real_escape_string(@trim($field)); - if(PHP_VERSION < '5.3.0') - $str = stripslashes($str); + //if(PHP_VERSION < '5.3.0') + // $str = stripslashes($str); return $str; } From 18722964171c76635508e07fde253ec31c848dea Mon Sep 17 00:00:00 2001 From: whitedot Date: Mon, 24 Feb 2014 13:01:42 +0900 Subject: [PATCH 20/34] =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC:=20lnb=20?= =?UTF-8?q?=EC=8A=A4=ED=83=80=EC=9D=BC=205=EC=B9=B8=20=EA=B8=B0=EC=A4=80,?= =?UTF-8?q?=204=EC=B9=B8=20=EA=B8=B0=EC=A4=80=EC=9C=BC=EB=A1=9C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD=20-=20=EC=9E=85=EB=AC=B8=EA=B0=9C=EB=B0=9C?= =?UTF-8?q?=EC=9E=90(dungglenim)=EB=8B=98=20=EC=A0=9C=EB=B3=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/mobile.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/mobile.css b/css/mobile.css index 975ed6ca9..30045c4de 100644 --- a/css/mobile.css +++ b/css/mobile.css @@ -56,7 +56,7 @@ a:hover, a:focus, a:active {color:#000;text-decoration:underline} #lnb ul:after {display:block;visibility:hidden;clear:both;content:""} #lnb li {float:left;margin-bottom:-1px;width:25%} #lnb a {display:block;padding:10px 0;border-right:1px solid #e7f1ed;border-bottom:1px solid #e7f1ed;color:#000;text-align:center;text-decoration:none} -#lnb li:nth-of-type(5n) a {border-right:0} +#lnb li:nth-of-type(4n) a {border-right:0} /* 중간 레이아웃 */ #wrapper {margin:20px 0} From 89b146a2c40b9e3190f6bc727115e36b670d544f Mon Sep 17 00:00:00 2001 From: chicpro Date: Mon, 24 Feb 2014 18:10:25 +0900 Subject: [PATCH 21/34] =?UTF-8?q?=EA=B2=8C=EC=8B=9C=ED=8C=90=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=EC=97=90=20=EC=8D=B8=EB=84=A4=EC=9D=BC=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/admin.js | 8 ++++++ adm/board_form.php | 4 ++- adm/board_thumbnail_delete.php | 51 ++++++++++++++++++++++++++++++++++ 3 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 adm/board_thumbnail_delete.php diff --git a/adm/admin.js b/adm/admin.js index e5c2a3e04..a3f4c7d64 100644 --- a/adm/admin.js +++ b/adm/admin.js @@ -63,4 +63,12 @@ function delete_confirm() return true; else return false; +} + +function delete_confirm2(msg) +{ + if(confirm(msg)) + return true; + else + return false; } \ No newline at end of file diff --git a/adm/board_form.php b/adm/board_form.php index 86497f74d..6e9d2a54c 100644 --- a/adm/board_form.php +++ b/adm/board_form.php @@ -159,7 +159,9 @@ $frm_submit = '
    목록'.PHP_EOL; if ($w == 'u') $frm_submit .= ' 게시판복사 - 게시판 바로가기'.PHP_EOL; + 게시판 바로가기 + 게시판 썸네일 삭제 + '.PHP_EOL; $frm_submit .= '
    '; ?> diff --git a/adm/board_thumbnail_delete.php b/adm/board_thumbnail_delete.php new file mode 100644 index 000000000..53d7932b1 --- /dev/null +++ b/adm/board_thumbnail_delete.php @@ -0,0 +1,51 @@ + + +
    +

    + 완료 메세지가 나오기 전에 프로그램의 실행을 중지하지 마십시오. +

    +
    + +'.$thumbnail.''.PHP_EOL; + + flush(); + + if ($cnt%10==0) + echo PHP_EOL; + } + } + + echo '
  • 완료됨
    • '.PHP_EOL; + echo '

    썸네일 '.$cnt.'건의 삭제 완료됐습니다.

    '.PHP_EOL; +} else { + echo '

    첨부파일 디렉토리가 존재하지 않습니다.

    '; +} +?> + + + + \ No newline at end of file From d61e6dd01d06b8096dda27392f405caecf2fb726 Mon Sep 17 00:00:00 2001 From: whitedot Date: Tue, 25 Feb 2014 09:47:44 +0900 Subject: [PATCH 22/34] =?UTF-8?q?=EA=B3=B5=ED=86=B5:=20=EC=A0=84=EC=B2=B4?= =?UTF-8?q?=EA=B2=80=EC=83=89=EA=B2=B0=EA=B3=BC=20=EB=AA=A9=EB=A1=9D=20?= =?UTF-8?q?=EB=82=B4=20=EC=A0=9C=EB=AA=A9,=20=EB=82=B4=EC=9A=A9=20?= =?UTF-8?q?=EC=8A=A4=ED=83=80=EC=9D=BC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mobile/skin/search/basic/style.css | 2 ++ skin/search/basic/style.css | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/mobile/skin/search/basic/style.css b/mobile/skin/search/basic/style.css index 8207d200a..b7c5a9451 100644 --- a/mobile/skin/search/basic/style.css +++ b/mobile/skin/search/basic/style.css @@ -27,4 +27,6 @@ .sch_res_list ul {margin:0;padding:0;list-style:none} .sch_res_list li {margin:0 0 10px;padding:0 10px 10px;border-bottom:1px solid #e9e9e9} .sch_res_list a {text-decoration:none} +.sch_res_title {display:inline-block;margin:0 0 5px} +.sch_res_list p {margin:0 0 10px;line-height:1.8em} .sch_more {padding:0 10px;text-align:right} \ No newline at end of file diff --git a/skin/search/basic/style.css b/skin/search/basic/style.css index 8e2d4e199..d197f3d9d 100644 --- a/skin/search/basic/style.css +++ b/skin/search/basic/style.css @@ -23,5 +23,6 @@ .sch_res_list h2 {margin:0 0 15px;font-size:1.2em} .sch_res_list ul {margin:0;padding:0;list-style:none} .sch_res_list li {margin:0 0 10px;padding:0 0 10px;border-bottom:1px solid #e9e9e9} -.sch_res_title {font-weight:bold} +.sch_res_title {display:inline-block;margin:0 0 5px} +.sch_res_list p {margin:0 0 10px;line-height:1.8em} .sch_more {text-align:right} \ No newline at end of file From 31e24fa77b0743db34aba60a7eaecda5b4cebef9 Mon Sep 17 00:00:00 2001 From: whitedot Date: Wed, 26 Feb 2014 09:12:15 +0900 Subject: [PATCH 23/34] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90:=20#26=20?= =?UTF-8?q?=EA=B2=8C=EC=8B=9C=ED=8C=90=20=EC=8D=B8=EB=84=A4=EC=9D=BC=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EB=A7=88?= =?UTF-8?q?=ED=81=AC=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/board_thumbnail_delete.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/adm/board_thumbnail_delete.php b/adm/board_thumbnail_delete.php index 53d7932b1..720cad4f9 100644 --- a/adm/board_thumbnail_delete.php +++ b/adm/board_thumbnail_delete.php @@ -22,6 +22,7 @@ $dir = G5_DATA_PATH.'/file/'.$bo_table; $cnt = 0; if(is_dir($dir)) { + echo '