From 319870ce3a7e8050a3db30456d4753da6bcf3b48 Mon Sep 17 00:00:00 2001 From: whitedot Date: Tue, 15 Jan 2013 19:00:32 +0900 Subject: [PATCH 01/26] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20=EC=82=AC?= =?UTF-8?q?=EC=9D=B4=ED=8A=B8=20=EC=A0=84=EC=B2=B4=EA=B2=80=EC=83=89?= =?UTF-8?q?=EA=B2=B0=EA=B3=BC=20=EC=8A=A4=ED=83=80=EC=9D=BC=20=EC=9E=91?= =?UTF-8?q?=EC=97=85=20=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/search.php | 30 +++++++++++++++--------------- css/default.css | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/bbs/search.php b/bbs/search.php index d2ac091d6..df62ada7a 100644 --- a/bbs/search.php +++ b/bbs/search.php @@ -129,7 +129,7 @@ if ($stx) { $sql2 = " select bo_subject from {$g4['board_table']} where bo_table = '{$g4_search['tables'][$i]}' "; $row2 = sql_fetch($sql2); - $str_board_list .= '
  • '.$row2[bo_subject].' ('.$row[cnt].')'; + $str_board_list .= '
  • '.$row2['bo_subject'].' ('.$row['cnt'].')'; } } @@ -162,37 +162,37 @@ if ($stx) { for ($i=0; $row=sql_fetch_array($result); $i++) { // 검색어까지 링크되면 게시판 부하가 일어남 $list[$idx][$i] = $row; - $list[$idx][$i][href] = './board.php?bo_table='.$search_table[$idx].'&wr_id='.$row[wr_parent]; + $list[$idx][$i][href] = './board.php?bo_table='.$search_table[$idx].'&wr_id='.$row['wr_parent']; - if ($row[wr_is_comment]) + if ($row['wr_is_comment']) { - $link .= '#c'.$row[wr_id]; - $sql2 = " select wr_subject, wr_option from {$tmp_write_table} where wr_id = '{$row[wr_parent]}' "; + $link .= '#c'.$row['wr_id']; + $sql2 = " select wr_subject, wr_option from {$tmp_write_table} where wr_id = '{$row['wr_parent']}' "; $row2 = sql_fetch($sql2); - //$row[wr_subject] = $row2[wr_subject]; - $row[wr_subject] = get_text($row2[wr_subject]); + //$row['wr_subject'] = $row2['wr_subject']; + $row['wr_subject'] = get_text($row2['wr_subject']); } // 비밀글은 검색 불가 - if (strstr($row[wr_option].$row2[wr_option], 'secret')) - $row[wr_content] = '[비밀글 입니다.]'; + if (strstr($row['wr_option'].$row2['wr_option'], 'secret')) + $row['wr_content'] = '[비밀글 입니다.]'; - $subject = get_text($row[wr_subject]); + $subject = get_text($row['wr_subject']); if (strstr($sfl, 'wr_subject')) $subject = search_font($stx, $subject); - if ($read_level[$idx] <= $member[mb_level]) + if ($read_level[$idx] <= $member['mb_level']) { - $content = cut_str(get_text($row[wr_content]),300,"…"); + $content = cut_str(get_text($row['wr_content']),300,"…"); if (strstr($sfl, 'wr_content')) $content = search_font($stx, $content); } else $content = ''; - $list[$idx][$i][subject] = $subject; - $list[$idx][$i][content] = $content; - $list[$idx][$i][name] = get_sideview($row[mb_id], cut_str($row[wr_name], $config[cf_cut_name]), $row[wr_email], $row[wr_homepage]); + $list[$idx][$i]['subject'] = $subject; + $list[$idx][$i]['content'] = $content; + $list[$idx][$i]['name'] = get_sideview($row['mb_id'], cut_str($row['wr_name'], $config['cf_cut_name']), $row['wr_email'], $row['wr_homepage']); $k++; if ($k >= $rows) diff --git a/css/default.css b/css/default.css index 7c0d2f0cf..9b64a0d35 100644 --- a/css/default.css +++ b/css/default.css @@ -81,7 +81,7 @@ a {color:#000;text-decoration:none} #tnb li {float:left} #tnb a {display:inline-block;padding:0 10px;height:30px;border-right:1px solid #dadada;font-family:"dotum";font-size:0.7em;text-decoration:none;line-height:2.7em} -/* 전체검색 */ +/* 상단 전체검색 */ #hdsch {z-index:3;position:absolute;top:-31px;right:0;margin:0;padding:0;width:219px;border:0;border-left:1px solid #bbb;background:url('../img/search_bg.jpg') #fff bottom left repeat-x} #hdsch legend {position:absolute;padding:0;width:0;height:0;border:0;overflow:hidden} #hdsch_stx {margin:5px 0 5px 5px;padding:0 5px;height:20px;width:170px;border:0;background:transparent;font-size:1em;line-height:1.4em} From a5e3eb8ca34775f152c8709b32f6930a6a735505 Mon Sep 17 00:00:00 2001 From: whitedot Date: Tue, 15 Jan 2013 20:48:22 +0900 Subject: [PATCH 02/26] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20=EC=A0=84?= =?UTF-8?q?=EC=B2=B4=EA=B2=80=EC=83=89=EC=8A=A4=ED=82=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/search.php | 2 +- css/default.css | 37 ++++-- img/sch_result_bg.jpg | Bin 0 -> 7650 bytes skin/search/neo/search.skin.php | 220 ++++++++++++++++---------------- 4 files changed, 140 insertions(+), 119 deletions(-) create mode 100644 img/sch_result_bg.jpg diff --git a/bbs/search.php b/bbs/search.php index df62ada7a..f4d800742 100644 --- a/bbs/search.php +++ b/bbs/search.php @@ -129,7 +129,7 @@ if ($stx) { $sql2 = " select bo_subject from {$g4['board_table']} where bo_table = '{$g4_search['tables'][$i]}' "; $row2 = sql_fetch($sql2); - $str_board_list .= '
  • '.$row2['bo_subject'].' ('.$row['cnt'].')'; + $str_board_list .= '
  • '.$row2['bo_subject'].PHP_EOL.'갯수'.$row['cnt'].''; } } diff --git a/css/default.css b/css/default.css index 9b64a0d35..6c32e7924 100644 --- a/css/default.css +++ b/css/default.css @@ -13,7 +13,7 @@ input {margin:0;padding:0;font-family:"verdana","dotum"} p {margin:5px 0;padding:10px 0;line-height:1.5em} hr {display:none} -/* 웹접근성 스킬 */ +/* 웹접근성 스킬 --- 기본 block 속성에는 적용 안됨*/ .sound_only {display:inline-block;margin:0;padding:0;width:0;height:0;border:0;overflow:hidden} /* 본문 바로가기 */ #to_content a {z-index:100000000;display:block;position:absolute;top:0;left:0;height:0;overflow:hidden} @@ -210,6 +210,8 @@ a {color:#000;text-decoration:none} /* ##################################################################### 스킨 및 컨텐츠 */ /* 공통 */ .cnt_cmt {display:inline-block;margin-left:10px;color:#ff3061} +.readonly {background:#ff3061} +.highlight {font-weight:bold;color:#ff3061} /* 버튼 */ .btn01 {display:inline-block;padding:0 10px;height:24px;border:1px solid #ff5e1c;background:#ff3061;color:#fff;font-size:0.75em;text-decoration:none;line-height:2.2em} @@ -244,8 +246,6 @@ a {color:#000;text-decoration:none} .frm_tbl #captcha {margin:0;padding:0;border:0;background:transparent} .frm_tbl #captcha input {margin-left:5px} -.readonly {background:#ff3061} - /* 최신글 */ .latest {clear:both;position:relative;margin-bottom:30px;padding:0 0 20px;border-bottom:1px solid #ccc;font-size:0.75em} .latest strong {display:block;margin-bottom:15px;padding:0 10px 10px;border-bottom:1px solid #eee;font-size:1.1em} @@ -274,15 +274,30 @@ a {color:#000;text-decoration:none} #current_connect_tbl .td_name {text-align:center} /* 전체검색 */ -#sch_result_hd {margin:0;border:1px solid #ddd;background:#fff} -#sch_result_hd dt {padding:10px;background:#f5f5f2} +#sch_result_detail {margin:0;padding:15px 0;border:0;border-top:1px solid #ddd;text-align:center} +#sch_result_detail label {font-size:0.75em} +#sch_result_hd {margin:0;border:0;background:#fff;font-size:0.75em} +#sch_result_hd dt {padding:10px;background:#eee} #sch_result_hd dd {margin:0;padding:0} -.sch_result {} -.sch_result dt {font-weight:bold} -.sch_result dd {margin-bottom:30px} -.sch_result ul {padding:0} -.sch_result li {padding:10px 0;border-bottom:1px solid #ddd} -.sch_result p {margin:5px 0;padding:0;font-size:0.75em} +#sch_result_hd ul {padding:0;list-style:none;zoom:1} +#sch_result_hd ul:after {display:block;visibility:hidden;clear:both;content:""} +#sch_result_hd li {float:left;padding:0 10px;border-right:1px solid #999} +#sch_result {position:relative;padding:30px 0 0 200px;border-top:1px solid #ddd;border-bottom:1px solid #ddd;background:url('../img/sch_result_bg.jpg') repeat-y} +#sch_result dl {margin:0;padding:0} +#sch_result dt {font-weight:bold} +#sch_result ul {margin:0;padding:0;list-style:none} +#sch_result p {margin:5px 0;padding:0;font-size:0.75em} +#sch_result_bo {position:absolute;top:0;left:0;width:170px;font-size:0.875em} +#sch_result_bo dt {margin:0;padding:0;height:0;border:0;overflow:hidden} +#sch_result_bo dd {margin:0} +#sch_result_bo li {position:relative;margin-top:-1px} +#sch_result_bo a {display:inline-block;padding:10px 0 10px 10px;width:160px;border:1px solid #ddd;background:#eee} +#sch_result_bo .cnt_cmt {color:#000} +#sch_result_atc li {padding:10px 0} +#sch_result_atc dt a {display:inline-block;margin-bottom:15px;font-size:0.75em} +#sch_result_atc dd {margin:0 0 30px;border-bottom:1px solid #ddd} +#sch_result_atc p {color:#888} +.sch_more {padding:10px 0 15px;font-size:0.75em;text-align:right} .sch_sideview {display:inline-block;font-size:0.75em} .sch_datetime {font-size:0.75em} diff --git a/img/sch_result_bg.jpg b/img/sch_result_bg.jpg new file mode 100644 index 0000000000000000000000000000000000000000..65b4e1c719cd142ed07884cffc0144b96684ae73 GIT binary patch literal 7650 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 +
    + +
    + 상세검색 + + + + + + + + + + + > + + > + +
    +
    + +
    검색어 에 대한 결과입니다.
      -
    • 개의 게시판
      • -
    • 개의 게시글
      • +
    • 개의 게시판
      • +
    • 개의 게시글
    • 현재 / 페이지 열람 중
    @@ -17,112 +73,62 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 - -
    -
    검색결과가 있는 게시판 목록
    -
    -
      - -
    • 전체게시판 검색 +
      + + +
      +
      검색결과가 있는 게시판 목록
      +
      + +
      +
      + +

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

      + + +
      + +
      + +
      에서
      +
      + -
      -
      - -

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

      - +
    +
    더보기
    +
    + +
    -
    +
    + +
    -
    - -
    에서의 검색결과
    -
    - -
    - -
    - -
    -
    - -
    - -
    - 상세검색 - - - - - - - - - - - > - > -
    -
    From fc3a044cec765e2273d234103ecb9e02829b30bc Mon Sep 17 00:00:00 2001 From: whitedot Date: Tue, 15 Jan 2013 21:07:20 +0900 Subject: [PATCH 03/26] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20=EC=A0=84?= =?UTF-8?q?=EC=B2=B4=EA=B2=80=EC=83=89=EA=B2=B0=EA=B3=BC=20=EC=8A=A4?= =?UTF-8?q?=ED=82=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/search.php | 6 +++++- css/default.css | 7 ++++--- skin/search/neo/search.skin.php | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/bbs/search.php b/bbs/search.php index f4d800742..7c7055f2e 100644 --- a/bbs/search.php +++ b/bbs/search.php @@ -129,7 +129,11 @@ if ($stx) { $sql2 = " select bo_subject from {$g4['board_table']} where bo_table = '{$g4_search['tables'][$i]}' "; $row2 = sql_fetch($sql2); - $str_board_list .= '
  • '.$row2['bo_subject'].PHP_EOL.'갯수'.$row['cnt'].''; + $sch_class = ""; + $sch_all = ""; + if ($onetable == $g4_search['tables'][$i]) $sch_class = "class=sch_on"; + else $sch_all = "class=sch_on"; + $str_board_list .= '
  • '.$row2['bo_subject'].PHP_EOL.'갯수'.$row['cnt'].''; } } diff --git a/css/default.css b/css/default.css index 6c32e7924..b236d929b 100644 --- a/css/default.css +++ b/css/default.css @@ -175,7 +175,7 @@ a {color:#000;text-decoration:none} #wrapper h1 {font-size:1em} /* 레이아웃 하단 */ -#footer {z-index:1;position:relative;padding:15px 0 20px;border-top:1px solid #666;color:#595959;font-size:0.75em} +#footer {z-index:1;position:relative;padding:15px 0 20px;border-top:1px solid #bbb;color:#595959;font-size:0.75em} #footer h1 {margin:0;height:0;overflow:hidden} #footer section {margin-left:20px} #footer h2 {margin:0;width:100px;color:#000;font-size:1em} @@ -274,10 +274,10 @@ a {color:#000;text-decoration:none} #current_connect_tbl .td_name {text-align:center} /* 전체검색 */ -#sch_result_detail {margin:0;padding:15px 0;border:0;border-top:1px solid #ddd;text-align:center} +#sch_result_detail {margin:0;padding:15px 0;border:0;border-top:1px solid #ccc;border-bottom:1px solid #ccc;background:#eee;text-align:center} #sch_result_detail label {font-size:0.75em} #sch_result_hd {margin:0;border:0;background:#fff;font-size:0.75em} -#sch_result_hd dt {padding:10px;background:#eee} +#sch_result_hd dt {padding:10px;border-bottom:1px solid #eee;background:#fbfbfb} #sch_result_hd dd {margin:0;padding:0} #sch_result_hd ul {padding:0;list-style:none;zoom:1} #sch_result_hd ul:after {display:block;visibility:hidden;clear:both;content:""} @@ -292,6 +292,7 @@ a {color:#000;text-decoration:none} #sch_result_bo dd {margin:0} #sch_result_bo li {position:relative;margin-top:-1px} #sch_result_bo a {display:inline-block;padding:10px 0 10px 10px;width:160px;border:1px solid #ddd;background:#eee} +#sch_result_bo .sch_on {width:161px;border-right:0;background:#fff} #sch_result_bo .cnt_cmt {color:#000} #sch_result_atc li {padding:10px 0} #sch_result_atc dt a {display:inline-block;margin-bottom:15px;font-size:0.75em} diff --git a/skin/search/neo/search.skin.php b/skin/search/neo/search.skin.php index ea1aed3ea..b30bda9d4 100644 --- a/skin/search/neo/search.skin.php +++ b/skin/search/neo/search.skin.php @@ -83,7 +83,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
    검색결과가 있는 게시판 목록
    From e4672fc33460092ca95d97d8dcfb87e3fc9ce943 Mon Sep 17 00:00:00 2001 From: whitedot Date: Tue, 15 Jan 2013 21:12:49 +0900 Subject: [PATCH 04/26] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20=EC=A0=84?= =?UTF-8?q?=EC=B2=B4=EA=B2=80=EC=83=89=EA=B2=B0=EA=B3=BC=20=EC=8A=A4?= =?UTF-8?q?=ED=82=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/default.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/default.css b/css/default.css index b236d929b..9010c30a1 100644 --- a/css/default.css +++ b/css/default.css @@ -274,7 +274,7 @@ a {color:#000;text-decoration:none} #current_connect_tbl .td_name {text-align:center} /* 전체검색 */ -#sch_result_detail {margin:0;padding:15px 0;border:0;border-top:1px solid #ccc;border-bottom:1px solid #ccc;background:#eee;text-align:center} +#sch_result_detail {margin:0;padding:15px 0;border:0;border-top:1px solid #ccc;border-bottom:1px solid #ddd;background:#eee;text-align:center} #sch_result_detail label {font-size:0.75em} #sch_result_hd {margin:0;border:0;background:#fff;font-size:0.75em} #sch_result_hd dt {padding:10px;border-bottom:1px solid #eee;background:#fbfbfb} From 4b68eb949801a41dd8b5f6c44c507ceae6b038b6 Mon Sep 17 00:00:00 2001 From: whitedot Date: Tue, 15 Jan 2013 21:29:00 +0900 Subject: [PATCH 05/26] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20=EC=BA=A1?= =?UTF-8?q?=EC=B1=A0=EC=97=90=EC=84=9C=20=EB=8B=A4=EC=9A=B4=EB=A1=9C?= =?UTF-8?q?=EB=93=9C=20=EB=A7=81=ED=81=AC=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/gcaptcha/gcaptcha.lib.php | 1 - 1 file changed, 1 deletion(-) diff --git a/bbs/gcaptcha/gcaptcha.lib.php b/bbs/gcaptcha/gcaptcha.lib.php index d24275b2b..90e12a582 100644 --- a/bbs/gcaptcha/gcaptcha.lib.php +++ b/bbs/gcaptcha/gcaptcha.lib.php @@ -151,7 +151,6 @@ function captcha_html($class="captcha") $html .= '스팸방지'; $html .= '스팸방지 숫자'; $html .= '숫자를 음성으로 듣기'; - $html .= '다운로드'; $html .= ''; $html .= '

    스팸방지 숫자를 순서대로 입력하세요.

    '; $html .= ''; From f3c85d55c59db3a9e72855543a1489e1b0c4fa39 Mon Sep 17 00:00:00 2001 From: whitedot Date: Tue, 15 Jan 2013 21:32:37 +0900 Subject: [PATCH 06/26] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90:=20=EC=A3=BC?= =?UTF-8?q?=EC=9A=94=EB=B2=84=ED=8A=BC=20=EB=B0=B0=EA=B2=BD=EC=83=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/adm.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/css/adm.css b/css/adm.css index 7645b076d..afb96f492 100644 --- a/css/adm.css +++ b/css/adm.css @@ -51,7 +51,7 @@ h1 {margin-bottom:20px;color:#333;font-size:1.5em;font-family:"verdana","dotum"; .btn_confirm {margin-bottom:20px;text-align:center} .btn_confirm button {padding:0 15px;height:30px;border:0;background:#74868b;color:#fff;font-size:0.875em;line-height:2.2em;vertical-align:middle} .btn_confirm button:focus {padding:0 15px;height:30px;background:#555;color:#fff;font-size:0.875em;line-height:2.2em;vertical-align:middle} -.btn_submit {padding:0 15px;height:30px;border:0;background:#ff6633;color:#fff;font-size:0.875em;line-height:2.2em;vertical-align:middle} +.btn_submit {padding:0 15px;height:30px;border:0;background:#ff3061;color:#fff;font-size:0.875em;line-height:2.2em;vertical-align:middle} .btn_submit:focus {padding:0 15px;height:30px;border:0;background:#555;color:#fff;font-size:0.875em;line-height:2.2em;vertical-align:middle} .btn_list input, .btn_list button {padding:0 15px;height:30px;background:#74868b;color:#fff;font-size:0.875em;line-height:2.2em;vertical-align:middle} @@ -60,7 +60,7 @@ h1 {margin-bottom:20px;color:#333;font-size:1.5em;font-family:"verdana","dotum"; .btn_list a:focus {background:#555} #btn_add {margin-bottom:10px;text-align:center} -#btn_add a {display:inline-block;padding:0 15px;height:30px;border:0;background:#ff6633;color:#fff;font-size:0.875em;text-decoration:none;line-height:2.2em;vertical-align:middle} +#btn_add a {display:inline-block;padding:0 15px;height:30px;border:0;background:#ff3061;color:#fff;font-size:0.875em;text-decoration:none;line-height:2.2em;vertical-align:middle} /* 폼 */ label {vertical-align:middle} From 091daba4ab8a4ca9178079cbd826a1e6d1cd5538 Mon Sep 17 00:00:00 2001 From: whitedot Date: Tue, 15 Jan 2013 21:37:24 +0900 Subject: [PATCH 07/26] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90:=20=EB=A9=94?= =?UTF-8?q?=EC=9D=BC=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=8A=A4=ED=83=80?= =?UTF-8?q?=EC=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/session_delete.php | 24 ++++++++++++------------ css/adm.css | 3 +++ 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/adm/session_delete.php b/adm/session_delete.php index 3032f565f..e2646cd9d 100644 --- a/adm/session_delete.php +++ b/adm/session_delete.php @@ -19,28 +19,28 @@ if (!$dir=@opendir($session_path)) { $cnt=0; while($file=readdir($dir)) { - + if (!strstr($file,'sess_')) { - continue; - } + continue; + } if (strpos($file,'sess_')!=0) { - continue; - } + continue; + } - if (!$atime=@fileatime("$session_path/$file")) { - continue; - } - if (time() > $atime + (3600 * 6)) { // 지난시간을 초로 계산해서 적어주시면 됩니다. default : 6시간전 + if (!$atime=@fileatime("$session_path/$file")) { + continue; + } + if (time() > $atime + (3600 * 6)) { // 지난시간을 초로 계산해서 적어주시면 됩니다. default : 6시간전 $cnt++; - $return = unlink("$session_path/$file"); - echo "\n"; + $return = unlink("$session_path/$file"); + echo "\n"; flush(); if ($cnt%10==0) echo "\n"; - } + } } echo "\n"; ?> \ No newline at end of file diff --git a/css/adm.css b/css/adm.css index afb96f492..b01896ffb 100644 --- a/css/adm.css +++ b/css/adm.css @@ -147,6 +147,9 @@ td {padding:10px} .visit_bar {position:relative} .visit_bar span {position:absolute;top:-8px;left:0;height:15px;background:#ddd} +/* 메일 테스트 */ +#fsendmailtest p {margin-bottom:20px;padding:13px;border:1px solid #ced9de;background:#fff;font-size:0.75em} + /* pagination */ .pg {clear:both;margin:0 0 10px;padding-top:20px;font-size:0.75em;text-align:center} .pg_wrap {display:inline-block;border:1px solid #c7cfd5;letter-spacing:-4px} From 31da2b179735084e604b4817b40341d656abb81c Mon Sep 17 00:00:00 2001 From: whitedot Date: Tue, 15 Jan 2013 21:49:16 +0900 Subject: [PATCH 08/26] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90:=20=EC=84=B8?= =?UTF-8?q?=EC=85=98=ED=8C=8C=EC=9D=BC=EC=9D=BC=EA=B4=84=EC=82=AD=EC=A0=9C?= =?UTF-8?q?=20=EC=9E=91=EC=97=85=20=EC=A4=91,=20=EB=AF=B8=EC=99=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/session_delete.php | 17 +++++++++++++---- css/adm.css | 5 +++-- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/adm/session_delete.php b/adm/session_delete.php index e2646cd9d..e571d07ec 100644 --- a/adm/session_delete.php +++ b/adm/session_delete.php @@ -7,8 +7,17 @@ if ($is_admin != "super") $g4['title'] = "세션파일 일괄삭제"; include_once("./admin.head.php"); -echo "'완료' 메세지가 나오기 전에 프로그램의 실행을 중지하지 마십시오.

    "; -echo ""; +?> + +
    +

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

    + + +

    + +document.getElementById('ct').innerHTML = '';\n"; } } -echo "\n"; -?> \ No newline at end of file +echo "\n"; +?> diff --git a/css/adm.css b/css/adm.css index b01896ffb..8825f2515 100644 --- a/css/adm.css +++ b/css/adm.css @@ -147,8 +147,9 @@ td {padding:10px} .visit_bar {position:relative} .visit_bar span {position:absolute;top:-8px;left:0;height:15px;background:#ddd} -/* 메일 테스트 */ -#fsendmailtest p {margin-bottom:20px;padding:13px;border:1px solid #ced9de;background:#fff;font-size:0.75em} +/* 메일 테스트, 세션파일일괄삭제 */ +#fsendmailtest p, +#session_del p {margin-bottom:20px;padding:13px;border:1px solid #ced9de;background:#fff;font-size:0.75em} /* pagination */ .pg {clear:both;margin:0 0 10px;padding-top:20px;font-size:0.75em;text-align:center} From edfda502731ad5ab47365d2a8dd3069081d2f781 Mon Sep 17 00:00:00 2001 From: whitedot Date: Tue, 15 Jan 2013 21:56:49 +0900 Subject: [PATCH 09/26] =?UTF-8?q?wrest.js=20=EC=9C=A0=ED=9A=A8=EC=84=B1=20?= =?UTF-8?q?=EA=B2=80=EC=82=AC=20=ED=9B=84=20=ED=8F=AC=EC=BB=A4=EC=8A=A4=20?= =?UTF-8?q?=EC=8A=A4=ED=83=80=EC=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/wrest.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/js/wrest.js b/js/wrest.js index 8909e2182..5bbec8148 100644 --- a/js/wrest.js +++ b/js/wrest.js @@ -1,7 +1,8 @@ var wrestMsg = ""; var wrestFld = null; var wrestFldDefaultColor = ""; -var wrestFldBackColor = "#FFE4E1"; +var wrestFldColor = "#fff"; +var wrestFldBackColor = "#ff3061"; // subject 속성값을 얻어 return, 없으면 tag의 name을 넘김 function wrestItemname(fld) @@ -302,6 +303,7 @@ function wrestSubmit() if (wrestFld.style.display != "none") { wrestFld.style.backgroundColor = wrestFldBackColor; + wrestFld.style.color = wrestFldColor; if (typeof(wrestFld.select) != "undefined") wrestFld.select(); wrestFld.focus(); From e56f83ed5a2fd3eee7cf21f9d366aac790c8b293 Mon Sep 17 00:00:00 2001 From: whitedot Date: Tue, 15 Jan 2013 21:57:44 +0900 Subject: [PATCH 10/26] =?UTF-8?q?wrest.js=20=EC=9C=A0=ED=9A=A8=EC=84=B1=20?= =?UTF-8?q?=EA=B2=80=EC=82=AC=20=ED=9B=84=20=ED=8F=AC=EC=BB=A4=EC=8A=A4=20?= =?UTF-8?q?=EC=8A=A4=ED=83=80=EC=9D=BC=EC=97=90=EC=84=9C=20=EA=B8=80?= =?UTF-8?q?=EC=9E=90=EC=83=89=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/wrest.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/js/wrest.js b/js/wrest.js index 5bbec8148..33f7975f5 100644 --- a/js/wrest.js +++ b/js/wrest.js @@ -1,7 +1,6 @@ var wrestMsg = ""; var wrestFld = null; var wrestFldDefaultColor = ""; -var wrestFldColor = "#fff"; var wrestFldBackColor = "#ff3061"; // subject 속성값을 얻어 return, 없으면 tag의 name을 넘김 @@ -303,7 +302,6 @@ function wrestSubmit() if (wrestFld.style.display != "none") { wrestFld.style.backgroundColor = wrestFldBackColor; - wrestFld.style.color = wrestFldColor; if (typeof(wrestFld.select) != "undefined") wrestFld.select(); wrestFld.focus(); From 4f8e17f68485729dc5e4cc043733376c432fdb48 Mon Sep 17 00:00:00 2001 From: chicpro Date: Wed, 16 Jan 2013 10:02:56 +0900 Subject: [PATCH 11/26] =?UTF-8?q?=EB=B3=B5=EC=82=AC,=20=EC=9D=B4=EB=8F=99?= =?UTF-8?q?=20=ED=9B=84=20=EC=95=88=EB=82=B4=EB=A9=94=EC=84=B8=EC=A7=80=20?= =?UTF-8?q?=EB=B0=8F=20=EB=A7=81=ED=81=AC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/move_update.php | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/bbs/move_update.php b/bbs/move_update.php index 59549d444..92b3eb890 100644 --- a/bbs/move_update.php +++ b/bbs/move_update.php @@ -176,14 +176,20 @@ if ($sw == "move") } $msg = '해당 게시물을 선택한 게시판으로 '.$act.' 하였습니다.'; -$opener_href = './board.php?bo_table='.$bo_table.'&page='.$page.'&$qstr'; +$opener_href = './board.php?bo_table='.$bo_table.'&page='.$page.'&'.$qstr; echo << + + HEREDOC; ?> From 9f5ce9f4cfc29507b6363711680a3659dd081a44 Mon Sep 17 00:00:00 2001 From: whitedot Date: Wed, 16 Jan 2013 10:15:31 +0900 Subject: [PATCH 12/26] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20=EC=A0=84?= =?UTF-8?q?=EC=B2=B4=EA=B2=80=EC=83=89=20=EC=9E=91=EC=97=85=20=EC=A4=91,?= =?UTF-8?q?=20=EC=95=84=EC=9B=83=EB=A1=9C=EA=B7=B8=EC=9D=B8=20js=20?= =?UTF-8?q?=EB=8C=80=EC=B2=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/default.css | 51 ++++++++++++++------------- skin/outlogin/neo/outlogin.skin.1.php | 28 ++++++++------- skin/search/neo/search.skin.php | 33 +++++++++-------- 3 files changed, 59 insertions(+), 53 deletions(-) diff --git a/css/default.css b/css/default.css index 9010c30a1..56ff97b6d 100644 --- a/css/default.css +++ b/css/default.css @@ -100,17 +100,18 @@ a {color:#000;text-decoration:none} #ol_before fieldset {margin:0;padding:0;border:0;background:transparent} #ol_before legend {position:absolute;padding:0;width:0;height:0;border:0;background:transparent;overflow:hidden} #ol_before input:focus {background:#333;color:#fff} -#ol_mb_id{display:block;margin-bottom:3px;padding:0 5px;width:185px;height:22px;border:1px solid #d7d7d7;background:#fff;line-height:1.6em} -#ol_mb_id_label {z-index:2;position:absolute;top:23px;left:20px;color:#696969} -#ol_mb_pw {display:block;padding:0 5px;width:120px;height:22px;border:1px solid #d7d7d7;background:#fff;line-height:1.6em} -#ol_mb_pw_label {z-index:2;position:absolute;top:50px;left:20px;color:#696969} -#auto_login {position:absolute;top:74px;left:13px} -#auto_login_label {position:absolute;top:76px;left:30px;color:#696969;letter-spacing:-0.1em} -#ol_before ul {position:relative;top:0;left:112px;margin:10px 0;width:90px;zoom:1} +#ol_id {display:block;margin-bottom:3px;padding:0 5px;width:185px;height:22px;border:1px solid #d7d7d7;background:#fff;line-height:1.6em} +.ol_idlabel {position:absolute;top:23px;left:20px;color:#696969} +#ol_pw {padding:0 5px;width:121px;height:22px;border:1px solid #d7d7d7;background:#fff;line-height:1.6em} +.ol_pwlabel {position:absolute;top:50px;left:20px;color:#696969} +#auto_login {} +#auto_login_label {color:#696969;letter-spacing:-0.1em} +#ol_submit {width:60px;height:24px;border:1px solid #b7b7b7;background:#fff;font-size:1em;font-weight:bold;letter-spacing:-0.1em;line-height:2em} +#ol_before ul {float:right;margin:10px 0;width:199px;zoom:1} #ol_before ul:after {display:block;visibility:hidden;clear:both;content:""} -#ol_before li {float:left;margin-right:5px} +#ol_before li {float:right;margin-right:5px;padding-top:2px} +#ol_before #ol_auto {float:left;margin:0;padding:0} #ol_before a {color:#696969;letter-spacing:-0.1em} -#ol_submit {position:absolute;top:42px;right:12px;width:60px;height:24px;border:1px solid #b7b7b7;background:#fff;font-size:1em;font-weight:bold;letter-spacing:-0.1em;line-height:2em} /* 아웃로그인 후 */ #ol_after {width:219px;color:#000;font-size:0.75em} #ol_after_hd {position:relative;padding:15px 10px 11px} @@ -274,33 +275,35 @@ a {color:#000;text-decoration:none} #current_connect_tbl .td_name {text-align:center} /* 전체검색 */ -#sch_result_detail {margin:0;padding:15px 0;border:0;border-top:1px solid #ccc;border-bottom:1px solid #ddd;background:#eee;text-align:center} +#sch_result_detail {margin:0;padding:15px 0;border:0;text-align:right} #sch_result_detail label {font-size:0.75em} -#sch_result_hd {margin:0;border:0;background:#fff;font-size:0.75em} -#sch_result_hd dt {padding:10px;border-bottom:1px solid #eee;background:#fbfbfb} -#sch_result_hd dd {margin:0;padding:0} -#sch_result_hd ul {padding:0;list-style:none;zoom:1} -#sch_result_hd ul:after {display:block;visibility:hidden;clear:both;content:""} -#sch_result_hd li {float:left;padding:0 10px;border-right:1px solid #999} -#sch_result {position:relative;padding:30px 0 0 200px;border-top:1px solid #ddd;border-bottom:1px solid #ddd;background:url('../img/sch_result_bg.jpg') repeat-y} -#sch_result dl {margin:0;padding:0} +#sch_result {position:relative;padding:10px 0 0 200px;border-top:1px solid #ddd;border-bottom:1px solid #ddd;background:url('../img/sch_result_bg.jpg') repeat-y} +#sch_result dl {padding:0} #sch_result dt {font-weight:bold} #sch_result ul {margin:0;padding:0;list-style:none} #sch_result p {margin:5px 0;padding:0;font-size:0.75em} -#sch_result_bo {position:absolute;top:0;left:0;width:170px;font-size:0.875em} +#sch_result_hd {margin:0 0 20px;border-bottom:1px solid #eee;background:#fff;font-size:0.75em;zoom:1} +#sch_result_hd:after {display:block;visibility:hidden;clear:both;content:""} +#sch_result_hd dt {float:left;padding:10px 0 15px} +#sch_result_hd dd {float:right;margin:0;padding:10px 0 15px} +#sch_result_hd ul {float:left;padding:0;list-style:none} +#sch_result_hd li {float:left;padding:0 10px;border-right:1px solid #ddd} +#sch_result_bo {position:absolute;top:0;left:0;margin:0;width:170px;font-size:0.875em} #sch_result_bo dt {margin:0;padding:0;height:0;border:0;overflow:hidden} #sch_result_bo dd {margin:0} #sch_result_bo li {position:relative;margin-top:-1px} #sch_result_bo a {display:inline-block;padding:10px 0 10px 10px;width:160px;border:1px solid #ddd;background:#eee} -#sch_result_bo .sch_on {width:161px;border-right:0;background:#fff} +#sch_result_bo .sch_on {width:161px;border-right:0;background:#fff;font-weight:bold} #sch_result_bo .cnt_cmt {color:#000} -#sch_result_atc li {padding:10px 0} #sch_result_atc dt a {display:inline-block;margin-bottom:15px;font-size:0.75em} #sch_result_atc dd {margin:0 0 30px;border-bottom:1px solid #ddd} -#sch_result_atc p {color:#888} +#sch_result_atc li {padding:10px 0} +#sch_result_atc li a {font-size:0.875em} +#sch_result_atc p {margin-top:15px} .sch_more {padding:10px 0 15px;font-size:0.75em;text-align:right} -.sch_sideview {display:inline-block;font-size:0.75em} -.sch_datetime {font-size:0.75em} +.sch_more a {color:#818385} +.sch_sideview {display:inline-block;font-size:0.875em} +.sch_datetime {color:#818385;font-size:0.75em} /* 게시판 목록 */ #btn_bo_adm {text-align:center} diff --git a/skin/outlogin/neo/outlogin.skin.1.php b/skin/outlogin/neo/outlogin.skin.1.php index 7228ab62e..f5c222afa 100644 --- a/skin/outlogin/neo/outlogin.skin.1.php +++ b/skin/outlogin/neo/outlogin.skin.1.php @@ -8,14 +8,16 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
    - - - - - - + + + + @@ -25,10 +27,12 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 From b2af301b4e52983986013ce92d9a24ee7382714c Mon Sep 17 00:00:00 2001 From: chicpro Date: Wed, 16 Jan 2013 11:25:45 +0900 Subject: [PATCH 16/26] =?UTF-8?q?=EA=B2=8C=EC=8B=9C=ED=8C=90=20view=20?= =?UTF-8?q?=EC=97=90=EC=84=9C=20=EC=82=AD=EC=A0=9C=20=EC=8A=A4=ED=81=AC?= =?UTF-8?q?=EB=A6=BD=ED=8A=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/delete.php | 90 +++++++++++++++---------------- bbs/view.php | 4 +- skin/board/neo/view.skin.php | 2 +- skin/member/neo/password.skin.php | 10 +--- 4 files changed, 50 insertions(+), 56 deletions(-) diff --git a/bbs/delete.php b/bbs/delete.php index 4b41c221f..2b1c9edb4 100644 --- a/bbs/delete.php +++ b/bbs/delete.php @@ -3,7 +3,7 @@ include_once('./_common.php'); if ($is_admin) { - if (!($token && get_session('ss_delete_token') == $token)) + if (!($token && get_session('ss_delete_token') == $token)) alert('토큰 에러로 삭제 불가합니다.'); } @@ -14,49 +14,49 @@ if ($is_admin) if ($is_admin == 'super') // 최고관리자 통과 ; else if ($is_admin == 'group') { // 그룹관리자 - $mb = get_member($write[mb_id]); - if ($member[mb_id] != $group[gr_admin]) // 자신이 관리하는 그룹인가? + $mb = get_member($write['mb_id']); + if ($member['mb_id'] != $group['gr_admin']) // 자신이 관리하는 그룹인가? alert('자신이 관리하는 그룹의 게시판이 아니므로 삭제할 수 없습니다.'); - else if ($member[mb_level] < $mb[mb_level]) // 자신의 레벨이 크거나 같다면 통과 + else if ($member['mb_level'] < $mb['mb_level']) // 자신의 레벨이 크거나 같다면 통과 alert('자신의 권한보다 높은 권한의 회원이 작성한 글은 삭제할 수 없습니다.'); } else if ($is_admin == 'board') { // 게시판관리자이면 - $mb = get_member($write[mb_id]); - if ($member[mb_id] != $board[bo_admin]) // 자신이 관리하는 게시판인가? + $mb = get_member($write['mb_id']); + if ($member['mb_id'] != $board['bo_admin']) // 자신이 관리하는 게시판인가? alert('자신이 관리하는 게시판이 아니므로 삭제할 수 없습니다.'); - else if ($member[mb_level] < $mb[mb_level]) // 자신의 레벨이 크거나 같다면 통과 + else if ($member['mb_level'] < $mb['mb_level']) // 자신의 레벨이 크거나 같다면 통과 alert('자신의 권한보다 높은 권한의 회원이 작성한 글은 삭제할 수 없습니다.'); -} else if ($member[mb_id]) { - if ($member[mb_id] != $write[mb_id]) +} else if ($member['mb_id']) { + if ($member['mb_id'] != $write['mb_id']) alert('자신의 글이 아니므로 삭제할 수 없습니다.'); } else { - if ($write[mb_id]) + if ($write['mb_id']) alert('로그인 후 삭제하세요.', './login.php?url='.urlencode('./board.php?bo_table='.$bo_table.'&wr_id='.$wr_id)); - else if (sql_password($wr_password) != $write[wr_password]) - alert('패스워드가 틀리므로 삭제할 수 없습니다.'); + else if (sql_password($wr_password) != $write['wr_password']) + alert('패스워드가 틀리므로 삭제할 수 없습니다.'); } -$len = strlen($write[wr_reply]); -if ($len < 0) $len = 0; -$reply = substr($write[wr_reply], 0, $len); +$len = strlen($write['wr_reply']); +if ($len < 0) $len = 0; +$reply = substr($write['wr_reply'], 0, $len); // 원글만 구한다. -$sql = " select count(*) as cnt from {$write_table} - where wr_reply like '{$reply}%' - and wr_id <> '{$write[wr_id]}' - and wr_num = '{$write[wr_num]}' +$sql = " select count(*) as cnt from $write_table + where wr_reply like '$reply%' + and wr_id <> '{$write['wr_id']}' + and wr_num = '{$write['wr_num']}' and wr_is_comment = 0 "; $row = sql_fetch($sql); -if ($row[cnt] && !$is_admin) - alert('이 글과 관련된 답변글이 존재하므로 삭제 할 수 없습니다..PHP_EOL.PHP_EOL.우선 답변글부터 삭제하여 주십시오.'); +if ($row['cnt'] && !$is_admin) + alert('이 글과 관련된 답변글이 존재하므로 삭제 할 수 없습니다.'."\n\n".'우선 답변글부터 삭제하여 주십시오.'); // 코멘트 달린 원글의 삭제 여부 -$sql = " select count(*) as cnt from {$write_table} - where wr_parent = '{$wr_id}' - and mb_id <> '{$member[mb_id]}' +$sql = " select count(*) as cnt from $write_table + where wr_parent = '$wr_id' + and mb_id <> '{$member['mb_id']}' and wr_is_comment = 1 "; $row = sql_fetch($sql); -if ($row[cnt] >= $board[bo_count_delete] && !$is_admin) - alert('이 글과 관련된 코멘트가 존재하므로 삭제 할 수 없습니다.'.PHP_EOL.PHP_EOL.'코멘트가 '.$board[bo_count_delete].'건 이상 달린 원글은 삭제할 수 없습니다.'); +if ($row['cnt'] >= $board['bo_count_delete'] && !$is_admin) + alert('이 글과 관련된 코멘트가 존재하므로 삭제 할 수 없습니다.'."\n\n".'코멘트가 '.$board['bo_count_delete'].'건 이상 달린 원글은 삭제할 수 없습니다.'); // 사용자 코드 실행 @@ -65,59 +65,59 @@ if ($row[cnt] >= $board[bo_count_delete] && !$is_admin) // 나라오름님 수정 : 원글과 코멘트수가 정상적으로 업데이트 되지 않는 오류를 잡아 주셨습니다. //$sql = " select wr_id, mb_id, wr_comment from $write_table where wr_parent = '$write[wr_id]' order by wr_id "; -$sql = " select wr_id, mb_id, wr_is_comment from {$write_table} where wr_parent = '{$write[wr_id]}' order by wr_id "; +$sql = " select wr_id, mb_id, wr_is_comment from $write_table where wr_parent = '{$write['wr_id']}' order by wr_id "; $result = sql_query($sql); -while ($row = sql_fetch_array($result)) +while ($row = sql_fetch_array($result)) { // 원글이라면 - if (!$row[wr_is_comment]) + if (!$row['wr_is_comment']) { // 원글 포인트 삭제 - if (!delete_point($row[mb_id], $bo_table, $row[wr_id], '쓰기')) - insert_point($row[mb_id], $board[bo_write_point] * (-1), "{$board[bo_subject]} {$row[wr_id]} 글삭제"); + if (!delete_point($row['mb_id'], $bo_table, $row['wr_id'], '쓰기')) + insert_point($row['mb_id'], $board['bo_write_point'] * (-1), "{$board['bo_subject']} {$row['wr_id']} 글삭제"); // 업로드된 파일이 있다면 파일삭제 - $sql2 = " select * from {$g4[board_file_table]} where bo_table = '{$bo_table}' and wr_id = '{$row[wr_id]}' "; + $sql2 = " select * from {$g4['board_file_table']} where bo_table = '$bo_table' and wr_id = '{$row['wr_id']}' "; $result2 = sql_query($sql2); while ($row2 = sql_fetch_array($result2)) - @unlink($g4['path'].'/data/file/'.$bo_table.'/'.$row2[bf_file]); - + @unlink($g4['path'].'/data/file/'.$bo_table.'/'.$row2['bf_file']); + // 파일테이블 행 삭제 - sql_query(" delete from {$g4[board_file_table]} where bo_table = '{$bo_table}' and wr_id = '{$row[wr_id]}' "); + sql_query(" delete from {$g4['board_file_table']} where bo_table = '$bo_table' and wr_id = '{$row['wr_id']}' "); $count_write++; - } - else + } + else { // 코멘트 포인트 삭제 - if (!delete_point($row[mb_id], $bo_table, $row[wr_id], '코멘트')) - insert_point($row[mb_id], $board[bo_comment_point] * (-1), "{$board[bo_subject]} {$write[wr_id]}-{$row[wr_id]} 코멘트삭제"); + if (!delete_point($row['mb_id'], $bo_table, $row['wr_id'], '코멘트')) + insert_point($row['mb_id'], $board['bo_comment_point'] * (-1), "{$board['bo_subject']} {$write['wr_id']}-{$row['wr_id']} 코멘트삭제"); $count_comment++; } } // 게시글 삭제 -sql_query(" delete from {$write_table} where wr_parent = '{$write[wr_id]}' "); +sql_query(" delete from $write_table where wr_parent = '{$write['wr_id']}' "); // 최근게시물 삭제 -sql_query(" delete from {$g4[board_new_table]} where bo_table = '{$bo_table}' and wr_parent = '{$write[wr_id]}' "); +sql_query(" delete from {$g4['board_new_table']} where bo_table = '$bo_table' and wr_parent = '{$write['wr_id']}' "); // 스크랩 삭제 -sql_query(" delete from {$g4[scrap_table]} where bo_table = '{$bo_table}' and wr_id = '{$write[wr_id]}' "); +sql_query(" delete from {$g4['scrap_table']} where bo_table = '$bo_table' and wr_id = '{$write['wr_id']}' "); // 공지사항 삭제 -$notice_array = explode("\n", trim($board[bo_notice])); +$notice_array = explode("\n", trim($board['bo_notice'])); $bo_notice = ""; for ($k=0; $k 0 || $count_comment > 0) - sql_query(" update {$g4[board_table]} set bo_count_write = bo_count_write - '{$count_write}', bo_count_comment = bo_count_comment - '{$count_comment}' where bo_table = '{$bo_table}' "); + sql_query(" update {$g4['board_table']} set bo_count_write = bo_count_write - '$count_write', bo_count_comment = bo_count_comment - '$count_comment' where bo_table = '$bo_table' "); @include_once($board_skin_path.'/delete.tail.skin.php'); diff --git a/bbs/view.php b/bbs/view.php index 95f6f8928..6346d2c4b 100644 --- a/bbs/view.php +++ b/bbs/view.php @@ -72,11 +72,11 @@ $update_href = $delete_href = ''; // 로그인중이고 자신의 글이라면 또는 관리자라면 패스워드를 묻지 않고 바로 수정, 삭제 가능 if (($member['mb_id'] && ($member['mb_id'] == $write['mb_id'])) || $is_admin) { $update_href = './write.php?w=u&bo_table='.$bo_table.'&wr_id='.$wr_id.'&page='.$page.$qstr; - $delete_href = 'javascript:del(\'./delete.php?bo_table='.$bo_table.'&wr_id='.$wr_id.'&page='.$page.urldecode($qstr).'\');'; + $delete_href = './delete.php?bo_table='.$bo_table.'&wr_id='.$wr_id.'&page='.$page.urldecode($qstr); if ($is_admin) { set_session("ss_delete_token", $token = uniqid(time())); - $delete_href = 'javascript:del(\'./delete.php?bo_table='.$bo_table.'&wr_id='.$wr_id.'&token='.$token.'&page='.$page.urldecode($qstr).'\');'; + $delete_href ='./delete.php?bo_table='.$bo_table.'&wr_id='.$wr_id.'&token='.$token.'&page='.$page.urldecode($qstr); } } else if (!$write['mb_id']) { // 회원이 쓴 글이 아니라면 diff --git a/skin/board/neo/view.skin.php b/skin/board/neo/view.skin.php index c658f496e..4a28d0d16 100644 --- a/skin/board/neo/view.skin.php +++ b/skin/board/neo/view.skin.php @@ -84,7 +84,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 ?>
    • 수정
      • -
    • 삭제
      • +
    • 삭제
    • 복사
    • 이동
    • 검색
      • diff --git a/skin/member/neo/password.skin.php b/skin/member/neo/password.skin.php index ed770538f..1c0d328d1 100644 --- a/skin/member/neo/password.skin.php +++ b/skin/member/neo/password.skin.php @@ -1,8 +1,8 @@ - + @@ -23,10 +23,4 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 From 78f71ece2dba7ff106eac88028962ff7a61dabc4 Mon Sep 17 00:00:00 2001 From: whitedot Date: Wed, 16 Jan 2013 12:01:46 +0900 Subject: [PATCH 17/26] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20=EC=A0=84?= =?UTF-8?q?=EC=B2=B4=EA=B2=80=EC=83=89=EA=B2=B0=EA=B3=BC=20=EC=8A=A4?= =?UTF-8?q?=ED=82=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/default.css | 1 - skin/search/neo/search.skin.php | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/css/default.css b/css/default.css index af11e4620..011df0e5f 100644 --- a/css/default.css +++ b/css/default.css @@ -279,7 +279,6 @@ a {color:#000;text-decoration:none} #sch_result_detail label {font-size:0.75em} #sch_result {position:relative;padding:10px 0 0 200px;border-top:1px solid #ddd;border-bottom:1px solid #ddd;background:url('../img/sch_result_bg.jpg') repeat-y} #sch_result dl {padding:0} -#sch_result dt {font-weight:bold} #sch_result ul {margin:0;padding:0;list-style:none} #sch_result p {margin:5px 0;padding:0;font-size:0.75em} #sch_result_hd {margin:0 0 20px;border-bottom:1px solid #eee;background:#fff;font-size:0.75em;zoom:1} diff --git a/skin/search/neo/search.skin.php b/skin/search/neo/search.skin.php index 2ac7ecb87..60da8219c 100644 --- a/skin/search/neo/search.skin.php +++ b/skin/search/neo/search.skin.php @@ -62,7 +62,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
      -
      검색어 에 대한 결과입니다.
      +
      에 대한 검색 결과입니다.
      • 개의 게시판
        • From aee36ec5e7778864502343adfb07711e24d07e57 Mon Sep 17 00:00:00 2001 From: chicpro Date: Wed, 16 Jan 2013 14:53:56 +0900 Subject: [PATCH 18/26] =?UTF-8?q?=EC=8A=A4=ED=81=AC=EB=9E=A9=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=EC=97=90=20=EA=B2=B8=EC=86=90=ED=95=9C=20JS=20?= =?UTF-8?q?=EC=9E=91=EC=97=85=20=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/scrap.php | 50 ++++++++--------- bbs/scrap_popin.php | 27 ++++++--- bbs/scrap_popin_update.php | 83 +++++++++++++++------------- skin/board/neo/view.skin.php | 2 +- skin/member/neo/scrap.skin.php | 30 ++++++---- skin/member/neo/scrap_popin.skin.php | 7 +-- 6 files changed, 112 insertions(+), 87 deletions(-) diff --git a/bbs/scrap.php b/bbs/scrap.php index d8fa04e8b..4fc239807 100644 --- a/bbs/scrap.php +++ b/bbs/scrap.php @@ -1,34 +1,34 @@ @@ -11,6 +11,10 @@ if (!$member[mb_id]) { opener.location.href = '$href'; window.close(); + HEREDOC; exit; } @@ -24,27 +28,32 @@ echo << HEREDOC; -if ($write[wr_is_comment]) +if ($write['wr_is_comment']) alert_close('코멘트는 스크랩 할 수 없습니다.'); -$sql = " select count(*) as cnt from {$g4[scrap_table]} - where mb_id = '{$member[mb_id]}' - and bo_table = '{$bo_table}' - and wr_id = '{$wr_id}' "; +$sql = " select count(*) as cnt from {$g4['scrap_table']} + where mb_id = '{$member['mb_id']}' + and bo_table = '$bo_table' + and wr_id = '$wr_id' "; $row = sql_fetch($sql); -if ($row[cnt]) { +if ($row['cnt']) { echo << - if (confirm('이미 스크랩하신 글 입니다.'.PHP_EOL.PHP_EOL.'지금 스크랩을 확인하시겠습니까?')) + if (confirm('이미 스크랩하신 글 입니다.\\n\\n지금 스크랩을 확인하시겠습니까?')) document.location.href = './scrap.php'; else window.close(); + HEREDOC; exit; } -$member_skin_path = $g4['path'].'/skin/member/'.$config[cf_member_skin]; +$member_skin_path = $g4['path'].'/skin/member/'.$config['cf_member_skin']; include_once($member_skin_path.'/scrap_popin.skin.php'); include_once($g4['path'].'/tail.sub.php'); diff --git a/bbs/scrap_popin_update.php b/bbs/scrap_popin_update.php index 9953cfb05..7346de0ec 100644 --- a/bbs/scrap_popin_update.php +++ b/bbs/scrap_popin_update.php @@ -3,93 +3,102 @@ include_once('./_common.php'); include_once($g4['path'].'/head.sub.php'); -if (!$member[mb_id]) +if (!$is_member) { $href = './login.php?'.$qstr.'&url='.urlencode('./board.php?bo_table='.$bo_table.'&wr_id='.$wr_id); echo ''; exit; } -$sql = " select count(*) as cnt from $g4[scrap_table] - where mb_id = '$member[mb_id]' +$sql = " select count(*) as cnt from {$g4['scrap_table']} + where mb_id = '{$member['mb_id']}' and bo_table = '$bo_table' and wr_id = '$wr_id' "; $row = sql_fetch($sql); -if ($row[cnt]) +if ($row['cnt']) { echo ' - '; + + '; exit; } // 덧글이 넘어오고 코멘트를 쓸 권한이 있다면 -if ($wr_content && ($member[mb_level] >= $board[bo_comment_level])) +if ($wr_content && ($member['mb_level'] >= $board['bo_comment_level'])) { $wr = get_write($write_table, $wr_id); // 원글이 존재한다면 - if ($wr[wr_id]) + if ($wr['wr_id']) { - $mb_id = $member[mb_id]; - $wr_name = $member[mb_nick]; - $wr_password = $member[mb_password]; - $wr_email = $member[mb_email]; - $wr_homepage = $member[mb_homepage]; + $mb_id = $member['mb_id']; + $wr_name = $member['mb_nick']; + $wr_password = $member['mb_password']; + $wr_email = $member['mb_email']; + $wr_homepage = $member['mb_homepage']; - $sql = " select max(wr_comment) as max_comment from {$write_table} - where wr_parent = '{$wr_id}' and wr_is_comment = 1 "; + $sql = " select max(wr_comment) as max_comment from $write_table + where wr_parent = '$wr_id' and wr_is_comment = '1' "; $row = sql_fetch($sql); - $row[max_comment] += 1; + $row['max_comment'] += 1; $sql = " insert into $write_table - set ca_name = '{$wr[ca_name]}', + set ca_name = '{$wr['ca_name']}', wr_option = '', - wr_num = '{$wr[wr_num]}', + wr_num = '{$wr['wr_num']}', wr_reply = '', - wr_parent = '{$wr_id}', - wr_is_comment = 1, - wr_comment = '{$row[max_comment]}', - wr_content = '{$wr_content}', - mb_id = '{$mb_id}', - wr_password = '{$wr_password}', - wr_name = '{$wr_name}', - wr_email = '{$wr_email}', - wr_homepage = '{$wr_homepage}', - wr_datetime = '{$g4[time_ymdhis]}', - wr_ip = '{$_SERVER[REMOTE_ADDR]}' "; + wr_parent = '$wr_id', + wr_is_comment = '1', + wr_comment = '{$row['max_comment']}', + wr_content = '$wr_content', + mb_id = '$mb_id', + wr_password = '$wr_password', + wr_name = '$wr_name', + wr_email = '$wr_email', + wr_homepage = '$wr_homepage', + wr_datetime = '{$g4['time_ymdhis']}', + wr_ip = '{$_SERVER['REMOTE_ADDR']}' "; sql_query($sql); $comment_id = mysql_insert_id(); // 원글에 코멘트수 증가 - sql_query(" update {$write_table} set wr_comment = wr_comment + 1 where wr_id = '{$wr_id}' "); + sql_query(" update $write_table set wr_comment = wr_comment + 1 where wr_id = '$wr_id' "); // 새글 INSERT //sql_query(" insert into $g4[board_new_table] ( bo_table, wr_id, wr_parent, bn_datetime ) values ( '$bo_table', '$comment_id', '$wr_id', '$g4[time_ymdhis]' ) "); - sql_query(" insert into {$g4[board_new_table]} ( bo_table, wr_id, wr_parent, bn_datetime, mb_id ) values ( '{$bo_table}', '{$comment_id}', '{$wr_id}', '{$g4[time_ymdhis]}', '{$member[mb_id]}' ) "); + sql_query(" insert into {$g4['board_new_table']} ( bo_table, wr_id, wr_parent, bn_datetime, mb_id ) values ( '$bo_table', '$comment_id', '$wr_id', '{$g4['time_ymdhis']}', '{$member['mb_id']}' ) "); // 코멘트 1 증가 - sql_query(" update {$g4[board_table]} set bo_count_comment = bo_count_comment + 1 where bo_table = '{$bo_table}' "); + sql_query(" update {$g4['board_table']} set bo_count_comment = bo_count_comment + 1 where bo_table = '$bo_table' "); // 포인트 부여 - insert_point($member[mb_id], $board[bo_comment_point], '{$board[bo_subject]} {$wr_id}-{$comment_id} 코멘트쓰기', $bo_table, $comment_id, '코멘트'); + insert_point($member['mb_id'], $board['bo_comment_point'], "{$board['bo_subject']} {$wr_id}-{$comment_id} 코멘트쓰기", $bo_table, $comment_id, '코멘트'); } } -$sql = " insert into {$g4[scrap_table]} ( mb_id, bo_table, wr_id, ms_datetime ) - values ( '{$member[mb_id]}', '{$bo_table}', '{$wr_id}', '{$g4[time_ymdhis]}' ) "; +$sql = " insert into {$g4['scrap_table']} ( mb_id, bo_table, wr_id, ms_datetime ) + values ( '{$member['mb_id']}', '$bo_table', '$wr_id', '{$g4['time_ymdhis']}' ) "; sql_query($sql); echo << - if (confirm('이 글을 스크랩 하였습니다.'.PHP_EOL.PHP_EOL.'지금 스크랩을 확인하시겠습니까?')) + if (confirm('이 글을 스크랩 하였습니다.'."\n\n".'지금 스크랩을 확인하시겠습니까?')) document.location.href = './scrap.php'; else window.close(); + HEREDOC; ?> diff --git a/skin/board/neo/view.skin.php b/skin/board/neo/view.skin.php index 4a28d0d16..c45d3ebbf 100644 --- a/skin/board/neo/view.skin.php +++ b/skin/board/neo/view.skin.php @@ -120,7 +120,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 diff --git a/skin/member/neo/scrap.skin.php b/skin/member/neo/scrap.skin.php index b8c665d41..4abdc1e9e 100644 --- a/skin/member/neo/scrap.skin.php +++ b/skin/member/neo/scrap.skin.php @@ -1,5 +1,5 @@
        @@ -19,11 +19,11 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 - - - - - 삭제 + + + + + 삭제 @@ -32,10 +32,18 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
        - +
        -
        - 창닫기 -
        -
        \ No newline at end of file +
        + + + \ No newline at end of file diff --git a/skin/member/neo/scrap_popin.skin.php b/skin/member/neo/scrap_popin.skin.php index 20ced3830..662b48735 100644 --- a/skin/member/neo/scrap_popin.skin.php +++ b/skin/member/neo/scrap_popin.skin.php @@ -1,5 +1,5 @@
        @@ -14,7 +14,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 제목 - + @@ -23,8 +23,6 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 - -

        스크랩을 하시면서 감사 혹은 격려의 댓글을 남기실 수 있습니다.

        @@ -32,4 +30,5 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
        +
        \ No newline at end of file From c6976c7c6eb6d4569ed99b4a0fd6730ebd901fd1 Mon Sep 17 00:00:00 2001 From: whitedot Date: Wed, 16 Jan 2013 14:57:43 +0900 Subject: [PATCH 19/26] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20=EC=83=88?= =?UTF-8?q?=EC=B0=BD=EC=97=90=EC=84=9C=20=EC=B0=BD=EB=8B=AB=EA=B8=B0=20?= =?UTF-8?q?=EC=9E=90=EB=B0=94=EC=8A=A4=ED=81=AC=EB=A6=BD=ED=8A=B8=20?= =?UTF-8?q?=EB=8C=80=EC=B2=B4=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/default.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/css/default.css b/css/default.css index 011df0e5f..fc722178f 100644 --- a/css/default.css +++ b/css/default.css @@ -445,7 +445,7 @@ a {color:#000;text-decoration:none} .new_win_ul a:hover, .new_win_ul a:focus {background:#faf9f5} .btn_win {clear:both;margin-bottom:20px;text-align:center} /* 새창용 */ -.btn_win a {display:inline-block;padding:0 10px;height:28px;border:1px solid #ccc;background:#fafafa;color:#000;font-size:0.75em;text-decoration:none;line-height:2.5em} +.btn_win a {display:inline-block;padding:0 10px;height:28px;border:1px solid #ccc;background:#fafafa;color:#000;font-size:0.75em;text-decoration:none;line-height:2.5em;cursor:pointer} /* 포인트 내역 */ #point table {margin-bottom:0} @@ -454,6 +454,7 @@ a {color:#000;text-decoration:none} /* 쪽지 */ /* 스크랩 */ +#scrap .td_datetime {width:150px} #scrap_do table {margin-bottom:10px} #scrap_do textarea {height:100px} #scrap_do p {margin:0 auto 20px;width:90%;font-size:0.875em} From 95f7493b6588e4763be377cc4301e69139cf6c3f Mon Sep 17 00:00:00 2001 From: chicpro Date: Wed, 16 Jan 2013 14:58:19 +0900 Subject: [PATCH 20/26] =?UTF-8?q?=EC=B0=BD=EB=8B=AB=EA=B8=B0=20=EB=8F=99?= =?UTF-8?q?=EC=A0=81=20=EC=B6=94=EA=B0=80=20=EC=BD=94=EB=93=9C=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 --- skin/member/neo/scrap.skin.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/skin/member/neo/scrap.skin.php b/skin/member/neo/scrap.skin.php index 4abdc1e9e..5341f55d4 100644 --- a/skin/member/neo/scrap.skin.php +++ b/skin/member/neo/scrap.skin.php @@ -34,13 +34,11 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
        - -