diff --git a/adm/board_delete.php b/adm/board_delete.php index 1f123b4e5..6ead47183 100644 --- a/adm/board_delete.php +++ b/adm/board_delete.php @@ -15,7 +15,7 @@ check_token(); define('_BOARD_DELETE_', TRUE); // include 전에 $bo_table 값을 반드시 넘겨야 함 -$tmp_bo_table = mysql_real_escape_string(trim($_POST['bo_table'])); +$tmp_bo_table = escape_trim($_GET['bo_table']); $sql = " select * from {$g4['board_table']} where bo_table = '{$tmp_bo_table}' "; $row = sql_fetch($sql); if (!$row) { diff --git a/adm/board_form.php b/adm/board_form.php index 8c57f589f..4a3959d67 100644 --- a/adm/board_form.php +++ b/adm/board_form.php @@ -1,6 +1,6 @@ - + @@ -568,7 +568,7 @@ if (!preg_match("/([m|M])$/", $upload_max_filesize)) { - + @@ -819,8 +819,8 @@ function set_point(f) { function fboardform_submit(f) { - - + + if (parseInt(f.bo_count_modify.value) < 1) { alert("원글 수정 불가 댓글수는 1 이상 입력하셔야 합니다."); diff --git a/adm/board_form_update.php b/adm/board_form_update.php index 877351e4f..a01b698b5 100644 --- a/adm/board_form_update.php +++ b/adm/board_form_update.php @@ -276,18 +276,5 @@ if ($fields) { sql_query($sql); } - -if ($_FILES['bo_image_head']['name']) { - $bo_image_head_path = $board_path.'/'.$bo_image_head_urlencode; - move_uploaded_file($_FILES['bo_image_head']['tmp_name'], $bo_image_head_path); - chmod($bo_image_head_path, 0606); -} - -if ($_FILES['bo_image_tail']['name']) { - $bo_image_tail_path = $board_path.'/'.$bo_image_tail_urlencode; - move_uploaded_file($_FILES['bo_image_tail']['tmp_name'], $bo_image_tail_path); - chmod($bo_image_tail_path, 0606); -} - goto_url("./board_form.php?w=u&bo_table={$bo_table}&{$qstr}"); ?> diff --git a/adm/board_list.php b/adm/board_list.php index f3145f9fb..f16b7b308 100644 --- a/adm/board_list.php +++ b/adm/board_list.php @@ -4,11 +4,6 @@ include_once('./_common.php'); auth_check($auth[$sub_menu], 'r'); -// DHTML 에디터 사용 필드 추가 : 061021 -sql_query(" ALTER TABLE `{$g4['board_table']}` ADD `bo_use_dhtml_editor` TINYINT NOT NULL AFTER `bo_use_secret` ", false); -// RSS 보이기 사용 필드 추가 : 061106 -sql_query(" ALTER TABLE `{$g4['board_table']}` ADD `bo_use_rss_view` TINYINT NOT NULL AFTER `bo_use_dhtml_editor` ", false); - $sql_common = " from {$g4['board_table']} a "; $sql_search = " where (1) "; @@ -39,10 +34,7 @@ if (!$sst) { } $sql_order = " order by $sst $sod "; -$sql = " select count(*) as cnt - {$sql_common} - {$sql_search} - {$sql_order} "; +$sql = " select count(*) as cnt {$sql_common} {$sql_search} {$sql_order} "; $row = sql_fetch($sql); $total_count = $row['cnt']; @@ -51,11 +43,7 @@ $total_page = ceil($total_count / $rows); // 전체 페이지 계산 if ($page == "") { $page = 1; } // 페이지가 없으면 첫 페이지 (1 페이지) $from_record = ($page - 1) * $rows; // 시작 열을 구함 -$sql = " select * - {$sql_common} - {$sql_search} - {$sql_order} - limit {$from_record}, {$rows} "; +$sql = " select * {$sql_common} {$sql_search} {$sql_order} limit {$from_record}, {$rows} "; $result = sql_query($sql); $listall = ''; @@ -128,8 +116,7 @@ var list_delete_php = 'board_list_delete.php'; // 스킨디렉토리 $skin_options = ''; $arr = get_skin_dir('board'); -for ($k=0; $k 10) $option = substr($arr[$k], 0, 18) . '…'; @@ -141,8 +128,8 @@ for ($i=0; $row=sql_fetch_array($result); $i++) { $s_upd = '수정'; $s_del = ""; if ($is_admin == 'super') { - //$s_del = '삭제'; - $s_del = '삭제'; + //$s_del = '삭제'; + $s_del = "삭제"; } $s_copy = '복사'; ?> @@ -234,6 +221,16 @@ function post_delete(action_url, val) f.submit(); } } + +$(function(){ + $(".board_delete").click(function(){ + if(confirm("한번 삭제한 자료는 복구할 방법이 없습니다.\n\n정말 삭제하시겠습니까?")) { + $("#fpost").attr("action", this.href); + $("#fpost").submit(); + } + return false; + }); +});
@@ -243,7 +240,7 @@ function post_delete(action_url, val) - +
31, 28, 31, 30 , 31, 30, 31, 31, 30 ,31 ,30, 31); -// 윤년 계산 부분이다. 4년에 한번꼴로 2월이 28일이 아닌 29일이 있다. -if( $yyyy%4 == 0 && $yyyy%100 != 0 || $yyyy%400 == 0 ) - $endday[2] = 29; // 조건에 적합할 경우 28을 29로 변경 - -// 해당월의 1일 -$mktime = mktime(0,0,0,$mm,1,$yyyy); -$dt = getdate(strtotime(date("Y-m-1", $mktime))); - -$dt[wday] = $spacer; - -// 해당월의 마지막 날짜, -//$last_day = date("t", $mktime); -$last_day = $endday[$mm]; - -$yyyy_before = $yyyy; -$mm_before = $mm - 1; -if ($mm_before < 1) -{ - $yyyy_before--; - $mm_before = 12; -} - -$yyyy_after = $yyyy; -$mm_after = $mm + 1; -if ($mm_after > 12) -{ - $yyyy_after++; - $mm_after = 1; -} - -$fr_yyyy = $yyyy - 80; -$to_yyyy = $yyyy + 80; - -$yyyy_before_href = $_SERVER[PHP_SELF].'?yyyy='.($yyyy-1).'&mm='.$mm.'&cur_date='.$cur_date.'&fld='.$fld.'&delimiter='.$delimiter; -$yyyy_after_href = $_SERVER[PHP_SELF].'?yyyy='.($yyyy+1).'&mm='.$mm.'&cur_date='.$cur_date.'&fld='.$fld.'&delimiter='.$delimiter; - -$mm_after_href = $_SERVER[PHP_SELF].'?yyyy='.$yyyy_after.'&mm='.$mm_after.'&cur_date='.$cur_date.'&fld='.$fld.'&delimiter='.$delimiter; -$mm_before_href = $_SERVER[PHP_SELF].'?yyyy='.$yyyy_before.'&mm='.$mm_before.'&cur_date='.$cur_date.'&fld='.$fld.'&delimiter='.$delimiter; - -$yyyy_select = ''; - -$mm_select = ''; - -$member_skin_path = $g4['path'].'/skin/member/.'$config[cf_member_skin]; -include_once($member_skin_path.'/calendar.skin.php'); -?> - - - - diff --git a/bbs/calendar/2005.txt b/bbs/calendar/2005.txt deleted file mode 100644 index 62c5a058a..000000000 --- a/bbs/calendar/2005.txt +++ /dev/null @@ -1,21 +0,0 @@ -04-28|그누보드4 정식버전 출시일 -08-07|입추 -08-14|말복 -08-15|광복절|* -09-07|사회복지의 날, 백로 -09-17|추석연휴|* -09-18|추석|* -09-19|추석연휴|* -09-23|추분 -10-03|개천절|* -10-01|국군의날 -10-08|한로 -10-09|한글날|* -10-23|상강 -11-03|학생의날 -11-07|입동 -11-22|소설 -12-07|대설 -12-10|세계 인권선언 기념일 -12-22|동지 -12-25|성탄절|* \ No newline at end of file diff --git a/bbs/calendar/2006.txt b/bbs/calendar/2006.txt deleted file mode 100644 index 3c2de6af1..000000000 --- a/bbs/calendar/2006.txt +++ /dev/null @@ -1,67 +0,0 @@ -01-01|신정|* -01-05|소한 -01-20|대한 -01-28|설 연휴|* -01-29|설날|* -01-30|설 연휴|* -03-01|삼일절|* -03-03|납세자의날 -03-06|경칩 -03-21|춘분 -03-22|물의 날 -03-23|기상의날 -04-05|식목일,청명 -04-06|한식 -04-07|보건의날 -04-19|4.19혁명 기념일 -04-20|곡우,장애인의날 -04-21|과학의 날 -04-22|정보통신의날 -04-25|법의날 -04-28|충무공탄신일 -05-01|근로자의날 -05-05|어린이날, 석가탄신일|* -05-06|입하 -05-08|어버이날 -05-15|스승의날, 성년의날 -05-18|5.18 민주화운동 기념일 -05-21|소만 -05-31|단오 -06-06|현충일,망종 -06-21|하지 -06-25|6.25사변일 -07-07|소서 -07-17|제헌절|* -07-20|초복 -07-23|대서 -07-30|중복 -07-31|칠석 -08-08|입추 -08-09|말복 -08-15|광복절|* -08-23|처서 -09-07|사회복지의 날, 백로 -09-18|철도의날 -09-23|추분 -10-01|국군의날 -10-03|개천절|* -10-05|추석연휴|* -10-06|추석|* -10-07|추석연휴|* -10-08|한로 -10-09|한글날 -10-20|문화의날 -10-23|상강 -10-24|국제연합일 -10-31|저축의날 -11-03|학생의날 -11-07|입동 -11-09|소방의날 -11-11|농업인의날 -11-17|순국선열의날 -11-22|소설 -11-30|무역의날 -12-07|대설 -12-10|세계 인권선언 기념일 -12-22|동지 -12-25|성탄절|* \ No newline at end of file diff --git a/extend/ckeditor/CHANGES.md b/bbs/ckeditor/CHANGES.md similarity index 100% rename from extend/ckeditor/CHANGES.md rename to bbs/ckeditor/CHANGES.md diff --git a/extend/ckeditor/LICENSE.md b/bbs/ckeditor/LICENSE.md similarity index 100% rename from extend/ckeditor/LICENSE.md rename to bbs/ckeditor/LICENSE.md diff --git a/extend/ckeditor/README.md b/bbs/ckeditor/README.md similarity index 100% rename from extend/ckeditor/README.md rename to bbs/ckeditor/README.md diff --git a/extend/ckeditor/build-config.js b/bbs/ckeditor/build-config.js similarity index 100% rename from extend/ckeditor/build-config.js rename to bbs/ckeditor/build-config.js diff --git a/extend/ckeditor/ckeditor.js b/bbs/ckeditor/ckeditor.js similarity index 100% rename from extend/ckeditor/ckeditor.js rename to bbs/ckeditor/ckeditor.js diff --git a/bbs/ckeditor/ckeditor.lib.php b/bbs/ckeditor/ckeditor.lib.php new file mode 100644 index 000000000..47c828ac9 --- /dev/null +++ b/bbs/ckeditor/ckeditor.lib.php @@ -0,0 +1,35 @@ +$content\n"; + //if (_EDITOR_) $str .= "\n"; + } else { + $str = "\n"; + } + return $str; +} + +// textarea 로 값을 넘긴다. javascript 반드시 필요 +function get_editor_js($id) +{ + if ( (isset($GLOBALS['is_dhtml_editor']) && $GLOBALS['is_dhtml_editor']) || !isset($GLOBALS['is_dhtml_editor']) ) { + $str = "var {$id}_editor_data = CKEDITOR.instances.{$id}.getData();\n"; + } else { + $str = "var {$id}_editor = document.getElementById('{$id}');\n"; + } + return $str; +} + +// textarea 의 값이 비어 있는지 검사 +function chk_editor_js($id, $textarea_name="내용을") +{ + if ( (isset($GLOBALS['is_dhtml_editor']) && $GLOBALS['is_dhtml_editor']) || !isset($GLOBALS['is_dhtml_editor']) ) { + return "if (!{$id}_editor_data) { alert(\"$textarea_name 입력해 주십시오.\"); CKEDITOR.instances.{$id}.focus(); return false; }\n"; + } else { + return "if (!{$id}_editor.value) { alert(\"$textarea_name 입력해 주십시오.\"); {$id}_editor.focus(); return false; }\n"; + } +} +?> \ No newline at end of file diff --git a/extend/ckeditor/config.js b/bbs/ckeditor/config.js similarity index 100% rename from extend/ckeditor/config.js rename to bbs/ckeditor/config.js diff --git a/extend/ckeditor/contents.css b/bbs/ckeditor/contents.css similarity index 100% rename from extend/ckeditor/contents.css rename to bbs/ckeditor/contents.css diff --git a/extend/ckeditor/lang/af.js b/bbs/ckeditor/lang/af.js similarity index 100% rename from extend/ckeditor/lang/af.js rename to bbs/ckeditor/lang/af.js diff --git a/extend/ckeditor/lang/ar.js b/bbs/ckeditor/lang/ar.js similarity index 100% rename from extend/ckeditor/lang/ar.js rename to bbs/ckeditor/lang/ar.js diff --git a/extend/ckeditor/lang/bg.js b/bbs/ckeditor/lang/bg.js similarity index 100% rename from extend/ckeditor/lang/bg.js rename to bbs/ckeditor/lang/bg.js diff --git a/extend/ckeditor/lang/bn.js b/bbs/ckeditor/lang/bn.js similarity index 100% rename from extend/ckeditor/lang/bn.js rename to bbs/ckeditor/lang/bn.js diff --git a/extend/ckeditor/lang/bs.js b/bbs/ckeditor/lang/bs.js similarity index 100% rename from extend/ckeditor/lang/bs.js rename to bbs/ckeditor/lang/bs.js diff --git a/extend/ckeditor/lang/ca.js b/bbs/ckeditor/lang/ca.js similarity index 100% rename from extend/ckeditor/lang/ca.js rename to bbs/ckeditor/lang/ca.js diff --git a/extend/ckeditor/lang/cs.js b/bbs/ckeditor/lang/cs.js similarity index 100% rename from extend/ckeditor/lang/cs.js rename to bbs/ckeditor/lang/cs.js diff --git a/extend/ckeditor/lang/cy.js b/bbs/ckeditor/lang/cy.js similarity index 100% rename from extend/ckeditor/lang/cy.js rename to bbs/ckeditor/lang/cy.js diff --git a/extend/ckeditor/lang/da.js b/bbs/ckeditor/lang/da.js similarity index 100% rename from extend/ckeditor/lang/da.js rename to bbs/ckeditor/lang/da.js diff --git a/extend/ckeditor/lang/de.js b/bbs/ckeditor/lang/de.js similarity index 100% rename from extend/ckeditor/lang/de.js rename to bbs/ckeditor/lang/de.js diff --git a/extend/ckeditor/lang/el.js b/bbs/ckeditor/lang/el.js similarity index 100% rename from extend/ckeditor/lang/el.js rename to bbs/ckeditor/lang/el.js diff --git a/extend/ckeditor/lang/en-au.js b/bbs/ckeditor/lang/en-au.js similarity index 100% rename from extend/ckeditor/lang/en-au.js rename to bbs/ckeditor/lang/en-au.js diff --git a/extend/ckeditor/lang/en-ca.js b/bbs/ckeditor/lang/en-ca.js similarity index 100% rename from extend/ckeditor/lang/en-ca.js rename to bbs/ckeditor/lang/en-ca.js diff --git a/extend/ckeditor/lang/en-gb.js b/bbs/ckeditor/lang/en-gb.js similarity index 100% rename from extend/ckeditor/lang/en-gb.js rename to bbs/ckeditor/lang/en-gb.js diff --git a/extend/ckeditor/lang/en.js b/bbs/ckeditor/lang/en.js similarity index 100% rename from extend/ckeditor/lang/en.js rename to bbs/ckeditor/lang/en.js diff --git a/extend/ckeditor/lang/eo.js b/bbs/ckeditor/lang/eo.js similarity index 100% rename from extend/ckeditor/lang/eo.js rename to bbs/ckeditor/lang/eo.js diff --git a/extend/ckeditor/lang/es.js b/bbs/ckeditor/lang/es.js similarity index 100% rename from extend/ckeditor/lang/es.js rename to bbs/ckeditor/lang/es.js diff --git a/extend/ckeditor/lang/et.js b/bbs/ckeditor/lang/et.js similarity index 100% rename from extend/ckeditor/lang/et.js rename to bbs/ckeditor/lang/et.js diff --git a/extend/ckeditor/lang/eu.js b/bbs/ckeditor/lang/eu.js similarity index 100% rename from extend/ckeditor/lang/eu.js rename to bbs/ckeditor/lang/eu.js diff --git a/extend/ckeditor/lang/fa.js b/bbs/ckeditor/lang/fa.js similarity index 100% rename from extend/ckeditor/lang/fa.js rename to bbs/ckeditor/lang/fa.js diff --git a/extend/ckeditor/lang/fi.js b/bbs/ckeditor/lang/fi.js similarity index 100% rename from extend/ckeditor/lang/fi.js rename to bbs/ckeditor/lang/fi.js diff --git a/extend/ckeditor/lang/fo.js b/bbs/ckeditor/lang/fo.js similarity index 100% rename from extend/ckeditor/lang/fo.js rename to bbs/ckeditor/lang/fo.js diff --git a/extend/ckeditor/lang/fr-ca.js b/bbs/ckeditor/lang/fr-ca.js similarity index 100% rename from extend/ckeditor/lang/fr-ca.js rename to bbs/ckeditor/lang/fr-ca.js diff --git a/extend/ckeditor/lang/fr.js b/bbs/ckeditor/lang/fr.js similarity index 100% rename from extend/ckeditor/lang/fr.js rename to bbs/ckeditor/lang/fr.js diff --git a/extend/ckeditor/lang/gl.js b/bbs/ckeditor/lang/gl.js similarity index 100% rename from extend/ckeditor/lang/gl.js rename to bbs/ckeditor/lang/gl.js diff --git a/extend/ckeditor/lang/gu.js b/bbs/ckeditor/lang/gu.js similarity index 100% rename from extend/ckeditor/lang/gu.js rename to bbs/ckeditor/lang/gu.js diff --git a/extend/ckeditor/lang/he.js b/bbs/ckeditor/lang/he.js similarity index 100% rename from extend/ckeditor/lang/he.js rename to bbs/ckeditor/lang/he.js diff --git a/extend/ckeditor/lang/hi.js b/bbs/ckeditor/lang/hi.js similarity index 100% rename from extend/ckeditor/lang/hi.js rename to bbs/ckeditor/lang/hi.js diff --git a/extend/ckeditor/lang/hr.js b/bbs/ckeditor/lang/hr.js similarity index 100% rename from extend/ckeditor/lang/hr.js rename to bbs/ckeditor/lang/hr.js diff --git a/extend/ckeditor/lang/hu.js b/bbs/ckeditor/lang/hu.js similarity index 100% rename from extend/ckeditor/lang/hu.js rename to bbs/ckeditor/lang/hu.js diff --git a/extend/ckeditor/lang/is.js b/bbs/ckeditor/lang/is.js similarity index 100% rename from extend/ckeditor/lang/is.js rename to bbs/ckeditor/lang/is.js diff --git a/extend/ckeditor/lang/it.js b/bbs/ckeditor/lang/it.js similarity index 100% rename from extend/ckeditor/lang/it.js rename to bbs/ckeditor/lang/it.js diff --git a/extend/ckeditor/lang/ja.js b/bbs/ckeditor/lang/ja.js similarity index 100% rename from extend/ckeditor/lang/ja.js rename to bbs/ckeditor/lang/ja.js diff --git a/extend/ckeditor/lang/ka.js b/bbs/ckeditor/lang/ka.js similarity index 100% rename from extend/ckeditor/lang/ka.js rename to bbs/ckeditor/lang/ka.js diff --git a/extend/ckeditor/lang/km.js b/bbs/ckeditor/lang/km.js similarity index 100% rename from extend/ckeditor/lang/km.js rename to bbs/ckeditor/lang/km.js diff --git a/extend/ckeditor/lang/ko.js b/bbs/ckeditor/lang/ko.js similarity index 100% rename from extend/ckeditor/lang/ko.js rename to bbs/ckeditor/lang/ko.js diff --git a/extend/ckeditor/lang/ku.js b/bbs/ckeditor/lang/ku.js similarity index 100% rename from extend/ckeditor/lang/ku.js rename to bbs/ckeditor/lang/ku.js diff --git a/extend/ckeditor/lang/lt.js b/bbs/ckeditor/lang/lt.js similarity index 100% rename from extend/ckeditor/lang/lt.js rename to bbs/ckeditor/lang/lt.js diff --git a/extend/ckeditor/lang/lv.js b/bbs/ckeditor/lang/lv.js similarity index 100% rename from extend/ckeditor/lang/lv.js rename to bbs/ckeditor/lang/lv.js diff --git a/extend/ckeditor/lang/mk.js b/bbs/ckeditor/lang/mk.js similarity index 100% rename from extend/ckeditor/lang/mk.js rename to bbs/ckeditor/lang/mk.js diff --git a/extend/ckeditor/lang/mn.js b/bbs/ckeditor/lang/mn.js similarity index 100% rename from extend/ckeditor/lang/mn.js rename to bbs/ckeditor/lang/mn.js diff --git a/extend/ckeditor/lang/ms.js b/bbs/ckeditor/lang/ms.js similarity index 100% rename from extend/ckeditor/lang/ms.js rename to bbs/ckeditor/lang/ms.js diff --git a/extend/ckeditor/lang/nb.js b/bbs/ckeditor/lang/nb.js similarity index 100% rename from extend/ckeditor/lang/nb.js rename to bbs/ckeditor/lang/nb.js diff --git a/extend/ckeditor/lang/nl.js b/bbs/ckeditor/lang/nl.js similarity index 100% rename from extend/ckeditor/lang/nl.js rename to bbs/ckeditor/lang/nl.js diff --git a/extend/ckeditor/lang/no.js b/bbs/ckeditor/lang/no.js similarity index 100% rename from extend/ckeditor/lang/no.js rename to bbs/ckeditor/lang/no.js diff --git a/extend/ckeditor/lang/pl.js b/bbs/ckeditor/lang/pl.js similarity index 100% rename from extend/ckeditor/lang/pl.js rename to bbs/ckeditor/lang/pl.js diff --git a/extend/ckeditor/lang/pt-br.js b/bbs/ckeditor/lang/pt-br.js similarity index 100% rename from extend/ckeditor/lang/pt-br.js rename to bbs/ckeditor/lang/pt-br.js diff --git a/extend/ckeditor/lang/pt.js b/bbs/ckeditor/lang/pt.js similarity index 100% rename from extend/ckeditor/lang/pt.js rename to bbs/ckeditor/lang/pt.js diff --git a/extend/ckeditor/lang/ro.js b/bbs/ckeditor/lang/ro.js similarity index 100% rename from extend/ckeditor/lang/ro.js rename to bbs/ckeditor/lang/ro.js diff --git a/extend/ckeditor/lang/ru.js b/bbs/ckeditor/lang/ru.js similarity index 100% rename from extend/ckeditor/lang/ru.js rename to bbs/ckeditor/lang/ru.js diff --git a/extend/ckeditor/lang/sk.js b/bbs/ckeditor/lang/sk.js similarity index 100% rename from extend/ckeditor/lang/sk.js rename to bbs/ckeditor/lang/sk.js diff --git a/extend/ckeditor/lang/sl.js b/bbs/ckeditor/lang/sl.js similarity index 100% rename from extend/ckeditor/lang/sl.js rename to bbs/ckeditor/lang/sl.js diff --git a/extend/ckeditor/lang/sr-latn.js b/bbs/ckeditor/lang/sr-latn.js similarity index 100% rename from extend/ckeditor/lang/sr-latn.js rename to bbs/ckeditor/lang/sr-latn.js diff --git a/extend/ckeditor/lang/sr.js b/bbs/ckeditor/lang/sr.js similarity index 100% rename from extend/ckeditor/lang/sr.js rename to bbs/ckeditor/lang/sr.js diff --git a/extend/ckeditor/lang/sv.js b/bbs/ckeditor/lang/sv.js similarity index 100% rename from extend/ckeditor/lang/sv.js rename to bbs/ckeditor/lang/sv.js diff --git a/extend/ckeditor/lang/th.js b/bbs/ckeditor/lang/th.js similarity index 100% rename from extend/ckeditor/lang/th.js rename to bbs/ckeditor/lang/th.js diff --git a/extend/ckeditor/lang/tr.js b/bbs/ckeditor/lang/tr.js similarity index 100% rename from extend/ckeditor/lang/tr.js rename to bbs/ckeditor/lang/tr.js diff --git a/extend/ckeditor/lang/ug.js b/bbs/ckeditor/lang/ug.js similarity index 100% rename from extend/ckeditor/lang/ug.js rename to bbs/ckeditor/lang/ug.js diff --git a/extend/ckeditor/lang/uk.js b/bbs/ckeditor/lang/uk.js similarity index 100% rename from extend/ckeditor/lang/uk.js rename to bbs/ckeditor/lang/uk.js diff --git a/extend/ckeditor/lang/vi.js b/bbs/ckeditor/lang/vi.js similarity index 100% rename from extend/ckeditor/lang/vi.js rename to bbs/ckeditor/lang/vi.js diff --git a/extend/ckeditor/lang/zh-cn.js b/bbs/ckeditor/lang/zh-cn.js similarity index 100% rename from extend/ckeditor/lang/zh-cn.js rename to bbs/ckeditor/lang/zh-cn.js diff --git a/extend/ckeditor/lang/zh.js b/bbs/ckeditor/lang/zh.js similarity index 100% rename from extend/ckeditor/lang/zh.js rename to bbs/ckeditor/lang/zh.js diff --git a/extend/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js b/bbs/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js similarity index 100% rename from extend/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js rename to bbs/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js diff --git a/extend/ckeditor/plugins/a11yhelp/dialogs/lang/_translationstatus.txt b/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/_translationstatus.txt similarity index 100% rename from extend/ckeditor/plugins/a11yhelp/dialogs/lang/_translationstatus.txt rename to bbs/ckeditor/plugins/a11yhelp/dialogs/lang/_translationstatus.txt diff --git a/extend/ckeditor/plugins/a11yhelp/dialogs/lang/ar.js b/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/ar.js similarity index 100% rename from extend/ckeditor/plugins/a11yhelp/dialogs/lang/ar.js rename to bbs/ckeditor/plugins/a11yhelp/dialogs/lang/ar.js diff --git a/extend/ckeditor/plugins/a11yhelp/dialogs/lang/bg.js b/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/bg.js similarity index 100% rename from extend/ckeditor/plugins/a11yhelp/dialogs/lang/bg.js rename to bbs/ckeditor/plugins/a11yhelp/dialogs/lang/bg.js diff --git a/extend/ckeditor/plugins/a11yhelp/dialogs/lang/ca.js b/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/ca.js similarity index 100% rename from extend/ckeditor/plugins/a11yhelp/dialogs/lang/ca.js rename to bbs/ckeditor/plugins/a11yhelp/dialogs/lang/ca.js diff --git a/extend/ckeditor/plugins/a11yhelp/dialogs/lang/cs.js b/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/cs.js similarity index 100% rename from extend/ckeditor/plugins/a11yhelp/dialogs/lang/cs.js rename to bbs/ckeditor/plugins/a11yhelp/dialogs/lang/cs.js diff --git a/extend/ckeditor/plugins/a11yhelp/dialogs/lang/cy.js b/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/cy.js similarity index 100% rename from extend/ckeditor/plugins/a11yhelp/dialogs/lang/cy.js rename to bbs/ckeditor/plugins/a11yhelp/dialogs/lang/cy.js diff --git a/extend/ckeditor/plugins/a11yhelp/dialogs/lang/da.js b/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/da.js similarity index 100% rename from extend/ckeditor/plugins/a11yhelp/dialogs/lang/da.js rename to bbs/ckeditor/plugins/a11yhelp/dialogs/lang/da.js diff --git a/extend/ckeditor/plugins/a11yhelp/dialogs/lang/de.js b/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/de.js similarity index 100% rename from extend/ckeditor/plugins/a11yhelp/dialogs/lang/de.js rename to bbs/ckeditor/plugins/a11yhelp/dialogs/lang/de.js diff --git a/extend/ckeditor/plugins/a11yhelp/dialogs/lang/el.js b/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/el.js similarity index 100% rename from extend/ckeditor/plugins/a11yhelp/dialogs/lang/el.js rename to bbs/ckeditor/plugins/a11yhelp/dialogs/lang/el.js diff --git a/extend/ckeditor/plugins/a11yhelp/dialogs/lang/en.js b/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/en.js similarity index 100% rename from extend/ckeditor/plugins/a11yhelp/dialogs/lang/en.js rename to bbs/ckeditor/plugins/a11yhelp/dialogs/lang/en.js diff --git a/extend/ckeditor/plugins/a11yhelp/dialogs/lang/eo.js b/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/eo.js similarity index 100% rename from extend/ckeditor/plugins/a11yhelp/dialogs/lang/eo.js rename to bbs/ckeditor/plugins/a11yhelp/dialogs/lang/eo.js diff --git a/extend/ckeditor/plugins/a11yhelp/dialogs/lang/et.js b/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/et.js similarity index 100% rename from extend/ckeditor/plugins/a11yhelp/dialogs/lang/et.js rename to bbs/ckeditor/plugins/a11yhelp/dialogs/lang/et.js diff --git a/extend/ckeditor/plugins/a11yhelp/dialogs/lang/fa.js b/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/fa.js similarity index 100% rename from extend/ckeditor/plugins/a11yhelp/dialogs/lang/fa.js rename to bbs/ckeditor/plugins/a11yhelp/dialogs/lang/fa.js diff --git a/extend/ckeditor/plugins/a11yhelp/dialogs/lang/fi.js b/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/fi.js similarity index 100% rename from extend/ckeditor/plugins/a11yhelp/dialogs/lang/fi.js rename to bbs/ckeditor/plugins/a11yhelp/dialogs/lang/fi.js diff --git a/extend/ckeditor/plugins/a11yhelp/dialogs/lang/fr.js b/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/fr.js similarity index 100% rename from extend/ckeditor/plugins/a11yhelp/dialogs/lang/fr.js rename to bbs/ckeditor/plugins/a11yhelp/dialogs/lang/fr.js diff --git a/extend/ckeditor/plugins/a11yhelp/dialogs/lang/gu.js b/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/gu.js similarity index 100% rename from extend/ckeditor/plugins/a11yhelp/dialogs/lang/gu.js rename to bbs/ckeditor/plugins/a11yhelp/dialogs/lang/gu.js diff --git a/extend/ckeditor/plugins/a11yhelp/dialogs/lang/he.js b/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/he.js similarity index 100% rename from extend/ckeditor/plugins/a11yhelp/dialogs/lang/he.js rename to bbs/ckeditor/plugins/a11yhelp/dialogs/lang/he.js diff --git a/extend/ckeditor/plugins/a11yhelp/dialogs/lang/hi.js b/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/hi.js similarity index 100% rename from extend/ckeditor/plugins/a11yhelp/dialogs/lang/hi.js rename to bbs/ckeditor/plugins/a11yhelp/dialogs/lang/hi.js diff --git a/extend/ckeditor/plugins/a11yhelp/dialogs/lang/hr.js b/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/hr.js similarity index 100% rename from extend/ckeditor/plugins/a11yhelp/dialogs/lang/hr.js rename to bbs/ckeditor/plugins/a11yhelp/dialogs/lang/hr.js diff --git a/extend/ckeditor/plugins/a11yhelp/dialogs/lang/hu.js b/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/hu.js similarity index 100% rename from extend/ckeditor/plugins/a11yhelp/dialogs/lang/hu.js rename to bbs/ckeditor/plugins/a11yhelp/dialogs/lang/hu.js diff --git a/extend/ckeditor/plugins/a11yhelp/dialogs/lang/it.js b/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/it.js similarity index 100% rename from extend/ckeditor/plugins/a11yhelp/dialogs/lang/it.js rename to bbs/ckeditor/plugins/a11yhelp/dialogs/lang/it.js diff --git a/extend/ckeditor/plugins/a11yhelp/dialogs/lang/ku.js b/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/ku.js similarity index 100% rename from extend/ckeditor/plugins/a11yhelp/dialogs/lang/ku.js rename to bbs/ckeditor/plugins/a11yhelp/dialogs/lang/ku.js diff --git a/extend/ckeditor/plugins/a11yhelp/dialogs/lang/lt.js b/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/lt.js similarity index 100% rename from extend/ckeditor/plugins/a11yhelp/dialogs/lang/lt.js rename to bbs/ckeditor/plugins/a11yhelp/dialogs/lang/lt.js diff --git a/extend/ckeditor/plugins/a11yhelp/dialogs/lang/lv.js b/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/lv.js similarity index 100% rename from extend/ckeditor/plugins/a11yhelp/dialogs/lang/lv.js rename to bbs/ckeditor/plugins/a11yhelp/dialogs/lang/lv.js diff --git a/extend/ckeditor/plugins/a11yhelp/dialogs/lang/mk.js b/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/mk.js similarity index 100% rename from extend/ckeditor/plugins/a11yhelp/dialogs/lang/mk.js rename to bbs/ckeditor/plugins/a11yhelp/dialogs/lang/mk.js diff --git a/extend/ckeditor/plugins/a11yhelp/dialogs/lang/mn.js b/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/mn.js similarity index 100% rename from extend/ckeditor/plugins/a11yhelp/dialogs/lang/mn.js rename to bbs/ckeditor/plugins/a11yhelp/dialogs/lang/mn.js diff --git a/extend/ckeditor/plugins/a11yhelp/dialogs/lang/nb.js b/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/nb.js similarity index 100% rename from extend/ckeditor/plugins/a11yhelp/dialogs/lang/nb.js rename to bbs/ckeditor/plugins/a11yhelp/dialogs/lang/nb.js diff --git a/extend/ckeditor/plugins/a11yhelp/dialogs/lang/nl.js b/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/nl.js similarity index 100% rename from extend/ckeditor/plugins/a11yhelp/dialogs/lang/nl.js rename to bbs/ckeditor/plugins/a11yhelp/dialogs/lang/nl.js diff --git a/extend/ckeditor/plugins/a11yhelp/dialogs/lang/no.js b/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/no.js similarity index 100% rename from extend/ckeditor/plugins/a11yhelp/dialogs/lang/no.js rename to bbs/ckeditor/plugins/a11yhelp/dialogs/lang/no.js diff --git a/extend/ckeditor/plugins/a11yhelp/dialogs/lang/pl.js b/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/pl.js similarity index 100% rename from extend/ckeditor/plugins/a11yhelp/dialogs/lang/pl.js rename to bbs/ckeditor/plugins/a11yhelp/dialogs/lang/pl.js diff --git a/extend/ckeditor/plugins/a11yhelp/dialogs/lang/pt-br.js b/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/pt-br.js similarity index 100% rename from extend/ckeditor/plugins/a11yhelp/dialogs/lang/pt-br.js rename to bbs/ckeditor/plugins/a11yhelp/dialogs/lang/pt-br.js diff --git a/extend/ckeditor/plugins/a11yhelp/dialogs/lang/pt.js b/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/pt.js similarity index 100% rename from extend/ckeditor/plugins/a11yhelp/dialogs/lang/pt.js rename to bbs/ckeditor/plugins/a11yhelp/dialogs/lang/pt.js diff --git a/extend/ckeditor/plugins/a11yhelp/dialogs/lang/ro.js b/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/ro.js similarity index 100% rename from extend/ckeditor/plugins/a11yhelp/dialogs/lang/ro.js rename to bbs/ckeditor/plugins/a11yhelp/dialogs/lang/ro.js diff --git a/extend/ckeditor/plugins/a11yhelp/dialogs/lang/ru.js b/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/ru.js similarity index 100% rename from extend/ckeditor/plugins/a11yhelp/dialogs/lang/ru.js rename to bbs/ckeditor/plugins/a11yhelp/dialogs/lang/ru.js diff --git a/extend/ckeditor/plugins/a11yhelp/dialogs/lang/sk.js b/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/sk.js similarity index 100% rename from extend/ckeditor/plugins/a11yhelp/dialogs/lang/sk.js rename to bbs/ckeditor/plugins/a11yhelp/dialogs/lang/sk.js diff --git a/extend/ckeditor/plugins/a11yhelp/dialogs/lang/sl.js b/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/sl.js similarity index 100% rename from extend/ckeditor/plugins/a11yhelp/dialogs/lang/sl.js rename to bbs/ckeditor/plugins/a11yhelp/dialogs/lang/sl.js diff --git a/extend/ckeditor/plugins/a11yhelp/dialogs/lang/tr.js b/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/tr.js similarity index 100% rename from extend/ckeditor/plugins/a11yhelp/dialogs/lang/tr.js rename to bbs/ckeditor/plugins/a11yhelp/dialogs/lang/tr.js diff --git a/extend/ckeditor/plugins/a11yhelp/dialogs/lang/ug.js b/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/ug.js similarity index 100% rename from extend/ckeditor/plugins/a11yhelp/dialogs/lang/ug.js rename to bbs/ckeditor/plugins/a11yhelp/dialogs/lang/ug.js diff --git a/extend/ckeditor/plugins/a11yhelp/dialogs/lang/uk.js b/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/uk.js similarity index 100% rename from extend/ckeditor/plugins/a11yhelp/dialogs/lang/uk.js rename to bbs/ckeditor/plugins/a11yhelp/dialogs/lang/uk.js diff --git a/extend/ckeditor/plugins/a11yhelp/dialogs/lang/vi.js b/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/vi.js similarity index 100% rename from extend/ckeditor/plugins/a11yhelp/dialogs/lang/vi.js rename to bbs/ckeditor/plugins/a11yhelp/dialogs/lang/vi.js diff --git a/extend/ckeditor/plugins/a11yhelp/dialogs/lang/zh-cn.js b/bbs/ckeditor/plugins/a11yhelp/dialogs/lang/zh-cn.js similarity index 100% rename from extend/ckeditor/plugins/a11yhelp/dialogs/lang/zh-cn.js rename to bbs/ckeditor/plugins/a11yhelp/dialogs/lang/zh-cn.js diff --git a/extend/ckeditor/plugins/about/dialogs/about.js b/bbs/ckeditor/plugins/about/dialogs/about.js similarity index 100% rename from extend/ckeditor/plugins/about/dialogs/about.js rename to bbs/ckeditor/plugins/about/dialogs/about.js diff --git a/extend/ckeditor/plugins/about/dialogs/logo_ckeditor.png b/bbs/ckeditor/plugins/about/dialogs/logo_ckeditor.png similarity index 100% rename from extend/ckeditor/plugins/about/dialogs/logo_ckeditor.png rename to bbs/ckeditor/plugins/about/dialogs/logo_ckeditor.png diff --git a/extend/ckeditor/plugins/clipboard/dialogs/paste.js b/bbs/ckeditor/plugins/clipboard/dialogs/paste.js similarity index 100% rename from extend/ckeditor/plugins/clipboard/dialogs/paste.js rename to bbs/ckeditor/plugins/clipboard/dialogs/paste.js diff --git a/extend/ckeditor/plugins/colordialog/dialogs/colordialog.js b/bbs/ckeditor/plugins/colordialog/dialogs/colordialog.js similarity index 100% rename from extend/ckeditor/plugins/colordialog/dialogs/colordialog.js rename to bbs/ckeditor/plugins/colordialog/dialogs/colordialog.js diff --git a/extend/ckeditor/plugins/dialog/dialogDefinition.js b/bbs/ckeditor/plugins/dialog/dialogDefinition.js similarity index 100% rename from extend/ckeditor/plugins/dialog/dialogDefinition.js rename to bbs/ckeditor/plugins/dialog/dialogDefinition.js diff --git a/extend/ckeditor/plugins/div/dialogs/div.js b/bbs/ckeditor/plugins/div/dialogs/div.js similarity index 100% rename from extend/ckeditor/plugins/div/dialogs/div.js rename to bbs/ckeditor/plugins/div/dialogs/div.js diff --git a/extend/ckeditor/plugins/fakeobjects/images/spacer.gif b/bbs/ckeditor/plugins/fakeobjects/images/spacer.gif similarity index 100% rename from extend/ckeditor/plugins/fakeobjects/images/spacer.gif rename to bbs/ckeditor/plugins/fakeobjects/images/spacer.gif diff --git a/extend/ckeditor/plugins/find/dialogs/find.js b/bbs/ckeditor/plugins/find/dialogs/find.js similarity index 100% rename from extend/ckeditor/plugins/find/dialogs/find.js rename to bbs/ckeditor/plugins/find/dialogs/find.js diff --git a/extend/ckeditor/plugins/flash/dialogs/flash.js b/bbs/ckeditor/plugins/flash/dialogs/flash.js similarity index 100% rename from extend/ckeditor/plugins/flash/dialogs/flash.js rename to bbs/ckeditor/plugins/flash/dialogs/flash.js diff --git a/extend/ckeditor/plugins/flash/images/placeholder.png b/bbs/ckeditor/plugins/flash/images/placeholder.png similarity index 100% rename from extend/ckeditor/plugins/flash/images/placeholder.png rename to bbs/ckeditor/plugins/flash/images/placeholder.png diff --git a/extend/ckeditor/plugins/forms/dialogs/button.js b/bbs/ckeditor/plugins/forms/dialogs/button.js similarity index 100% rename from extend/ckeditor/plugins/forms/dialogs/button.js rename to bbs/ckeditor/plugins/forms/dialogs/button.js diff --git a/extend/ckeditor/plugins/forms/dialogs/checkbox.js b/bbs/ckeditor/plugins/forms/dialogs/checkbox.js similarity index 100% rename from extend/ckeditor/plugins/forms/dialogs/checkbox.js rename to bbs/ckeditor/plugins/forms/dialogs/checkbox.js diff --git a/extend/ckeditor/plugins/forms/dialogs/form.js b/bbs/ckeditor/plugins/forms/dialogs/form.js similarity index 100% rename from extend/ckeditor/plugins/forms/dialogs/form.js rename to bbs/ckeditor/plugins/forms/dialogs/form.js diff --git a/extend/ckeditor/plugins/forms/dialogs/hiddenfield.js b/bbs/ckeditor/plugins/forms/dialogs/hiddenfield.js similarity index 100% rename from extend/ckeditor/plugins/forms/dialogs/hiddenfield.js rename to bbs/ckeditor/plugins/forms/dialogs/hiddenfield.js diff --git a/extend/ckeditor/plugins/forms/dialogs/radio.js b/bbs/ckeditor/plugins/forms/dialogs/radio.js similarity index 100% rename from extend/ckeditor/plugins/forms/dialogs/radio.js rename to bbs/ckeditor/plugins/forms/dialogs/radio.js diff --git a/extend/ckeditor/plugins/forms/dialogs/select.js b/bbs/ckeditor/plugins/forms/dialogs/select.js similarity index 100% rename from extend/ckeditor/plugins/forms/dialogs/select.js rename to bbs/ckeditor/plugins/forms/dialogs/select.js diff --git a/extend/ckeditor/plugins/forms/dialogs/textarea.js b/bbs/ckeditor/plugins/forms/dialogs/textarea.js similarity index 100% rename from extend/ckeditor/plugins/forms/dialogs/textarea.js rename to bbs/ckeditor/plugins/forms/dialogs/textarea.js diff --git a/extend/ckeditor/plugins/forms/dialogs/textfield.js b/bbs/ckeditor/plugins/forms/dialogs/textfield.js similarity index 100% rename from extend/ckeditor/plugins/forms/dialogs/textfield.js rename to bbs/ckeditor/plugins/forms/dialogs/textfield.js diff --git a/extend/ckeditor/plugins/forms/images/hiddenfield.gif b/bbs/ckeditor/plugins/forms/images/hiddenfield.gif similarity index 100% rename from extend/ckeditor/plugins/forms/images/hiddenfield.gif rename to bbs/ckeditor/plugins/forms/images/hiddenfield.gif diff --git a/extend/ckeditor/plugins/icons.png b/bbs/ckeditor/plugins/icons.png similarity index 100% rename from extend/ckeditor/plugins/icons.png rename to bbs/ckeditor/plugins/icons.png diff --git a/extend/ckeditor/plugins/iframe/dialogs/iframe.js b/bbs/ckeditor/plugins/iframe/dialogs/iframe.js similarity index 100% rename from extend/ckeditor/plugins/iframe/dialogs/iframe.js rename to bbs/ckeditor/plugins/iframe/dialogs/iframe.js diff --git a/extend/ckeditor/plugins/iframe/images/placeholder.png b/bbs/ckeditor/plugins/iframe/images/placeholder.png similarity index 100% rename from extend/ckeditor/plugins/iframe/images/placeholder.png rename to bbs/ckeditor/plugins/iframe/images/placeholder.png diff --git a/extend/ckeditor/plugins/image/dialogs/image.js b/bbs/ckeditor/plugins/image/dialogs/image.js similarity index 100% rename from extend/ckeditor/plugins/image/dialogs/image.js rename to bbs/ckeditor/plugins/image/dialogs/image.js diff --git a/extend/ckeditor/plugins/image/images/noimage.png b/bbs/ckeditor/plugins/image/images/noimage.png similarity index 100% rename from extend/ckeditor/plugins/image/images/noimage.png rename to bbs/ckeditor/plugins/image/images/noimage.png diff --git a/extend/ckeditor/plugins/link/dialogs/anchor.js b/bbs/ckeditor/plugins/link/dialogs/anchor.js similarity index 100% rename from extend/ckeditor/plugins/link/dialogs/anchor.js rename to bbs/ckeditor/plugins/link/dialogs/anchor.js diff --git a/extend/ckeditor/plugins/link/dialogs/link.js b/bbs/ckeditor/plugins/link/dialogs/link.js similarity index 100% rename from extend/ckeditor/plugins/link/dialogs/link.js rename to bbs/ckeditor/plugins/link/dialogs/link.js diff --git a/extend/ckeditor/plugins/link/images/anchor.png b/bbs/ckeditor/plugins/link/images/anchor.png similarity index 100% rename from extend/ckeditor/plugins/link/images/anchor.png rename to bbs/ckeditor/plugins/link/images/anchor.png diff --git a/extend/ckeditor/plugins/liststyle/dialogs/liststyle.js b/bbs/ckeditor/plugins/liststyle/dialogs/liststyle.js similarity index 100% rename from extend/ckeditor/plugins/liststyle/dialogs/liststyle.js rename to bbs/ckeditor/plugins/liststyle/dialogs/liststyle.js diff --git a/extend/ckeditor/plugins/magicline/images/icon.png b/bbs/ckeditor/plugins/magicline/images/icon.png similarity index 100% rename from extend/ckeditor/plugins/magicline/images/icon.png rename to bbs/ckeditor/plugins/magicline/images/icon.png diff --git a/extend/ckeditor/plugins/pagebreak/images/pagebreak.gif b/bbs/ckeditor/plugins/pagebreak/images/pagebreak.gif similarity index 100% rename from extend/ckeditor/plugins/pagebreak/images/pagebreak.gif rename to bbs/ckeditor/plugins/pagebreak/images/pagebreak.gif diff --git a/extend/ckeditor/plugins/pastefromword/filter/default.js b/bbs/ckeditor/plugins/pastefromword/filter/default.js similarity index 100% rename from extend/ckeditor/plugins/pastefromword/filter/default.js rename to bbs/ckeditor/plugins/pastefromword/filter/default.js diff --git a/extend/ckeditor/plugins/preview/preview.html b/bbs/ckeditor/plugins/preview/preview.html similarity index 100% rename from extend/ckeditor/plugins/preview/preview.html rename to bbs/ckeditor/plugins/preview/preview.html diff --git a/extend/ckeditor/plugins/showblocks/images/block_address.png b/bbs/ckeditor/plugins/showblocks/images/block_address.png similarity index 100% rename from extend/ckeditor/plugins/showblocks/images/block_address.png rename to bbs/ckeditor/plugins/showblocks/images/block_address.png diff --git a/extend/ckeditor/plugins/showblocks/images/block_blockquote.png b/bbs/ckeditor/plugins/showblocks/images/block_blockquote.png similarity index 100% rename from extend/ckeditor/plugins/showblocks/images/block_blockquote.png rename to bbs/ckeditor/plugins/showblocks/images/block_blockquote.png diff --git a/extend/ckeditor/plugins/showblocks/images/block_div.png b/bbs/ckeditor/plugins/showblocks/images/block_div.png similarity index 100% rename from extend/ckeditor/plugins/showblocks/images/block_div.png rename to bbs/ckeditor/plugins/showblocks/images/block_div.png diff --git a/extend/ckeditor/plugins/showblocks/images/block_h1.png b/bbs/ckeditor/plugins/showblocks/images/block_h1.png similarity index 100% rename from extend/ckeditor/plugins/showblocks/images/block_h1.png rename to bbs/ckeditor/plugins/showblocks/images/block_h1.png diff --git a/extend/ckeditor/plugins/showblocks/images/block_h2.png b/bbs/ckeditor/plugins/showblocks/images/block_h2.png similarity index 100% rename from extend/ckeditor/plugins/showblocks/images/block_h2.png rename to bbs/ckeditor/plugins/showblocks/images/block_h2.png diff --git a/extend/ckeditor/plugins/showblocks/images/block_h3.png b/bbs/ckeditor/plugins/showblocks/images/block_h3.png similarity index 100% rename from extend/ckeditor/plugins/showblocks/images/block_h3.png rename to bbs/ckeditor/plugins/showblocks/images/block_h3.png diff --git a/extend/ckeditor/plugins/showblocks/images/block_h4.png b/bbs/ckeditor/plugins/showblocks/images/block_h4.png similarity index 100% rename from extend/ckeditor/plugins/showblocks/images/block_h4.png rename to bbs/ckeditor/plugins/showblocks/images/block_h4.png diff --git a/extend/ckeditor/plugins/showblocks/images/block_h5.png b/bbs/ckeditor/plugins/showblocks/images/block_h5.png similarity index 100% rename from extend/ckeditor/plugins/showblocks/images/block_h5.png rename to bbs/ckeditor/plugins/showblocks/images/block_h5.png diff --git a/extend/ckeditor/plugins/showblocks/images/block_h6.png b/bbs/ckeditor/plugins/showblocks/images/block_h6.png similarity index 100% rename from extend/ckeditor/plugins/showblocks/images/block_h6.png rename to bbs/ckeditor/plugins/showblocks/images/block_h6.png diff --git a/extend/ckeditor/plugins/showblocks/images/block_p.png b/bbs/ckeditor/plugins/showblocks/images/block_p.png similarity index 100% rename from extend/ckeditor/plugins/showblocks/images/block_p.png rename to bbs/ckeditor/plugins/showblocks/images/block_p.png diff --git a/extend/ckeditor/plugins/showblocks/images/block_pre.png b/bbs/ckeditor/plugins/showblocks/images/block_pre.png similarity index 100% rename from extend/ckeditor/plugins/showblocks/images/block_pre.png rename to bbs/ckeditor/plugins/showblocks/images/block_pre.png diff --git a/extend/ckeditor/plugins/smiley/dialogs/smiley.js b/bbs/ckeditor/plugins/smiley/dialogs/smiley.js similarity index 100% rename from extend/ckeditor/plugins/smiley/dialogs/smiley.js rename to bbs/ckeditor/plugins/smiley/dialogs/smiley.js diff --git a/extend/ckeditor/plugins/smiley/images/angel_smile.gif b/bbs/ckeditor/plugins/smiley/images/angel_smile.gif similarity index 100% rename from extend/ckeditor/plugins/smiley/images/angel_smile.gif rename to bbs/ckeditor/plugins/smiley/images/angel_smile.gif diff --git a/extend/ckeditor/plugins/smiley/images/angry_smile.gif b/bbs/ckeditor/plugins/smiley/images/angry_smile.gif similarity index 100% rename from extend/ckeditor/plugins/smiley/images/angry_smile.gif rename to bbs/ckeditor/plugins/smiley/images/angry_smile.gif diff --git a/extend/ckeditor/plugins/smiley/images/broken_heart.gif b/bbs/ckeditor/plugins/smiley/images/broken_heart.gif similarity index 100% rename from extend/ckeditor/plugins/smiley/images/broken_heart.gif rename to bbs/ckeditor/plugins/smiley/images/broken_heart.gif diff --git a/extend/ckeditor/plugins/smiley/images/confused_smile.gif b/bbs/ckeditor/plugins/smiley/images/confused_smile.gif similarity index 100% rename from extend/ckeditor/plugins/smiley/images/confused_smile.gif rename to bbs/ckeditor/plugins/smiley/images/confused_smile.gif diff --git a/extend/ckeditor/plugins/smiley/images/cry_smile.gif b/bbs/ckeditor/plugins/smiley/images/cry_smile.gif similarity index 100% rename from extend/ckeditor/plugins/smiley/images/cry_smile.gif rename to bbs/ckeditor/plugins/smiley/images/cry_smile.gif diff --git a/extend/ckeditor/plugins/smiley/images/devil_smile.gif b/bbs/ckeditor/plugins/smiley/images/devil_smile.gif similarity index 100% rename from extend/ckeditor/plugins/smiley/images/devil_smile.gif rename to bbs/ckeditor/plugins/smiley/images/devil_smile.gif diff --git a/extend/ckeditor/plugins/smiley/images/embaressed_smile.gif b/bbs/ckeditor/plugins/smiley/images/embaressed_smile.gif similarity index 100% rename from extend/ckeditor/plugins/smiley/images/embaressed_smile.gif rename to bbs/ckeditor/plugins/smiley/images/embaressed_smile.gif diff --git a/extend/ckeditor/plugins/smiley/images/embarrassed_smile.gif b/bbs/ckeditor/plugins/smiley/images/embarrassed_smile.gif similarity index 100% rename from extend/ckeditor/plugins/smiley/images/embarrassed_smile.gif rename to bbs/ckeditor/plugins/smiley/images/embarrassed_smile.gif diff --git a/extend/ckeditor/plugins/smiley/images/envelope.gif b/bbs/ckeditor/plugins/smiley/images/envelope.gif similarity index 100% rename from extend/ckeditor/plugins/smiley/images/envelope.gif rename to bbs/ckeditor/plugins/smiley/images/envelope.gif diff --git a/extend/ckeditor/plugins/smiley/images/heart.gif b/bbs/ckeditor/plugins/smiley/images/heart.gif similarity index 100% rename from extend/ckeditor/plugins/smiley/images/heart.gif rename to bbs/ckeditor/plugins/smiley/images/heart.gif diff --git a/extend/ckeditor/plugins/smiley/images/kiss.gif b/bbs/ckeditor/plugins/smiley/images/kiss.gif similarity index 100% rename from extend/ckeditor/plugins/smiley/images/kiss.gif rename to bbs/ckeditor/plugins/smiley/images/kiss.gif diff --git a/extend/ckeditor/plugins/smiley/images/lightbulb.gif b/bbs/ckeditor/plugins/smiley/images/lightbulb.gif similarity index 100% rename from extend/ckeditor/plugins/smiley/images/lightbulb.gif rename to bbs/ckeditor/plugins/smiley/images/lightbulb.gif diff --git a/extend/ckeditor/plugins/smiley/images/omg_smile.gif b/bbs/ckeditor/plugins/smiley/images/omg_smile.gif similarity index 100% rename from extend/ckeditor/plugins/smiley/images/omg_smile.gif rename to bbs/ckeditor/plugins/smiley/images/omg_smile.gif diff --git a/extend/ckeditor/plugins/smiley/images/regular_smile.gif b/bbs/ckeditor/plugins/smiley/images/regular_smile.gif similarity index 100% rename from extend/ckeditor/plugins/smiley/images/regular_smile.gif rename to bbs/ckeditor/plugins/smiley/images/regular_smile.gif diff --git a/extend/ckeditor/plugins/smiley/images/sad_smile.gif b/bbs/ckeditor/plugins/smiley/images/sad_smile.gif similarity index 100% rename from extend/ckeditor/plugins/smiley/images/sad_smile.gif rename to bbs/ckeditor/plugins/smiley/images/sad_smile.gif diff --git a/extend/ckeditor/plugins/smiley/images/shades_smile.gif b/bbs/ckeditor/plugins/smiley/images/shades_smile.gif similarity index 100% rename from extend/ckeditor/plugins/smiley/images/shades_smile.gif rename to bbs/ckeditor/plugins/smiley/images/shades_smile.gif diff --git a/extend/ckeditor/plugins/smiley/images/teeth_smile.gif b/bbs/ckeditor/plugins/smiley/images/teeth_smile.gif similarity index 100% rename from extend/ckeditor/plugins/smiley/images/teeth_smile.gif rename to bbs/ckeditor/plugins/smiley/images/teeth_smile.gif diff --git a/extend/ckeditor/plugins/smiley/images/thumbs_down.gif b/bbs/ckeditor/plugins/smiley/images/thumbs_down.gif similarity index 100% rename from extend/ckeditor/plugins/smiley/images/thumbs_down.gif rename to bbs/ckeditor/plugins/smiley/images/thumbs_down.gif diff --git a/extend/ckeditor/plugins/smiley/images/thumbs_up.gif b/bbs/ckeditor/plugins/smiley/images/thumbs_up.gif similarity index 100% rename from extend/ckeditor/plugins/smiley/images/thumbs_up.gif rename to bbs/ckeditor/plugins/smiley/images/thumbs_up.gif diff --git a/extend/ckeditor/plugins/smiley/images/tongue_smile.gif b/bbs/ckeditor/plugins/smiley/images/tongue_smile.gif similarity index 100% rename from extend/ckeditor/plugins/smiley/images/tongue_smile.gif rename to bbs/ckeditor/plugins/smiley/images/tongue_smile.gif diff --git a/extend/ckeditor/plugins/smiley/images/tounge_smile.gif b/bbs/ckeditor/plugins/smiley/images/tounge_smile.gif similarity index 100% rename from extend/ckeditor/plugins/smiley/images/tounge_smile.gif rename to bbs/ckeditor/plugins/smiley/images/tounge_smile.gif diff --git a/extend/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.gif b/bbs/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.gif similarity index 100% rename from extend/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.gif rename to bbs/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.gif diff --git a/extend/ckeditor/plugins/smiley/images/wink_smile.gif b/bbs/ckeditor/plugins/smiley/images/wink_smile.gif similarity index 100% rename from extend/ckeditor/plugins/smiley/images/wink_smile.gif rename to bbs/ckeditor/plugins/smiley/images/wink_smile.gif diff --git a/extend/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt b/bbs/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt similarity index 100% rename from extend/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt rename to bbs/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt diff --git a/extend/ckeditor/plugins/specialchar/dialogs/lang/ca.js b/bbs/ckeditor/plugins/specialchar/dialogs/lang/ca.js similarity index 100% rename from extend/ckeditor/plugins/specialchar/dialogs/lang/ca.js rename to bbs/ckeditor/plugins/specialchar/dialogs/lang/ca.js diff --git a/extend/ckeditor/plugins/specialchar/dialogs/lang/cs.js b/bbs/ckeditor/plugins/specialchar/dialogs/lang/cs.js similarity index 100% rename from extend/ckeditor/plugins/specialchar/dialogs/lang/cs.js rename to bbs/ckeditor/plugins/specialchar/dialogs/lang/cs.js diff --git a/extend/ckeditor/plugins/specialchar/dialogs/lang/cy.js b/bbs/ckeditor/plugins/specialchar/dialogs/lang/cy.js similarity index 100% rename from extend/ckeditor/plugins/specialchar/dialogs/lang/cy.js rename to bbs/ckeditor/plugins/specialchar/dialogs/lang/cy.js diff --git a/extend/ckeditor/plugins/specialchar/dialogs/lang/de.js b/bbs/ckeditor/plugins/specialchar/dialogs/lang/de.js similarity index 100% rename from extend/ckeditor/plugins/specialchar/dialogs/lang/de.js rename to bbs/ckeditor/plugins/specialchar/dialogs/lang/de.js diff --git a/extend/ckeditor/plugins/specialchar/dialogs/lang/el.js b/bbs/ckeditor/plugins/specialchar/dialogs/lang/el.js similarity index 100% rename from extend/ckeditor/plugins/specialchar/dialogs/lang/el.js rename to bbs/ckeditor/plugins/specialchar/dialogs/lang/el.js diff --git a/extend/ckeditor/plugins/specialchar/dialogs/lang/en.js b/bbs/ckeditor/plugins/specialchar/dialogs/lang/en.js similarity index 100% rename from extend/ckeditor/plugins/specialchar/dialogs/lang/en.js rename to bbs/ckeditor/plugins/specialchar/dialogs/lang/en.js diff --git a/extend/ckeditor/plugins/specialchar/dialogs/lang/eo.js b/bbs/ckeditor/plugins/specialchar/dialogs/lang/eo.js similarity index 100% rename from extend/ckeditor/plugins/specialchar/dialogs/lang/eo.js rename to bbs/ckeditor/plugins/specialchar/dialogs/lang/eo.js diff --git a/extend/ckeditor/plugins/specialchar/dialogs/lang/et.js b/bbs/ckeditor/plugins/specialchar/dialogs/lang/et.js similarity index 100% rename from extend/ckeditor/plugins/specialchar/dialogs/lang/et.js rename to bbs/ckeditor/plugins/specialchar/dialogs/lang/et.js diff --git a/extend/ckeditor/plugins/specialchar/dialogs/lang/fa.js b/bbs/ckeditor/plugins/specialchar/dialogs/lang/fa.js similarity index 100% rename from extend/ckeditor/plugins/specialchar/dialogs/lang/fa.js rename to bbs/ckeditor/plugins/specialchar/dialogs/lang/fa.js diff --git a/extend/ckeditor/plugins/specialchar/dialogs/lang/fi.js b/bbs/ckeditor/plugins/specialchar/dialogs/lang/fi.js similarity index 100% rename from extend/ckeditor/plugins/specialchar/dialogs/lang/fi.js rename to bbs/ckeditor/plugins/specialchar/dialogs/lang/fi.js diff --git a/extend/ckeditor/plugins/specialchar/dialogs/lang/fr.js b/bbs/ckeditor/plugins/specialchar/dialogs/lang/fr.js similarity index 100% rename from extend/ckeditor/plugins/specialchar/dialogs/lang/fr.js rename to bbs/ckeditor/plugins/specialchar/dialogs/lang/fr.js diff --git a/extend/ckeditor/plugins/specialchar/dialogs/lang/he.js b/bbs/ckeditor/plugins/specialchar/dialogs/lang/he.js similarity index 100% rename from extend/ckeditor/plugins/specialchar/dialogs/lang/he.js rename to bbs/ckeditor/plugins/specialchar/dialogs/lang/he.js diff --git a/extend/ckeditor/plugins/specialchar/dialogs/lang/hr.js b/bbs/ckeditor/plugins/specialchar/dialogs/lang/hr.js similarity index 100% rename from extend/ckeditor/plugins/specialchar/dialogs/lang/hr.js rename to bbs/ckeditor/plugins/specialchar/dialogs/lang/hr.js diff --git a/extend/ckeditor/plugins/specialchar/dialogs/lang/it.js b/bbs/ckeditor/plugins/specialchar/dialogs/lang/it.js similarity index 100% rename from extend/ckeditor/plugins/specialchar/dialogs/lang/it.js rename to bbs/ckeditor/plugins/specialchar/dialogs/lang/it.js diff --git a/extend/ckeditor/plugins/specialchar/dialogs/lang/ku.js b/bbs/ckeditor/plugins/specialchar/dialogs/lang/ku.js similarity index 100% rename from extend/ckeditor/plugins/specialchar/dialogs/lang/ku.js rename to bbs/ckeditor/plugins/specialchar/dialogs/lang/ku.js diff --git a/extend/ckeditor/plugins/specialchar/dialogs/lang/lv.js b/bbs/ckeditor/plugins/specialchar/dialogs/lang/lv.js similarity index 100% rename from extend/ckeditor/plugins/specialchar/dialogs/lang/lv.js rename to bbs/ckeditor/plugins/specialchar/dialogs/lang/lv.js diff --git a/extend/ckeditor/plugins/specialchar/dialogs/lang/nb.js b/bbs/ckeditor/plugins/specialchar/dialogs/lang/nb.js similarity index 100% rename from extend/ckeditor/plugins/specialchar/dialogs/lang/nb.js rename to bbs/ckeditor/plugins/specialchar/dialogs/lang/nb.js diff --git a/extend/ckeditor/plugins/specialchar/dialogs/lang/nl.js b/bbs/ckeditor/plugins/specialchar/dialogs/lang/nl.js similarity index 100% rename from extend/ckeditor/plugins/specialchar/dialogs/lang/nl.js rename to bbs/ckeditor/plugins/specialchar/dialogs/lang/nl.js diff --git a/extend/ckeditor/plugins/specialchar/dialogs/lang/no.js b/bbs/ckeditor/plugins/specialchar/dialogs/lang/no.js similarity index 100% rename from extend/ckeditor/plugins/specialchar/dialogs/lang/no.js rename to bbs/ckeditor/plugins/specialchar/dialogs/lang/no.js diff --git a/extend/ckeditor/plugins/specialchar/dialogs/lang/pt-br.js b/bbs/ckeditor/plugins/specialchar/dialogs/lang/pt-br.js similarity index 100% rename from extend/ckeditor/plugins/specialchar/dialogs/lang/pt-br.js rename to bbs/ckeditor/plugins/specialchar/dialogs/lang/pt-br.js diff --git a/extend/ckeditor/plugins/specialchar/dialogs/lang/sk.js b/bbs/ckeditor/plugins/specialchar/dialogs/lang/sk.js similarity index 100% rename from extend/ckeditor/plugins/specialchar/dialogs/lang/sk.js rename to bbs/ckeditor/plugins/specialchar/dialogs/lang/sk.js diff --git a/extend/ckeditor/plugins/specialchar/dialogs/lang/tr.js b/bbs/ckeditor/plugins/specialchar/dialogs/lang/tr.js similarity index 100% rename from extend/ckeditor/plugins/specialchar/dialogs/lang/tr.js rename to bbs/ckeditor/plugins/specialchar/dialogs/lang/tr.js diff --git a/extend/ckeditor/plugins/specialchar/dialogs/lang/ug.js b/bbs/ckeditor/plugins/specialchar/dialogs/lang/ug.js similarity index 100% rename from extend/ckeditor/plugins/specialchar/dialogs/lang/ug.js rename to bbs/ckeditor/plugins/specialchar/dialogs/lang/ug.js diff --git a/extend/ckeditor/plugins/specialchar/dialogs/lang/zh-cn.js b/bbs/ckeditor/plugins/specialchar/dialogs/lang/zh-cn.js similarity index 100% rename from extend/ckeditor/plugins/specialchar/dialogs/lang/zh-cn.js rename to bbs/ckeditor/plugins/specialchar/dialogs/lang/zh-cn.js diff --git a/extend/ckeditor/plugins/specialchar/dialogs/specialchar.js b/bbs/ckeditor/plugins/specialchar/dialogs/specialchar.js similarity index 100% rename from extend/ckeditor/plugins/specialchar/dialogs/specialchar.js rename to bbs/ckeditor/plugins/specialchar/dialogs/specialchar.js diff --git a/extend/ckeditor/plugins/table/dialogs/table.js b/bbs/ckeditor/plugins/table/dialogs/table.js similarity index 100% rename from extend/ckeditor/plugins/table/dialogs/table.js rename to bbs/ckeditor/plugins/table/dialogs/table.js diff --git a/extend/ckeditor/plugins/tabletools/dialogs/tableCell.js b/bbs/ckeditor/plugins/tabletools/dialogs/tableCell.js similarity index 100% rename from extend/ckeditor/plugins/tabletools/dialogs/tableCell.js rename to bbs/ckeditor/plugins/tabletools/dialogs/tableCell.js diff --git a/extend/ckeditor/plugins/templates/dialogs/templates.css b/bbs/ckeditor/plugins/templates/dialogs/templates.css similarity index 100% rename from extend/ckeditor/plugins/templates/dialogs/templates.css rename to bbs/ckeditor/plugins/templates/dialogs/templates.css diff --git a/extend/ckeditor/plugins/templates/dialogs/templates.js b/bbs/ckeditor/plugins/templates/dialogs/templates.js similarity index 100% rename from extend/ckeditor/plugins/templates/dialogs/templates.js rename to bbs/ckeditor/plugins/templates/dialogs/templates.js diff --git a/extend/ckeditor/plugins/templates/templates/default.js b/bbs/ckeditor/plugins/templates/templates/default.js similarity index 100% rename from extend/ckeditor/plugins/templates/templates/default.js rename to bbs/ckeditor/plugins/templates/templates/default.js diff --git a/extend/ckeditor/plugins/templates/templates/images/template1.gif b/bbs/ckeditor/plugins/templates/templates/images/template1.gif similarity index 100% rename from extend/ckeditor/plugins/templates/templates/images/template1.gif rename to bbs/ckeditor/plugins/templates/templates/images/template1.gif diff --git a/extend/ckeditor/plugins/templates/templates/images/template2.gif b/bbs/ckeditor/plugins/templates/templates/images/template2.gif similarity index 100% rename from extend/ckeditor/plugins/templates/templates/images/template2.gif rename to bbs/ckeditor/plugins/templates/templates/images/template2.gif diff --git a/extend/ckeditor/plugins/templates/templates/images/template3.gif b/bbs/ckeditor/plugins/templates/templates/images/template3.gif similarity index 100% rename from extend/ckeditor/plugins/templates/templates/images/template3.gif rename to bbs/ckeditor/plugins/templates/templates/images/template3.gif diff --git a/extend/ckeditor/samples/ajax.html b/bbs/ckeditor/samples/ajax.html similarity index 100% rename from extend/ckeditor/samples/ajax.html rename to bbs/ckeditor/samples/ajax.html diff --git a/extend/ckeditor/samples/api.html b/bbs/ckeditor/samples/api.html similarity index 100% rename from extend/ckeditor/samples/api.html rename to bbs/ckeditor/samples/api.html diff --git a/extend/ckeditor/samples/appendto.html b/bbs/ckeditor/samples/appendto.html similarity index 100% rename from extend/ckeditor/samples/appendto.html rename to bbs/ckeditor/samples/appendto.html diff --git a/extend/ckeditor/samples/assets/inlineall/logo.png b/bbs/ckeditor/samples/assets/inlineall/logo.png similarity index 100% rename from extend/ckeditor/samples/assets/inlineall/logo.png rename to bbs/ckeditor/samples/assets/inlineall/logo.png diff --git a/extend/ckeditor/samples/assets/outputxhtml/outputxhtml.css b/bbs/ckeditor/samples/assets/outputxhtml/outputxhtml.css similarity index 100% rename from extend/ckeditor/samples/assets/outputxhtml/outputxhtml.css rename to bbs/ckeditor/samples/assets/outputxhtml/outputxhtml.css diff --git a/extend/ckeditor/samples/assets/posteddata.php b/bbs/ckeditor/samples/assets/posteddata.php similarity index 100% rename from extend/ckeditor/samples/assets/posteddata.php rename to bbs/ckeditor/samples/assets/posteddata.php diff --git a/extend/ckeditor/samples/assets/sample.css b/bbs/ckeditor/samples/assets/sample.css similarity index 100% rename from extend/ckeditor/samples/assets/sample.css rename to bbs/ckeditor/samples/assets/sample.css diff --git a/extend/ckeditor/samples/assets/sample.jpg b/bbs/ckeditor/samples/assets/sample.jpg similarity index 100% rename from extend/ckeditor/samples/assets/sample.jpg rename to bbs/ckeditor/samples/assets/sample.jpg diff --git a/extend/ckeditor/samples/assets/uilanguages/languages.js b/bbs/ckeditor/samples/assets/uilanguages/languages.js similarity index 100% rename from extend/ckeditor/samples/assets/uilanguages/languages.js rename to bbs/ckeditor/samples/assets/uilanguages/languages.js diff --git a/extend/ckeditor/samples/divreplace.html b/bbs/ckeditor/samples/divreplace.html similarity index 100% rename from extend/ckeditor/samples/divreplace.html rename to bbs/ckeditor/samples/divreplace.html diff --git a/extend/ckeditor/samples/index.html b/bbs/ckeditor/samples/index.html similarity index 100% rename from extend/ckeditor/samples/index.html rename to bbs/ckeditor/samples/index.html diff --git a/extend/ckeditor/samples/inlineall.html b/bbs/ckeditor/samples/inlineall.html similarity index 100% rename from extend/ckeditor/samples/inlineall.html rename to bbs/ckeditor/samples/inlineall.html diff --git a/extend/ckeditor/samples/inlinebycode.html b/bbs/ckeditor/samples/inlinebycode.html similarity index 100% rename from extend/ckeditor/samples/inlinebycode.html rename to bbs/ckeditor/samples/inlinebycode.html diff --git a/extend/ckeditor/samples/plugins/dialog/assets/my_dialog.js b/bbs/ckeditor/samples/plugins/dialog/assets/my_dialog.js similarity index 100% rename from extend/ckeditor/samples/plugins/dialog/assets/my_dialog.js rename to bbs/ckeditor/samples/plugins/dialog/assets/my_dialog.js diff --git a/extend/ckeditor/samples/plugins/dialog/dialog.html b/bbs/ckeditor/samples/plugins/dialog/dialog.html similarity index 100% rename from extend/ckeditor/samples/plugins/dialog/dialog.html rename to bbs/ckeditor/samples/plugins/dialog/dialog.html diff --git a/extend/ckeditor/samples/plugins/enterkey/enterkey.html b/bbs/ckeditor/samples/plugins/enterkey/enterkey.html similarity index 100% rename from extend/ckeditor/samples/plugins/enterkey/enterkey.html rename to bbs/ckeditor/samples/plugins/enterkey/enterkey.html diff --git a/extend/ckeditor/samples/plugins/htmlwriter/assets/outputforflash/outputforflash.fla b/bbs/ckeditor/samples/plugins/htmlwriter/assets/outputforflash/outputforflash.fla similarity index 100% rename from extend/ckeditor/samples/plugins/htmlwriter/assets/outputforflash/outputforflash.fla rename to bbs/ckeditor/samples/plugins/htmlwriter/assets/outputforflash/outputforflash.fla diff --git a/extend/ckeditor/samples/plugins/htmlwriter/assets/outputforflash/outputforflash.swf b/bbs/ckeditor/samples/plugins/htmlwriter/assets/outputforflash/outputforflash.swf similarity index 100% rename from extend/ckeditor/samples/plugins/htmlwriter/assets/outputforflash/outputforflash.swf rename to bbs/ckeditor/samples/plugins/htmlwriter/assets/outputforflash/outputforflash.swf diff --git a/extend/ckeditor/samples/plugins/htmlwriter/assets/outputforflash/swfobject.js b/bbs/ckeditor/samples/plugins/htmlwriter/assets/outputforflash/swfobject.js similarity index 100% rename from extend/ckeditor/samples/plugins/htmlwriter/assets/outputforflash/swfobject.js rename to bbs/ckeditor/samples/plugins/htmlwriter/assets/outputforflash/swfobject.js diff --git a/extend/ckeditor/samples/plugins/htmlwriter/outputforflash.html b/bbs/ckeditor/samples/plugins/htmlwriter/outputforflash.html similarity index 100% rename from extend/ckeditor/samples/plugins/htmlwriter/outputforflash.html rename to bbs/ckeditor/samples/plugins/htmlwriter/outputforflash.html diff --git a/extend/ckeditor/samples/plugins/htmlwriter/outputhtml.html b/bbs/ckeditor/samples/plugins/htmlwriter/outputhtml.html similarity index 100% rename from extend/ckeditor/samples/plugins/htmlwriter/outputhtml.html rename to bbs/ckeditor/samples/plugins/htmlwriter/outputhtml.html diff --git a/extend/ckeditor/samples/plugins/magicline/magicline.html b/bbs/ckeditor/samples/plugins/magicline/magicline.html similarity index 100% rename from extend/ckeditor/samples/plugins/magicline/magicline.html rename to bbs/ckeditor/samples/plugins/magicline/magicline.html diff --git a/extend/ckeditor/samples/plugins/toolbar/toolbar.html b/bbs/ckeditor/samples/plugins/toolbar/toolbar.html similarity index 100% rename from extend/ckeditor/samples/plugins/toolbar/toolbar.html rename to bbs/ckeditor/samples/plugins/toolbar/toolbar.html diff --git a/extend/ckeditor/samples/plugins/wysiwygarea/fullpage.html b/bbs/ckeditor/samples/plugins/wysiwygarea/fullpage.html similarity index 100% rename from extend/ckeditor/samples/plugins/wysiwygarea/fullpage.html rename to bbs/ckeditor/samples/plugins/wysiwygarea/fullpage.html diff --git a/extend/ckeditor/samples/readonly.html b/bbs/ckeditor/samples/readonly.html similarity index 100% rename from extend/ckeditor/samples/readonly.html rename to bbs/ckeditor/samples/readonly.html diff --git a/extend/ckeditor/samples/replacebyclass.html b/bbs/ckeditor/samples/replacebyclass.html similarity index 100% rename from extend/ckeditor/samples/replacebyclass.html rename to bbs/ckeditor/samples/replacebyclass.html diff --git a/extend/ckeditor/samples/replacebycode.html b/bbs/ckeditor/samples/replacebycode.html similarity index 100% rename from extend/ckeditor/samples/replacebycode.html rename to bbs/ckeditor/samples/replacebycode.html diff --git a/extend/ckeditor/samples/sample.css b/bbs/ckeditor/samples/sample.css similarity index 100% rename from extend/ckeditor/samples/sample.css rename to bbs/ckeditor/samples/sample.css diff --git a/extend/ckeditor/samples/sample.js b/bbs/ckeditor/samples/sample.js similarity index 100% rename from extend/ckeditor/samples/sample.js rename to bbs/ckeditor/samples/sample.js diff --git a/extend/ckeditor/samples/sample_posteddata.php b/bbs/ckeditor/samples/sample_posteddata.php similarity index 100% rename from extend/ckeditor/samples/sample_posteddata.php rename to bbs/ckeditor/samples/sample_posteddata.php diff --git a/extend/ckeditor/samples/tabindex.html b/bbs/ckeditor/samples/tabindex.html similarity index 100% rename from extend/ckeditor/samples/tabindex.html rename to bbs/ckeditor/samples/tabindex.html diff --git a/extend/ckeditor/samples/uicolor.html b/bbs/ckeditor/samples/uicolor.html similarity index 100% rename from extend/ckeditor/samples/uicolor.html rename to bbs/ckeditor/samples/uicolor.html diff --git a/extend/ckeditor/samples/uilanguages.html b/bbs/ckeditor/samples/uilanguages.html similarity index 100% rename from extend/ckeditor/samples/uilanguages.html rename to bbs/ckeditor/samples/uilanguages.html diff --git a/extend/ckeditor/samples/xhtmlstyle.html b/bbs/ckeditor/samples/xhtmlstyle.html similarity index 100% rename from extend/ckeditor/samples/xhtmlstyle.html rename to bbs/ckeditor/samples/xhtmlstyle.html diff --git a/extend/ckeditor/skins/moono/dialog.css b/bbs/ckeditor/skins/moono/dialog.css similarity index 100% rename from extend/ckeditor/skins/moono/dialog.css rename to bbs/ckeditor/skins/moono/dialog.css diff --git a/extend/ckeditor/skins/moono/dialog_ie.css b/bbs/ckeditor/skins/moono/dialog_ie.css similarity index 100% rename from extend/ckeditor/skins/moono/dialog_ie.css rename to bbs/ckeditor/skins/moono/dialog_ie.css diff --git a/extend/ckeditor/skins/moono/dialog_ie7.css b/bbs/ckeditor/skins/moono/dialog_ie7.css similarity index 100% rename from extend/ckeditor/skins/moono/dialog_ie7.css rename to bbs/ckeditor/skins/moono/dialog_ie7.css diff --git a/extend/ckeditor/skins/moono/dialog_ie8.css b/bbs/ckeditor/skins/moono/dialog_ie8.css similarity index 100% rename from extend/ckeditor/skins/moono/dialog_ie8.css rename to bbs/ckeditor/skins/moono/dialog_ie8.css diff --git a/extend/ckeditor/skins/moono/dialog_opera.css b/bbs/ckeditor/skins/moono/dialog_opera.css similarity index 100% rename from extend/ckeditor/skins/moono/dialog_opera.css rename to bbs/ckeditor/skins/moono/dialog_opera.css diff --git a/extend/ckeditor/skins/moono/editor.css b/bbs/ckeditor/skins/moono/editor.css similarity index 100% rename from extend/ckeditor/skins/moono/editor.css rename to bbs/ckeditor/skins/moono/editor.css diff --git a/extend/ckeditor/skins/moono/editor_gecko.css b/bbs/ckeditor/skins/moono/editor_gecko.css similarity index 100% rename from extend/ckeditor/skins/moono/editor_gecko.css rename to bbs/ckeditor/skins/moono/editor_gecko.css diff --git a/extend/ckeditor/skins/moono/editor_ie.css b/bbs/ckeditor/skins/moono/editor_ie.css similarity index 100% rename from extend/ckeditor/skins/moono/editor_ie.css rename to bbs/ckeditor/skins/moono/editor_ie.css diff --git a/extend/ckeditor/skins/moono/editor_ie7.css b/bbs/ckeditor/skins/moono/editor_ie7.css similarity index 100% rename from extend/ckeditor/skins/moono/editor_ie7.css rename to bbs/ckeditor/skins/moono/editor_ie7.css diff --git a/extend/ckeditor/skins/moono/editor_ie8.css b/bbs/ckeditor/skins/moono/editor_ie8.css similarity index 100% rename from extend/ckeditor/skins/moono/editor_ie8.css rename to bbs/ckeditor/skins/moono/editor_ie8.css diff --git a/extend/ckeditor/skins/moono/icons.png b/bbs/ckeditor/skins/moono/icons.png similarity index 100% rename from extend/ckeditor/skins/moono/icons.png rename to bbs/ckeditor/skins/moono/icons.png diff --git a/extend/ckeditor/skins/moono/images/arrow.png b/bbs/ckeditor/skins/moono/images/arrow.png similarity index 100% rename from extend/ckeditor/skins/moono/images/arrow.png rename to bbs/ckeditor/skins/moono/images/arrow.png diff --git a/extend/ckeditor/skins/moono/images/close.png b/bbs/ckeditor/skins/moono/images/close.png similarity index 100% rename from extend/ckeditor/skins/moono/images/close.png rename to bbs/ckeditor/skins/moono/images/close.png diff --git a/extend/ckeditor/skins/moono/images/mini.png b/bbs/ckeditor/skins/moono/images/mini.png similarity index 100% rename from extend/ckeditor/skins/moono/images/mini.png rename to bbs/ckeditor/skins/moono/images/mini.png diff --git a/extend/ckeditor/skins/moono/readme.md b/bbs/ckeditor/skins/moono/readme.md similarity index 100% rename from extend/ckeditor/skins/moono/readme.md rename to bbs/ckeditor/skins/moono/readme.md diff --git a/extend/ckeditor/styles.js b/bbs/ckeditor/styles.js similarity index 100% rename from extend/ckeditor/styles.js rename to bbs/ckeditor/styles.js diff --git a/extend/ckeditor/upload.php b/bbs/ckeditor/upload.php similarity index 100% rename from extend/ckeditor/upload.php rename to bbs/ckeditor/upload.php diff --git a/bbs/current_connect.php b/bbs/current_connect.php index 6dc4d1c87..68c49e0c3 100644 --- a/bbs/current_connect.php +++ b/bbs/current_connect.php @@ -7,33 +7,28 @@ include_once('./_head.php'); $list = array(); $sql = " select a.mb_id, b.mb_nick, b.mb_name, b.mb_email, b.mb_homepage, b.mb_open, b.mb_point, a.lo_ip, a.lo_location, a.lo_url - from {$g4[login_table]} a left join {$g4[member_table]} b on (a.mb_id = b.mb_id) - where a.mb_id <> '{$config[cf_admin]}' + from {$g4['login_table']} a left join {$g4['member_table']} b on (a.mb_id = b.mb_id) + where a.mb_id <> '{$config['cf_admin']}' order by a.lo_datetime desc "; $result = sql_query($sql); -for ($i=0; $row=sql_fetch_array($result); $i++) -{ +for ($i=0; $row=sql_fetch_array($result); $i++) { $list[$i] = $row; - if ($row[mb_id]) - //$list[$i][name] = get_sideview($row[mb_id], $row[mb_nick], $row[mb_email], $row[mb_homepage]); - $list[$i][name] = get_sideview($row[mb_id], cut_str($row[mb_nick], $config[cf_cut_name]), $row[mb_email], $row[mb_homepage]); - else - { + if ($row['mb_id']) { + $list[$i]['name'] = get_sideview($row['mb_id'], cut_str($row['mb_nick'], $config['cf_cut_name']), $row['mb_email'], $row['mb_homepage']); + } else { if ($is_admin) - $list[$i][name] = $row[lo_ip]; + $list[$i]['name'] = $row[lo_ip]; else - $list[$i][name] = preg_replace("/([0-9]+).([0-9]+).([0-9]+).([0-9]+)/", "\\1.♡.\\3.\\4", $row[lo_ip]); + $list[$i]['name'] = preg_replace("/([0-9]+).([0-9]+).([0-9]+).([0-9]+)/", "\\1.♡.\\3.\\4", $row['lo_ip']); } - $list[$i][num] = sprintf('%03d',$i+1); + $list[$i]['num'] = sprintf('%03d',$i+1); } -$write_pages = get_paging($config[cf_write_pages], $page, $total_page, '?gr_id=$gr_id&page='); - echo ''; -$connect_skin_path = $g4['path'].'/skin/connect/'.$config[cf_connect_skin]; +$connect_skin_path = $g4['path'].'/skin/connect/'.$config['cf_connect_skin']; include_once($connect_skin_path.'/current_connect.skin.php'); include_once('./_tail.php'); diff --git a/bbs/fonts/antiqua.png b/bbs/fonts/antiqua.png deleted file mode 100644 index 78d93d597..000000000 Binary files a/bbs/fonts/antiqua.png and /dev/null differ diff --git a/bbs/fonts/baskerville.png b/bbs/fonts/baskerville.png deleted file mode 100644 index 5a635287d..000000000 Binary files a/bbs/fonts/baskerville.png and /dev/null differ diff --git a/bbs/fonts/batang.png b/bbs/fonts/batang.png deleted file mode 100644 index ba0075634..000000000 Binary files a/bbs/fonts/batang.png and /dev/null differ diff --git a/bbs/fonts/bookman.png b/bbs/fonts/bookman.png deleted file mode 100644 index 1132a122a..000000000 Binary files a/bbs/fonts/bookman.png and /dev/null differ diff --git a/bbs/fonts/calisto.png b/bbs/fonts/calisto.png deleted file mode 100644 index b3b0dd560..000000000 Binary files a/bbs/fonts/calisto.png and /dev/null differ diff --git a/bbs/fonts/cambria.png b/bbs/fonts/cambria.png deleted file mode 100644 index 76ad92107..000000000 Binary files a/bbs/fonts/cambria.png and /dev/null differ diff --git a/bbs/fonts/centaur.png b/bbs/fonts/centaur.png deleted file mode 100644 index 30a46cadd..000000000 Binary files a/bbs/fonts/centaur.png and /dev/null differ diff --git a/bbs/fonts/century.png b/bbs/fonts/century.png deleted file mode 100644 index abf89d7e2..000000000 Binary files a/bbs/fonts/century.png and /dev/null differ diff --git a/bbs/fonts/chaparral.png b/bbs/fonts/chaparral.png deleted file mode 100644 index 7395bacdb..000000000 Binary files a/bbs/fonts/chaparral.png and /dev/null differ diff --git a/bbs/fonts/constantia.png b/bbs/fonts/constantia.png deleted file mode 100644 index d3abc6464..000000000 Binary files a/bbs/fonts/constantia.png and /dev/null differ diff --git a/bbs/fonts/footlight.png b/bbs/fonts/footlight.png deleted file mode 100644 index cb2a634ec..000000000 Binary files a/bbs/fonts/footlight.png and /dev/null differ diff --git a/bbs/fonts/garamond.png b/bbs/fonts/garamond.png deleted file mode 100644 index eb7222123..000000000 Binary files a/bbs/fonts/garamond.png and /dev/null differ diff --git a/bbs/fonts/georgia.png b/bbs/fonts/georgia.png deleted file mode 100644 index d00bb75e4..000000000 Binary files a/bbs/fonts/georgia.png and /dev/null differ diff --git a/bbs/fonts/goudy_old.png b/bbs/fonts/goudy_old.png deleted file mode 100644 index b4d236d9a..000000000 Binary files a/bbs/fonts/goudy_old.png and /dev/null differ diff --git a/bbs/fonts/kozuka.png b/bbs/fonts/kozuka.png deleted file mode 100644 index ececa1104..000000000 Binary files a/bbs/fonts/kozuka.png and /dev/null differ diff --git a/bbs/fonts/lucida.png b/bbs/fonts/lucida.png deleted file mode 100644 index 050732aa7..000000000 Binary files a/bbs/fonts/lucida.png and /dev/null differ diff --git a/bbs/fonts/minion.png b/bbs/fonts/minion.png deleted file mode 100644 index 34384e51a..000000000 Binary files a/bbs/fonts/minion.png and /dev/null differ diff --git a/bbs/fonts/palatino.png b/bbs/fonts/palatino.png deleted file mode 100644 index 3a9d37b24..000000000 Binary files a/bbs/fonts/palatino.png and /dev/null differ diff --git a/bbs/fonts/perpetua.png b/bbs/fonts/perpetua.png deleted file mode 100644 index 8b4c0871a..000000000 Binary files a/bbs/fonts/perpetua.png and /dev/null differ diff --git a/bbs/fonts/rockwell.png b/bbs/fonts/rockwell.png deleted file mode 100644 index da19566d1..000000000 Binary files a/bbs/fonts/rockwell.png and /dev/null differ diff --git a/bbs/fonts/times.png b/bbs/fonts/times.png deleted file mode 100644 index 656e99d97..000000000 Binary files a/bbs/fonts/times.png and /dev/null differ diff --git a/bbs/fonts/warnock.png b/bbs/fonts/warnock.png deleted file mode 100644 index c114dbcb9..000000000 Binary files a/bbs/fonts/warnock.png and /dev/null differ diff --git a/extend/gcaptcha/_common.php b/bbs/gcaptcha/_common.php similarity index 100% rename from extend/gcaptcha/_common.php rename to bbs/gcaptcha/_common.php diff --git a/extend/gcaptcha/example.php b/bbs/gcaptcha/example.php similarity index 100% rename from extend/gcaptcha/example.php rename to bbs/gcaptcha/example.php diff --git a/bbs/fonts/.htaccess b/bbs/gcaptcha/fonts/.htaccess similarity index 100% rename from bbs/fonts/.htaccess rename to bbs/gcaptcha/fonts/.htaccess diff --git a/extend/gcaptcha/fonts/DAUM_FONTS_LICENSE.txt b/bbs/gcaptcha/fonts/DAUM_FONTS_LICENSE.txt similarity index 100% rename from extend/gcaptcha/fonts/DAUM_FONTS_LICENSE.txt rename to bbs/gcaptcha/fonts/DAUM_FONTS_LICENSE.txt diff --git a/extend/gcaptcha/fonts/NAVER_FONTS_LICENSE.txt b/bbs/gcaptcha/fonts/NAVER_FONTS_LICENSE.txt similarity index 100% rename from extend/gcaptcha/fonts/NAVER_FONTS_LICENSE.txt rename to bbs/gcaptcha/fonts/NAVER_FONTS_LICENSE.txt diff --git a/extend/gcaptcha/fonts/NanumGothic.ttf b/bbs/gcaptcha/fonts/NanumGothic.ttf similarity index 100% rename from extend/gcaptcha/fonts/NanumGothic.ttf rename to bbs/gcaptcha/fonts/NanumGothic.ttf diff --git a/extend/gcaptcha/fonts/NanumMyeongjo.ttf b/bbs/gcaptcha/fonts/NanumMyeongjo.ttf similarity index 100% rename from extend/gcaptcha/fonts/NanumMyeongjo.ttf rename to bbs/gcaptcha/fonts/NanumMyeongjo.ttf diff --git a/extend/gcaptcha/gcaptcha.js b/bbs/gcaptcha/gcaptcha.js similarity index 100% rename from extend/gcaptcha/gcaptcha.js rename to bbs/gcaptcha/gcaptcha.js diff --git a/extend/gcaptcha/gcaptcha.lib.php b/bbs/gcaptcha/gcaptcha.lib.php similarity index 92% rename from extend/gcaptcha/gcaptcha.lib.php rename to bbs/gcaptcha/gcaptcha.lib.php index 5233340b3..3a9d6c6f0 100644 --- a/extend/gcaptcha/gcaptcha.lib.php +++ b/bbs/gcaptcha/gcaptcha.lib.php @@ -78,7 +78,7 @@ class gcaptcha function run() { - global $gcaptcha; + global $g4; // The text to draw $captcha_key = $this->get_captcha_key(); @@ -99,7 +99,7 @@ class gcaptcha // Replace path by your own font path $fonts = Array(); - foreach (glob($gcaptcha->fonts.'/*.ttf') as $filename) { + foreach (glob($g4['gcaptcha_fonts'].'/*.ttf') as $filename) { $fonts[] = $filename; } $font = $fonts[mt_rand(0, count($fonts)-1)]; @@ -144,8 +144,8 @@ function captcha_html($class="captcha") { global $g4, $gcaptcha; - $gcaptcha->obj = new gcaptcha(); - $gcaptcha->obj->run(); + $obj = new gcaptcha(); + $obj->run(); $html = '
'; $html .= '스팸방지'; @@ -173,14 +173,20 @@ function chk_captcha() } +function chk_captcha_js() +{ + return "if (!chk_captcha()) return false;"; +} + + function make_wav() { - global $g4, $gcaptcha; + global $g4; $number = (string)$_SESSION['ss_captcha_key']; $wavs = array(); for($i=0;$iwavs.'/'.$number[$i].'.wav'; + $file = $g4['gcaptcha_wavs'].'/'.$number[$i].'.wav'; $wavs[] = $file; } diff --git a/extend/gcaptcha/get.php b/bbs/gcaptcha/get.php similarity index 67% rename from extend/gcaptcha/get.php rename to bbs/gcaptcha/get.php index 09898e9d3..faacdcacd 100644 --- a/extend/gcaptcha/get.php +++ b/bbs/gcaptcha/get.php @@ -1,4 +1,5 @@ a.wr_parent "; -if ($mb_id) + +$mb_id = isset($_GET['mb_id']) ? $_GET['mb_id'] : ""; +if ($mb_id) { $sql_common .= " and a.mb_id = '{$mb_id}' "; +} $sql_order = " order by a.bn_id desc "; $sql = " select count(*) as cnt {$sql_common} "; $row = sql_fetch($sql); -$total_count = $row[cnt]; +$total_count = $row['cnt']; -$rows = $config[cf_new_rows]; +$rows = $config['cf_new_rows']; $total_page = ceil($total_count / $rows); // 전체 페이지 계산 if (!$page) $page = 1; // 페이지가 없으면 첫 페이지 (1 페이지) $from_record = ($page - 1) * $rows; // 시작 열을 구함 $group_select = ''; - $list = array(); -$sql = " select a.*, b.bo_subject, c.gr_subject, c.gr_id - {$sql_common} - {$sql_order} - limit {$from_record}, {$rows} "; +$sql = " select a.*, b.bo_subject, c.gr_subject, c.gr_id {$sql_common} {$sql_order} limit {$from_record}, {$rows} "; $result = sql_query($sql); -for ($i=0; $row=sql_fetch_array($result); $i++) -{ - $tmp_write_table = $g4[write_prefix] . $row[bo_table]; +for ($i=0; $row=sql_fetch_array($result); $i++) { + $tmp_write_table = $g4['write_prefix'].$row['bo_table']; - if ($row[wr_id] == $row[wr_parent]) // 원글 - { + if ($row['wr_id'] == $row['wr_parent']) { + + // 원글 $comment = ""; $comment_link = ""; $row2 = sql_fetch(" select * from {$tmp_write_table} where wr_id = '$row[wr_id]' "); $list[$i] = $row2; - $name = get_sideview($row2[mb_id], cut_str($row2[wr_name], $config[cf_cut_name]), $row2[wr_email], $row2[wr_homepage]); + $name = get_sideview($row2['mb_id'], cut_str($row2['wr_name'], $config['cf_cut_name']), $row2['wr_email'], $row2['wr_homepage']); // 당일인 경우 시간으로 표시함 - $datetime = substr($row2[wr_datetime],0,10); - $datetime2 = $row2[wr_datetime]; - if ($datetime == $g4[time_ymd]) + $datetime = substr($row2['wr_datetime'],0,10); + $datetime2 = $row2['wr_datetime']; + if ($datetime == $g4['time_ymd']) { $datetime2 = substr($datetime2,11,5); - else + } else { $datetime2 = substr($datetime2,5,5); + } - } - else // 코멘트 - { + } else { + + // 코멘트 $comment = '[코] '; - $comment_link = '#c_'.$row[wr_id]; - $row2 = sql_fetch(" select * from {$tmp_write_table} where wr_id = '{$row[wr_parent]}' "); - $row3 = sql_fetch(" select mb_id, wr_name, wr_email, wr_homepage, wr_datetime from {$tmp_write_table} where wr_id = '{$row[wr_id]}' "); + $comment_link = '#c_'.$row['wr_id']; + $row2 = sql_fetch(" select * from {$tmp_write_table} where wr_id = '{$row['wr_parent']}' "); + $row3 = sql_fetch(" select mb_id, wr_name, wr_email, wr_homepage, wr_datetime from {$tmp_write_table} where wr_id = '{$row['wr_id']}' "); $list[$i] = $row2; - $list[$i][mb_id] = $row3[mb_id]; - $list[$i][wr_name] = $row3[wr_name]; - $list[$i][wr_email] = $row3[wr_email]; - $list[$i][wr_homepage] = $row3[wr_homepage]; + $list[$i]['mb_id'] = $row3['mb_id']; + $list[$i]['wr_name'] = $row3['wr_name']; + $list[$i]['wr_email'] = $row3['wr_email']; + $list[$i]['wr_homepage'] = $row3['wr_homepage']; - $name = get_sideview($row3[mb_id], cut_str($row3[wr_name], $config[cf_cut_name]), $row3[wr_email], $row3[wr_homepage]); + $name = get_sideview($row3['mb_id'], cut_str($row3['wr_name'], $config['cf_cut_name']), $row3['wr_email'], $row3['wr_homepage']); // 당일인 경우 시간으로 표시함 - $datetime = substr($row3[wr_datetime],0,10); - $datetime2 = $row3[wr_datetime]; - if ($datetime == $g4[time_ymd]) + $datetime = substr($row3['wr_datetime'],0,10); + $datetime2 = $row3['wr_datetime']; + if ($datetime == $g4['time_ymd']) { $datetime2 = substr($datetime2,11,5); - else + } else { $datetime2 = substr($datetime2,5,5); + } + } - $list[$i][gr_id] = $row[gr_id]; - $list[$i][bo_table] = $row[bo_table]; - $list[$i][name] = $name; - $list[$i][comment] = $comment; - $list[$i][href] = './board.php?bo_table='.$row[bo_table].'&wr_id='.$row2[wr_id].$comment_link; - $list[$i][datetime] = $datetime; - $list[$i][datetime2] = $datetime2; + $list[$i]['gr_id'] = $row['gr_id']; + $list[$i]['bo_table'] = $row['bo_table']; + $list[$i]['name'] = $name; + $list[$i]['comment'] = $comment; + $list[$i]['href'] = './board.php?bo_table='.$row['bo_table'].'&wr_id='.$row2['wr_id'].$comment_link; + $list[$i]['datetime'] = $datetime; + $list[$i]['datetime2'] = $datetime2; - $list[$i][gr_subject] = $row[gr_subject]; - $list[$i][bo_subject] = $row[bo_subject]; - $list[$i][wr_subject] = $row2[wr_subject]; + $list[$i]['gr_subject'] = $row['gr_subject']; + $list[$i]['bo_subject'] = $row['bo_subject']; + $list[$i]['wr_subject'] = $row2['wr_subject']; } -$write_pages = get_paging($config[cf_write_pages], $page, $total_page, "?gr_id=$gr_id&view=$view&mb_id=$mb_id&page="); +$write_pages = get_paging($config['cf_write_pages'], $page, $total_page, "?gr_id=$gr_id&view=$view&mb_id=$mb_id&page="); -$new_skin_path = $g4['path'].'/skin/new/'.$config[cf_new_skin]; +$new_skin_path = $g4['path'].'/skin/new/'.$config['cf_new_skin']; echo ''.PHP_EOL; diff --git a/bbs/password_forget.php b/bbs/password_forget.php deleted file mode 100644 index e1ce9f6e3..000000000 --- a/bbs/password_forget.php +++ /dev/null @@ -1,24 +0,0 @@ - - alert('이미 로그인중입니다.'); - window.close(); - opener.document.location.reload(); - -HEREDOC; - exit; -} - -$g4['title'] = '회원아이디/패스워드 찾기'; -include_once($g4['path'].'/head.sub.php'); - -$member_skin_path = $g4['path'].'/skin/member/'.$config[cf_member_skin]; -include_once($member_skin_path.'/password_forget.skin.php'); - -include_once($g4['path'].'/tail.sub.php'); -?> \ No newline at end of file diff --git a/bbs/password_forget2.php b/bbs/password_forget2.php deleted file mode 100644 index db682a754..000000000 --- a/bbs/password_forget2.php +++ /dev/null @@ -1,36 +0,0 @@ - \ No newline at end of file diff --git a/bbs/password_forget3.php b/bbs/password_forget3.php deleted file mode 100644 index edeb4a598..000000000 --- a/bbs/password_forget3.php +++ /dev/null @@ -1,46 +0,0 @@ - \ No newline at end of file diff --git a/bbs/password_lost.php b/bbs/password_lost.php index 945139787..2be67f14a 100644 --- a/bbs/password_lost.php +++ b/bbs/password_lost.php @@ -1,22 +1,20 @@ - - - - 1) +if ($row['cnt'] > 1) alert('동일한 메일주소가 2개 이상 존재합니다.\n\n관리자에게 문의하여 주십시오.'); -$sql = " select mb_no, mb_id, mb_name, mb_nick, mb_email, mb_datetime from {$g4[member_table]} where mb_email = '{$email}' "; +$sql = " select mb_no, mb_id, mb_name, mb_nick, mb_email, mb_datetime from {$g4['member_table']} where mb_email = '{$email}' "; $mb = sql_fetch($sql); -if (!$mb[mb_id]) +if (!$mb['mb_id']) alert('존재하지 않는 회원입니다.'); -else if (is_admin($mb[mb_id])) +else if (is_admin($mb['mb_id'])) alert('관리자 아이디는 접근 불가합니다.'); // 난수 발생 diff --git a/bbs/poll_result.php b/bbs/poll_result.php index 8f2e91e3e..b1f9a1434 100644 --- a/bbs/poll_result.php +++ b/bbs/poll_result.php @@ -1,72 +1,70 @@ $max) - $max = $po[po_cnt.$i]; + $count = $po['po_cnt'.$i]; + $total_po_cnt += $count; + + if ($count > $max) + $max = $count; } $nf_total_po_cnt = number_format($total_po_cnt); $list = array(); -for ($i=1; $i<=9; $i++) -{ +for ($i=1; $i<=9; $i++) { $poll = $po['po_poll'.$i]; if ($poll == '') { break; } - $list[$i][content] = $poll; - $list[$i][cnt] = $po[po_cnt.$i]; + $list[$i]['content'] = $poll; + $list[$i]['cnt'] = $po['po_cnt'.$i]; if ($total_po_cnt > 0) - $list[$i][rate] = ($list[$i][cnt] / $total_po_cnt) * 100; + $list[$i]['rate'] = ($list[$i]['cnt'] / $total_po_cnt) * 100; - $bar = (int)($list[$i][cnt] / $max * 100); + $bar = (int)($list[$i]['cnt'] / $max * 100); - $list[$i][bar] = $bar; - $list[$i][num] = $i; + $list[$i]['bar'] = $bar; + $list[$i]['num'] = $i; } $list2 = array(); // 기타의견 리스트 $sql = " select a.*, b.mb_open - from {$g4[poll_etc_table]} a - left join {$g4[member_table]} b on (a.mb_id = b.mb_id) + from {$g4['poll_etc_table']} a + left join {$g4['member_table']} b on (a.mb_id = b.mb_id) where po_id = '{$po_id}' order by pc_id desc "; $result = sql_query($sql); -for ($i=0; $row=sql_fetch_array($result); $i++) -{ - $list2[$i][name] = get_sideview($row[mb_id], cut_str($row[pc_name],10), '', '', $row[mb_open]); - $list2[$i][idea] = get_text(cut_str($row[pc_idea], 255)); - $list2[$i][datetime] = $row[pc_datetime]; +for ($i=0; $row=sql_fetch_array($result); $i++) { + $list2[$i]['name'] = get_sideview($row['mb_id'], cut_str($row['pc_name'],10), '', '', $row['mb_open']); + $list2[$i]['idea'] = get_text(cut_str($row['pc_idea'], 255)); + $list2[$i]['datetime'] = $row['pc_datetime']; - $list2[$i][del] = ''; - if ($is_admin == 'super' || ($row[mb_id] == $member[mb_id] && $row[mb_id])) - $list2[$i][del] = ''; + $list2[$i]['del'] = ''; + if ($is_admin == 'super' || ($row['mb_id'] == $member['mb_id'] && $row['mb_id'])) + $list2[$i]['del'] = ''; } // 기타의견 입력 $is_etc = false; -if ($po[po_etc]) -{ +if ($po['po_etc']) { $is_etc = true; - $po_etc = $po[po_etc]; - if ($member[mb_id]) - $name = ''.$member[mb_nick].' '; + $po_etc = $po['po_etc']; + if ($member['mb_id']) + $name = ''.$member['mb_nick'].' '; else $name = ''; } @@ -74,20 +72,19 @@ if ($po[po_etc]) $list3 = array(); // 다른투표 -$sql = " select po_id, po_subject, po_date from {$g4[poll_table]} order by po_id desc "; +$sql = " select po_id, po_subject, po_date from {$g4['poll_table']} order by po_id desc "; $result = sql_query($sql); -for ($i=0; $row2=sql_fetch_array($result); $i++) -{ - $list3[$i][po_id] = $row2[po_id]; - $list3[$i][date] = substr($row2[po_date],2,8); - $list3[$i][subject] = cut_str($row2[po_subject],60,"…"); +for ($i=0; $row2=sql_fetch_array($result); $i++) { + $list3[$i]['po_id'] = $row2['po_id']; + $list3[$i]['date'] = substr($row2['po_date'],2,8); + $list3[$i]['subject'] = cut_str($row2['po_subject'],60,"…"); } include_once($g4['path'].'/head.sub.php'); echo ''; -if (!$skin_dir) $skin_dir = 'basic'; +$skin_dir = isset($_GET['skin_dir']) ? $_GET['skin_dir'] : 'basic'; $poll_skin_path = $g4['path'].'/skin/poll/'.$skin_dir; if (!file_exists($poll_skin_path.'/poll_result.skin.php')) die('skin error'); include_once ($poll_skin_path.'/poll_result.skin.php'); diff --git a/bbs/poll_update.php b/bbs/poll_update.php index 035dad5ab..954f12f3b 100644 --- a/bbs/poll_update.php +++ b/bbs/poll_update.php @@ -1,23 +1,20 @@ diff --git a/bbs/register.php b/bbs/register.php index 5261ae935..20fd67812 100644 --- a/bbs/register.php +++ b/bbs/register.php @@ -11,6 +11,12 @@ set_session("ss_mb_reg", ""); $member_skin_path = $g4['path'].'/skin/member/'.$config['cf_member_skin']; +if ($g4['https_url']) { + $register_action_url = $g4['https_url'].'/'.$g4['bbs'].'/register_form.php'; +} else { + $register_action_url = $g4['bbs_url'].'/register_form.php'; +} + $g4['title'] = '회원가입약관'; include_once('./_head.php'); include_once($member_skin_path.'/register.skin.php'); diff --git a/bbs/register_form.php b/bbs/register_form.php index f21edc0ad..7b3162810 100644 --- a/bbs/register_form.php +++ b/bbs/register_form.php @@ -1,5 +1,5 @@ '' "; + } else { + $sql3 = " select count(*) as cnt from {$g4['group_member_table']} where gr_id = '{$row['gr_id']}' and mb_id = '{$member['mb_id']}' and mb_id <> '' "; $row3 = sql_fetch($sql3); - if (!$row3[cnt]) + if (!$row3['cnt']) continue; } } } - $g4_search[tables][] = $row[bo_table]; - $g4_search[read_level][] = $row[bo_read_level]; + $g4_search['tables'][] = $row['bo_table']; + $g4_search['read_level'][] = $row['bo_read_level']; } $search_query = 'sfl='.urlencode($sfl).'&stx='.urlencode($stx).'&sop='.$sop; @@ -64,20 +66,18 @@ if ($stx) $field = explode('||', trim($sfl)); $str = '('; - for ($i=0; $i'.$row2[bo_subject].' ('.$row[cnt].')'; + $str_board_list .= '
  • '.$row2[bo_subject].' ('.$row[cnt].')'; } } $rows = $srows; - $total_page = ceil($total_count / $rows); // 전체 페이지 계산 + $total_page = ceil($total_count / $rows); // 전체 페이지 계산 if ($page == "") { $page = 1; } // 페이지가 없으면 첫 페이지 (1 페이지) $from_record = ($page - 1) * $rows; // 시작 열을 구함 - for ($i=0; $i'; } $group_select = ''; if (!$sfl) $sfl = 'wr_subject'; if (!$sop) $sop = 'or'; -$search_skin_path = $g4['path'].'/skin/search/'.$config[cf_search_skin]; +$search_skin_path = $g4['path'].'/skin/search/'.$config['cf_search_skin']; include_once($search_skin_path.'/search.skin.php'); include_once('./_tail.php'); diff --git a/bbs/view_comment.php b/bbs/view_comment.php index 5248a905c..159f62670 100644 --- a/bbs/view_comment.php +++ b/bbs/view_comment.php @@ -3,7 +3,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 $captcha_html = ""; if ($is_guest) { - $captcha_html = captcha_html('wr_key', '_comment'); + $captcha_html = captcha_html('_comment'); } @include_once($board_skin_path.'/view_comment.head.skin.php'); diff --git a/bbs/write.php b/bbs/write.php index 65cd17707..9173a5379 100644 --- a/bbs/write.php +++ b/bbs/write.php @@ -1,4 +1,6 @@ 보안 > 사용자정의수준 > 스크립팅 > Action 스크립팅 > 사용 안 함" 일 경우의 오류 처리 // 이 옵션을 사용 안 함으로 설정할 경우 어떤 스크립트도 실행 되지 않습니다. diff --git a/bbs/write_update.php b/bbs/write_update.php index a66b8b5a1..559cf9f1a 100644 --- a/bbs/write_update.php +++ b/bbs/write_update.php @@ -1,4 +1,5 @@ diff --git a/css/def.css b/css/default.css similarity index 84% rename from css/def.css rename to css/default.css index 8c748fd45..115f1e5da 100644 --- a/css/def.css +++ b/css/default.css @@ -15,6 +15,10 @@ hr {display:none} /* 웹접근성 스킬 */ .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} +#to_content a:focus, +#to_content a:active {padding:10px 0;width:100%;height:auto;background:#333;color:#fff;text-align:center;overflow:auto} /* 자동등록방지 */ .captcha {display:inline-block;vertical-align:middle} @@ -30,7 +34,7 @@ caption {padding:0 0 10px;text-align:left} th {padding:12px 0 8px;border-top:3px solid #666;border-bottom:1px solid #a9a9a9;font-size:0.75em} th input {vertical-align:top} /* middle 로 하면 게시판 읽기에서 목록 사용시 체크박스 라인 깨짐 */ td {padding:10px 0;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9;font-size:0.75em} -.empty_table {padding:50px 0;text-align:center} +.empty_table {padding:85px 0;text-align:center} /* 필드셋 */ fieldset {margin-bottom:20px;padding:13px;border:1px solid #dedace;background:#fefefe} @@ -38,14 +42,14 @@ legend {margin-left:0;padding:7px 10px;border:1px solid #dedace;background:#333; fieldset .fieldset_input, fieldset textarea {padding:3px;border:1px solid #ddd;background:#fff;vertical-align:middle} fieldset .fieldset_input:focus, -fieldset textarea:focus {padding:4px;border:0;background:#555;color:#fff} -fieldset select {padding:2px;border:1px solid #ddd;background:#f9f9f5;vertical-align:middle} +fieldset textarea:focus {padding:4px;border:0;background:#494949;color:#fff} +fieldset select {padding:2px 2px 3px;border:1px solid #ddd;background:#f9f9f5;vertical-align:middle} fieldset p {margin:0} fieldset .span_highlight {color:#ff3061} fieldset button, -.fieldset_submit {padding:0 15px;height:24px;border:0;background:#555;color:#fff;font-size:0.75em;line-height:1.9em;vertical-align:middle;cursor:pointer} +.fieldset_submit {padding:0 15px;height:24px;border:0;background:#494949;color:#fff;font-size:0.75em;line-height:1.9em;vertical-align:middle;cursor:pointer} fieldset button:focus, -.fieldset_submit:focus {padding:0 15px;height:24px;border:0;background:#555;color:#fff;font-size:0.75em;line-height:1.9em;vertical-align:middle} +.fieldset_submit:focus {padding:0 15px;height:24px;border:0;background:#494949;color:#fff;font-size:0.75em;line-height:1.9em;vertical-align:middle} /* 이미지 등비율 리사이징 */ .img_fix {float:left;margin-bottom:20px;width:100%;height:auto} @@ -57,11 +61,6 @@ fieldset button:focus, #install_done div {position:relative;margin:0 auto;width:700px;background:#000} #install_done div span {position:absolute;top:-28px;left:0;width:700px;height:580px;background:url("../img/install_done.jpg")} -/* 내용 건너뛰기 */ -#to_content a {display:block;position:absolute;top:0;left:0;height:0;overflow:hidden} -#to_content a:focus, -#to_content a:active {padding:10px 0;width:100%;height:auto;background:#333;color:#fff;text-align:center;overflow:auto} - /* 헤딩 */ h1 {margin:0 0 20px;font-size:1.6em} h2, h3, h4, h5, h6 {margin:0 0 20px} @@ -74,30 +73,28 @@ a {color:#000;text-decoration:none} #header h1 {margin:0;height:0;overflow:hidden} /* 로고 */ -#logo {border-bottom:3px solid #888;background:#333;text-align:center} -#logo a {display:inline-block;padding:55px 30px 20px} +#logo {padding-top:35px;border-bottom:3px solid #666;background:url('../img/logo_bg.jpg') #333 top center repeat-x;text-align:center} +#logo a {display:inline-block;padding:20px 30px 20px} /* 상단메뉴 */ -#tnb {position:absolute;top:0;left:0;width:100%;border-bottom:1px solid #bbb;background:#fff;zoom:1} +#tnb {position:absolute;top:0;left:0;width:100%;border-bottom:1px solid #000;background:url('../img/tnb_bg.jpg') #fff bottom left repeat-x;zoom:1} #tnb:after {display:block;visibility:hidden;clear:both;content:""} #tnb li {float:left} -#tnb a {display:inline-block;padding:0 10px;height:30px;border-right:1px solid #eee;font-family:"dotum";font-size:0.7em;text-decoration:none;line-height:2.7em} -#tnb a:hover, -#tnb a:focus {background:#f9f9f5} +#tnb a {display:inline-block;padding:0 10px;height:30px;border-right:1px solid #ccc;font-family:"dotum";font-size:0.7em;text-decoration:none;line-height:2.7em} /* 전체검색 */ -#hdsch {z-index:3;position:absolute;top:0;right:0;margin:0;padding:0;width:220px;border:0;border-left:1px solid #eee;background:#fff} +#hdsch {z-index:3;position:absolute;top:0;right:0;margin:0;padding:0;width:220px;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} #hdsch_stx:focus {background:#464649;color:#fff} -#hdsch_submit {position:relative;margin-left:-5px} +#hdsch_submit {position:relative} /* 사이드 네비게이션: 아웃로그인, 설문조사 등 */ -#snb {z-index:3;position:absolute;top:116px;right:0;font-family:"verdana","dotum"} +#snb {z-index:3;position:absolute;top:115px;right:0;font-family:"verdana","dotum"} #snb ul {margin:0;padding:0;list-style:none} /* 아웃로그인 */ -.outlogin {position:relative;border-bottom:1px solid #bbb;border-left:1px solid #bbb;background:#f0f3f6;line-height:1em} +.outlogin {position:relative;border-bottom:1px solid #bbb;background:#e3e6ea;line-height:1em} .outlogin h2 {margin:0;padding:0;height:0;overflow:hidden} /* 아웃로그인 전 */ #ol_before {padding:15px 10px 0;width:199px;font-size:0.7em} @@ -117,28 +114,34 @@ a {color:#000;text-decoration:none} #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 {padding:15px 0 13px;border-bottom:1px solid #efeada;text-align:center} -#ol_after_hd a {color:#ff3061} -#ol_after ul {margin:0;padding:0;zoom:1} +#ol_after_hd {position:relative;padding:15px 10px 11px} +#ol_after_hd a {position:absolute;top:16px;right:10px;color:#815e68} +#ol_after ul {margin:0;border-top:1px solid #ddd;zoom:1} #ol_after ul:after {display:block;visibility:hidden;clear:both;content:""} #ol_after li {float:left} #ol_after_rec {background:#fff} -#ol_after_rec a {display:inline-block;position:relative;width:60px;height:60px;vertical-align:top} -#ol_after_rec span {position:absolute;top:0;left:0;width:100%;height:100%;background:#fff} -#ol_after_rec strong {position:absolute;top:35px;left:0;width:100%;color:#777;text-align:center} -#ol_after_rec #ol_after_pt {width:97px;border-right:1px solid #efeada;border-left:1px solid #efeada} -#ol_after_ft {border-top:1px solid #efeada;text-align:center} -#ol_after_ft a {display:inline-block;padding:7px 0 !important;text-align:center} -#ol_after_info {width:109px;border-right:1px solid #efeada} -#ol_after_logout {width:109px} +#ol_after_rec a {display:inline-block;position:relative;width:60px;height:50px;font-size:0.9em;vertical-align:top} +#ol_after_rec span {position:absolute;top:0;left:0;width:100%;height:100%;text-align:center;line-height:7em} +#ol_after_rec #ol_after_pt {width:97px;border-right:1px solid #ddd;border-left:1px solid #ddd} +#ol_after_memo span {background:url('../img/ol_after_bg.jpg')} +#ol_after_memo:focus span, +#ol_after_memo:hover span {background-position:0 -50px} +#ol_after_pt span {background:url('../img/ol_after_bg.jpg') -61px 0} +#ol_after_pt:focus span, +#ol_after_pt:hover span {background-position:-61px -50px} +#ol_after_scrap span {background:url('../img/ol_after_bg.jpg') -159px 0} +#ol_after_scrap:focus span, +#ol_after_scrap:hover span {background-position:-159px -50px} +#ol_after_ft {background:#f0f0f0;text-align:center} +#ol_after_ft a {display:inline-block;padding:9px 0 8px !important;width:109px;text-align:center} /* 설문조사 */ -#poll {width:219px;border-bottom:1px solid #bbb;border-left:1px solid #bbb;background:#fff;font-size:0.75em} -#poll header {padding:10px 10px 1px;border-bottom:1px solid #efeada;background:#f0f3f6} -#poll header a {color:#ff3061} +#poll {width:219px;border-bottom:1px solid #bbb;background:#fff;font-size:0.75em} +#poll header {position:relative;padding:15px 10px 1px;border-bottom:1px solid #ddd;background:#e3e6ea} +#poll header a {position:absolute;top:15px;right:10px;color:#815e68} #poll h2 {display:inline-block;margin:0;font-size:1em} #poll p {padding:0} -#poll ul {margin:10px} +#poll ul {padding:5px 10px} #poll li {margin:7px 0} #poll footer {padding:10px 10px 15px;text-align:center} #poll footer input {padding:0 15px;height:24px;border:0;background:#494936;color:#fff;font-size:0.9em;letter-spacing:-0.1em;vertical-align:top} @@ -169,8 +172,8 @@ a {color:#000;text-decoration:none} #poll_result_another a {display:block;padding:5px 0} /* 레이아웃 중간 */ -#wrapper {z-index:2;clear:both;position:relative;margin:-2px 0 0 0;padding:1px 240px 30px 20px;min-height:520px;height:auto !important;height:520px;background:url("../img/wrapper_bg.jpg") top right repeat-y} -#wrapper h1 {margin-top:20px} +#wrapper {z-index:2;clear:both;position:relative;padding:20px 240px 30px 20px;min-height:520px;height:auto !important;height:520px;background:url("../img/wrapper_bg.jpg") top right repeat-y} +#wrapper h1 {font-size:1em} /* 레이아웃 하단 */ #footer {z-index:1;position:relative;padding:15px 0 20px;border-top:1px solid #bbb;color:#595959;font-size:0.75em} @@ -216,7 +219,7 @@ a {color:#000;text-decoration:none} .btn02 {display:inline-block;padding:0 10px;height:24px;border:1px solid #ccc;background:#fafafa;color:#000;font-size:0.75em;text-decoration:none;line-height:2.2em} .btn02:hover, .btn02:focus {} -.btn03 {display:inline-block;padding:0 10px;height:24px;border:1px solid #555;background:#555;color:#fff;font-size:0.75em;text-decoration:none;line-height:2.2em} +.btn03 {display:inline-block;padding:0 10px;height:24px;border:1px solid #494949;background:#494949;color:#fff;font-size:0.75em;text-decoration:none;line-height:2.2em} .btn02:hover, .btn02:focus {} .btn_confirm {text-align:center} /* 서식단계 진행 */ @@ -228,7 +231,7 @@ a {color:#000;text-decoration:none} /* 폼 테이블 */ .frm_tbl {} -.frm_tbl caption {padding-top:10px;color:#ff3061;font-size:0.75em;font-weight:bold} +.frm_tbl caption {padding-top:10px;color:#999;font-size:0.75em;font-weight:bold} .frm_tbl th {padding-left:10px;width:160px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9;text-align:left} .frm_tbl td {padding:7px 10px} .frm_tbl textarea, @@ -237,7 +240,7 @@ a {color:#000;text-decoration:none} .frm_tbl textarea, .frm_tbl .frm_input {padding:2px;background:#f5f5f2} .frm_tbl textarea:focus, -.frm_tbl .frm_input:focus {padding:3px;border:0;background:#555;color:#fff} +.frm_tbl .frm_input:focus {padding:3px;border:0;background:#494949;color:#fff} .frm_tbl textarea {width:90%} .frm_tbl select {padding:2px} .frm_file {display:block;margin-bottom:5px} @@ -301,7 +304,6 @@ a {color:#000;text-decoration:none} #bo_sch {padding:0;border:0;text-align:center} #bo_sch legend {margin:0;padding:0;width:0;height:0;border:0;overflow:hidden} #bo_sch form {display:inline-block} -#bo_sch .fieldset_submit {border:1px solid #ccc;background:#fafafa;color:#000} #bo_list caption {padding:0;height:0;color:transparent;overflow:hidden} /* ff에서 감추기 위해 color:transparent 사용 */ #bo_list td {line-height:1em} #bo_list img {vertical-align:top} @@ -331,13 +333,13 @@ a {color:#000;text-decoration:none} #bo_v_atc {padding:0 10px;zoom:1} #bo_v_atc:after {display:block;visibility:hidden;clear:both;content:""} #bo_v_atc h1 {margin:0;padding:0;height:0;overflow:hidden} -#bo_v_atc p {padding:0 0 10px;font-size:0.875em} -#bo_v_file {background:#555;font-size:0.75em} +#bo_v_atc p {padding:0 0 10px;min-height:300px;height:auto !important;height:300px;font-size:0.875em} +#bo_v_file {background:#494949;font-size:0.75em} #bo_v_file h2 {margin:0;padding:0;height:0;overflow:hidden} #bo_v_file ul {margin:0;padding:0;list-style:none} #bo_v_file a {display:inline-block;margin-top:5px;padding:5px 10px;color:#fff} .bo_v_file_cnt {display:inline-block;margin-left:10px;color:#ddd} -#bo_v_link {background:#555;font-size:0.75em} +#bo_v_link {background:#494949;font-size:0.75em} #bo_v_link h2 {margin:0;padding:0;height:0;overflow:hidden} #bo_v_link ul {margin:0;padding:0;list-style:none} #bo_v_link a {display:inline-block;margin-top:5px;padding:5px 10px;color:#fff} @@ -380,7 +382,7 @@ a {color:#000;text-decoration:none} #bo_vc_w #captcha_comment {font-size:1em !important} #bo_vc_warea {position:relative;margin:10px 100px 10px 0} #bo_vc_warea textarea {width:100%;height:50px} -#bo_vc_warea .bo_vc_submit {position:absolute;top:0;right:-90px !important;right:10px;width:75px;height:57px;border:1px solid #666;background:#555;color:#fff;letter-spacing:-0.1em} +#bo_vc_warea .bo_vc_submit {position:absolute;top:0;right:-90px !important;right:10px;width:75px;height:57px;border:1px solid #666;background:#494949;color:#fff;letter-spacing:-0.1em} /* 우편번호 검색 */ #post_num dl {margin:0 auto 10px;padding:0;width:90%} @@ -415,7 +417,7 @@ a {color:#000;text-decoration:none} #new_search legend {margin:0;padding:0;width:0;height:0;border:0;overflow:hidden} /* 새창 공통 */ -.new_win h1 {padding:20px 30px 10px;background:#494949;color:#fff;font-size:1em} +.new_win h1 {padding:20px 30px 10px;background:#494949;color:#fff;font-size:0.875em} .new_win h1 a {color:#fff} .new_win article h1 {background:transparent;color:#000} .new_win h2 {font-size:1em} @@ -462,4 +464,4 @@ a {color:#000;text-decoration:none} .pg_page {background:#f9f9f9;text-decoration:none} .pg_start, .pg_prev {border-right:1px solid #ddd} .pg_end, .pg_next {border-left:1px solid #ddd} -.pg_current {background:#333;color:#fff} +.pg_current {background:#494949;color:#fff} diff --git a/extend/ckeditor.extend.php b/extend/ckeditor.extend.php index 8f1badf62..419dc09bf 100644 --- a/extend/ckeditor.extend.php +++ b/extend/ckeditor.extend.php @@ -1,6 +1,6 @@ url."/ckeditor.js"; $g4['js_file'][] = $ckeditor->url."/config.js"; } +*/ ?> \ No newline at end of file diff --git a/extend/ckeditor/ckeditor.lib.php b/extend/ckeditor/ckeditor.lib.php deleted file mode 100644 index cb7ee0718..000000000 --- a/extend/ckeditor/ckeditor.lib.php +++ /dev/null @@ -1,23 +0,0 @@ -$content\n"; - //if (_EDITOR_) $str .= "\n"; - return $str; -} - -// textarea 로 값을 넘김 -function editor_getdata($id) -{ - return "var {$id}_data = CKEDITOR.instances.{$id}.getData();\n"; -} - -// textarea 의 값이 비어 있는지 검사 -function editor_empty($id, $textarea_name="내용을") -{ - return "if (!{$id}_data) { alert(\"$textarea_name 입력해 주십시오.\"); CKEDITOR.instances.{$id}.focus(); return false; }\n"; -} -?> \ No newline at end of file diff --git a/extend/g4s.extend.php b/extend/g4s.extend.php new file mode 100644 index 000000000..def09b2d2 --- /dev/null +++ b/extend/g4s.extend.php @@ -0,0 +1,55 @@ + \ No newline at end of file diff --git a/extend/gcaptcha.extend.php b/extend/gcaptcha.extend.php index e12abd387..129ec511a 100644 --- a/extend/gcaptcha.extend.php +++ b/extend/gcaptcha.extend.php @@ -1,6 +1,7 @@ path}\";"; $g4['js_file'][] = $gcaptcha->url."/gcaptcha.js"; } +*/ ?> \ No newline at end of file diff --git a/extend/gcaptcha/fonts/.htaccess b/extend/gcaptcha/fonts/.htaccess deleted file mode 100644 index 55fa648e1..000000000 --- a/extend/gcaptcha/fonts/.htaccess +++ /dev/null @@ -1,4 +0,0 @@ - - Order allow,deny - Deny from all - \ No newline at end of file diff --git a/head.php b/head.php index 03137414b..da8e225a3 100644 --- a/head.php +++ b/head.php @@ -30,15 +30,15 @@ include_once($g4['path'].'/lib/popular.lib.php'); -
    - -
    + + + 사이트 내 전체검색 +
    - diff --git a/head.sub.php b/head.sub.php index 380996e3a..37c1c3947 100644 --- a/head.sub.php +++ b/head.sub.php @@ -48,22 +48,21 @@ header("Pragma: no-cache"); // HTTP/1.0 <?=$g4['title']?> - + "> -"> +"> "; + //echo ""; + header("Location:$url"); exit; } diff --git a/lib/outlogin.lib.php b/lib/outlogin.lib.php index 9fd969a1e..e6ff92be9 100644 --- a/lib/outlogin.lib.php +++ b/lib/outlogin.lib.php @@ -28,6 +28,34 @@ function outlogin($skin_dir='basic') $is_auth = true; } + if ($g4['https_url']) { + $outlogin_url = $_GET['url']; + if ($outlogin_url) { + if (preg_match("/^\.\.\//", $outlogin_url)) { + $outlogin_url = urlencode($g4[url]."/".preg_replace("/^\.\.\//", "", $outlogin_url)); + } + else { + $purl = parse_url($g4[url]); + if ($purl['path']) { + $path = urlencode($purl['path']); + $urlencode = preg_replace("/".$path."/", "", $urlencode); + } + $outlogin_url = $g4['url'].$urlencode; + } + } + else { + $outlogin_url = $g4['url']; + } + } + else { + $outlogin_url = $urlencode; + } + + if ($g4['https_url']) + $outlogin_action_url = "{$g4['https_url']}/$g4[bbs]/login_check.php"; + else + $outlogin_action_url = "{$g4['bbs_url']}/login_check.php"; + ob_start(); if ($is_member) include_once ($outlogin_skin_path.'/outlogin.skin.2.php'); diff --git a/lib/poll.lib.php b/lib/poll.lib.php index 1bf8a6be0..d8029f21d 100644 --- a/lib/poll.lib.php +++ b/lib/poll.lib.php @@ -7,8 +7,7 @@ function poll($skin_dir='basic', $po_id=false) global $config, $member, $g4; // 투표번호가 넘어오지 않았다면 가장 큰(최근에 등록한) 투표번호를 얻는다 - if (empty($po_id)) - { + if (empty($po_id)) { $po_id = $config['cf_max_po_id']; if (empty($po_id)) return ""; diff --git a/skin/board/neo/view_comment.skin.php b/skin/board/neo/view_comment.skin.php index 3771c3ca7..eced74792 100644 --- a/skin/board/neo/view_comment.skin.php +++ b/skin/board/neo/view_comment.skin.php @@ -191,7 +191,7 @@ var char_max = parseInt(); // 최대 } } - + return true; } diff --git a/skin/board/neo/write.skin.php b/skin/board/neo/write.skin.php index 004412cfa..6489dfd67 100644 --- a/skin/board/neo/write.skin.php +++ b/skin/board/neo/write.skin.php @@ -104,15 +104,7 @@ echo $option_hidden; - - '.$content.""; - } - ?> - + @@ -137,7 +129,7 @@ echo $option_hidden; - +
    @@ -190,8 +182,8 @@ function html_auto_br(obj) function fwrite_submit(f) { - - + + var subject = ""; var content = ""; @@ -226,7 +218,7 @@ function fwrite_submit(f) return false; } - + return true; } diff --git a/skin/connect/neo/current_connect.skin.php b/skin/connect/neo/current_connect.skin.php index 7b224ee71..57851277d 100644 --- a/skin/connect/neo/current_connect.skin.php +++ b/skin/connect/neo/current_connect.skin.php @@ -32,7 +32,3 @@ if ($i == 0) ?> - -
    - -
    diff --git a/skin/member/basic/calendar.skin.php b/skin/member/basic/calendar.skin.php deleted file mode 100644 index 418739d63..000000000 --- a/skin/member/basic/calendar.skin.php +++ /dev/null @@ -1,105 +0,0 @@ - - - - - - - - - - - - - - - - -
    - <<  - < - - - >  - >> -
    - - - - - - - - - - - "; - for ($k=0; $k<7; $k++) - { - $cnt++; - - echo ""; - } - echo "\n"; - if ($day >= $last_day) - break; - } - ?> -
    "; - - if ($cnt > $dt[wday]) - { - $day++; - if ($day <= $last_day) - { - $mm2 = substr("0".$mm,-2); - $day2 = substr("0".$day,-2); - - echo "
    $day
    "; - - if ($k==0) - echo ""; - else if ($k==6) - echo ""; - else - echo ""; - - $tmp_date = $yyyy.substr("0".$mm,-2).substr("0".$day,-2); - - $tmp = $mm2."-".$day2; - if ($nal[$tmp]) - { - $title = trim($nal[$tmp][1]); - //echo $title; - echo ""; - if (trim($nal[$tmp][2]) == "*") - echo ""; - } - - // 오늘이라면 - if ($today[year] == $yyyy && $today[mon] == $mm && $today[mday] == $day) - { - echo ""; - echo ""; - } - // 선택일(넘어온 값) 이라면 - else if ($tmp_date == $cur_date) - { - echo ""; - echo ""; - } - } else - echo " "; - } else - echo " "; - echo "
    -
    - - ";?> - 오늘 : -
    diff --git a/skin/member/neo/calendar.skin.php b/skin/member/neo/calendar.skin.php deleted file mode 100644 index 418739d63..000000000 --- a/skin/member/neo/calendar.skin.php +++ /dev/null @@ -1,105 +0,0 @@ - - - - - - - - - - - - - - - - -
    - <<  - < - - - >  - >> -
    - - - - - - - - - - - "; - for ($k=0; $k<7; $k++) - { - $cnt++; - - echo ""; - } - echo "\n"; - if ($day >= $last_day) - break; - } - ?> -
    "; - - if ($cnt > $dt[wday]) - { - $day++; - if ($day <= $last_day) - { - $mm2 = substr("0".$mm,-2); - $day2 = substr("0".$day,-2); - - echo "
    $day
    "; - - if ($k==0) - echo ""; - else if ($k==6) - echo ""; - else - echo ""; - - $tmp_date = $yyyy.substr("0".$mm,-2).substr("0".$day,-2); - - $tmp = $mm2."-".$day2; - if ($nal[$tmp]) - { - $title = trim($nal[$tmp][1]); - //echo $title; - echo ""; - if (trim($nal[$tmp][2]) == "*") - echo ""; - } - - // 오늘이라면 - if ($today[year] == $yyyy && $today[mon] == $mm && $today[mday] == $day) - { - echo ""; - echo ""; - } - // 선택일(넘어온 값) 이라면 - else if ($tmp_date == $cur_date) - { - echo ""; - echo ""; - } - } else - echo " "; - } else - echo " "; - echo "
    -
    - - ";?> - 오늘 : -
    diff --git a/skin/member/neo/login.skin.php b/skin/member/neo/login.skin.php index 108cc31d7..55621ecbe 100644 --- a/skin/member/neo/login.skin.php +++ b/skin/member/neo/login.skin.php @@ -1,44 +1,16 @@ -
    +
    - - + + - - + +
    @@ -49,14 +21,20 @@ else 회원아이디 및 패스워드가 기억 안나실 때는 아이디/패스워드 찾기를 이용하십시오.
    아직 회원이 아니시라면 회원으로 가입 후 이용해 주십시오.

    - 아이디/패스워드 찾기 + 아이디/패스워드 찾기 회원가입
    - diff --git a/skin/member/neo/register_form.skin.php b/skin/member/neo/register_form.skin.php index 9d04ddc68..987657741 100644 --- a/skin/member/neo/register_form.skin.php +++ b/skin/member/neo/register_form.skin.php @@ -195,7 +195,7 @@ var member_skin_path = ""; - +
    @@ -204,26 +204,6 @@ var member_skin_path = ""; - \ No newline at end of file diff --git a/skin/poll/neo/poll_result.skin.php b/skin/poll/neo/poll_result.skin.php index b0d0a52c5..b72ef26b2 100644 --- a/skin/poll/neo/poll_result.skin.php +++ b/skin/poll/neo/poll_result.skin.php @@ -15,11 +15,11 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가

  • - - 표 % + + 표 %

    - +
    • @@ -35,17 +35,17 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
    -

    님의 의견

    - - "; } ?> +

    님의 의견

    + + "; } ?>

    - +

    - = $po[po_level]) { ?> + = $po['po_level']) { ?>
    @@ -55,8 +55,8 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가

    - + if ($is_member) { $comment_size = 52; ?> + @@ -81,7 +81,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가

    다른 투표 결과 보기

    diff --git a/tail.php b/tail.php index d5488a272..a19e30f22 100644 --- a/tail.php +++ b/tail.php @@ -38,7 +38,6 @@ function fsearchbox_submit(f) return false; } - f.action = "/search.php"; return true; }