From 7f8d99014fd059942e705d57c4381b0873d65fee Mon Sep 17 00:00:00 2001 From: Arcturus Date: Sun, 22 Sep 2024 10:46:52 +0900 Subject: [PATCH] fix admin menu and add editorfont --- AvocadoEdition_Light/adm/_gnb.board.menu.php | 6 +- AvocadoEdition_Light/adm/_gnb.member.menu.php | 6 +- AvocadoEdition_Light/adm/_gnb.other.menu.php | 6 +- AvocadoEdition_Light/adm/_gnb.site.menu.php | 13 +- .../adm/board_copy_update.php | 4 +- AvocadoEdition_Light/adm/board_delete.inc.php | 10 +- AvocadoEdition_Light/adm/board_form.php | 26 +- AvocadoEdition_Light/adm/board_list.php | 2 +- .../adm/board_list_update.php | 31 +- AvocadoEdition_Light/adm/css/admin.layout.css | 66 +-- AvocadoEdition_Light/adm/editor_font.php | 15 + .../adm/editor_font_update.php | 6 + AvocadoEdition_Light/adm/head.sub.php | 3 +- AvocadoEdition_Light/adm/member_list.php | 4 +- AvocadoEdition_Light/adm/visit_list.php | 3 +- .../menucategory/menucategory.class.php | 2 +- .../plugin/editor/smarteditor2/editor.lib.php | 44 +- .../skin/board/basic/list.skin.php | 364 ++++++------ .../skin/board/basic/style.css | 3 - .../skin/board/basic/view.skin.php | 321 +++++----- .../skin/board/basic/view_comment.skin.php | 560 +++++++++--------- .../skin/board/basic/write.skin.php | 468 ++++++++------- 22 files changed, 971 insertions(+), 992 deletions(-) create mode 100644 AvocadoEdition_Light/adm/editor_font.php create mode 100644 AvocadoEdition_Light/adm/editor_font_update.php diff --git a/AvocadoEdition_Light/adm/_gnb.board.menu.php b/AvocadoEdition_Light/adm/_gnb.board.menu.php index b33712e..f508b94 100644 --- a/AvocadoEdition_Light/adm/_gnb.board.menu.php +++ b/AvocadoEdition_Light/adm/_gnb.board.menu.php @@ -4,7 +4,7 @@ if (!defined('_GNUBOARD_')) $menu["board"] = new MenuCategory("board", "board", "게시판관리", "/board_list.php", true, 2, "", 0); -$menu["board"]->addChildMenu("member", "게시판관리", G5_ADMIN_URL . "/board_list.php", true, 1, "gear-wide-connected", 0); +$menu["board"]->addChildMenu("member", "게시판관리", G5_ADMIN_URL . "/board_list.php", true, 1, "\F463", 0); $menu["board"]->getLastAddedMenu()->addSubURL("/board_list_update.php"); $menu["board"]->getLastAddedMenu()->addSubURL("/board_form.php"); $menu["board"]->getLastAddedMenu()->addSubURL("/board_form_update.php"); @@ -12,7 +12,7 @@ $menu["board"]->getLastAddedMenu()->addSubURL("/board_delete.php"); $menu["board"]->getLastAddedMenu()->addSubURL("/board_copy.php"); $menu["board"]->getLastAddedMenu()->addSubURL("/board_copy_update.php"); -$menu["board"]->addChildMenu("member", "게시판그룹관리", G5_ADMIN_URL . "/boardgroup_list.php", true, 2, "gear-wide-connected", 0); +$menu["board"]->addChildMenu("member", "게시판그룹관리", G5_ADMIN_URL . "/boardgroup_list.php", true, 2, "\F2EE", 0); $menu["board"]->getLastAddedMenu()->addSubURL("/boardgroup_list_update.php"); $menu["board"]->getLastAddedMenu()->addSubURL("/boardgroup_form.php"); $menu["board"]->getLastAddedMenu()->addSubURL("/boardgroup_form_update.php"); @@ -20,6 +20,6 @@ $menu["board"]->getLastAddedMenu()->addSubURL("/boardgroupmember_list.php"); $menu["board"]->getLastAddedMenu()->addSubURL("/boardgroupmember_update.php"); $menu["board"]->getLastAddedMenu()->addSubURL("/boardgroupmember_form.php"); -$menu["board"]->addChildMenu("member", "내용관리", G5_ADMIN_URL . "/contentlist.php", true, 2, "gear-wide-connected", 0); +$menu["board"]->addChildMenu("member", "내용관리", G5_ADMIN_URL . "/contentlist.php", true, 2, "\F620", 0); $menu["board"]->getLastAddedMenu()->addSubURL("/contentform.php"); $menu["board"]->getLastAddedMenu()->addSubURL("/contentformupdate.php"); diff --git a/AvocadoEdition_Light/adm/_gnb.member.menu.php b/AvocadoEdition_Light/adm/_gnb.member.menu.php index 4fa7507..572fd9e 100644 --- a/AvocadoEdition_Light/adm/_gnb.member.menu.php +++ b/AvocadoEdition_Light/adm/_gnb.member.menu.php @@ -4,13 +4,13 @@ if (!defined('_GNUBOARD_')) $menu["member"] = new MenuCategory("member", "member", "회원관리", "/member_list.php", true, 1, "", 0); -$menu["member"]->addChildMenu("member", "회원관리", G5_ADMIN_URL . "/member_list.php", true, 1, "gear-wide-connected", 0); +$menu["member"]->addChildMenu("member", "회원관리", G5_ADMIN_URL . "/member_list.php", true, 1, "\F8A7", 0); $menu["member"]->getLastAddedMenu()->addSubURL("/member_form.php"); $menu["member"]->getLastAddedMenu()->addSubURL("/member_delete.php"); $menu["member"]->getLastAddedMenu()->addSubURL("/member_list_update.php"); $menu["member"]->getLastAddedMenu()->addSubURL("/member_list_delete.php"); -$menu["member"]->addChildMenu("member", "접속자집계", G5_ADMIN_URL . "/visit_list.php", true, 2, "grid-1x2", 0); +$menu["member"]->addChildMenu("member", "접속자집계", G5_ADMIN_URL . "/visit_list.php", true, 2, "\F3F2", 0); $menu["member"]->getLastAddedMenu()->addSubURL("/visit_domain.php"); $menu["member"]->getLastAddedMenu()->addSubURL("/visit_browser.php"); $menu["member"]->getLastAddedMenu()->addSubURL("/visit_os.php"); @@ -21,5 +21,5 @@ $menu["member"]->getLastAddedMenu()->addSubURL("/visit_week.php"); $menu["member"]->getLastAddedMenu()->addSubURL("/visit_month.php"); $menu["member"]->getLastAddedMenu()->addSubURL("/visit_year.php"); -$menu["member"]->addChildMenu("member", "접속자로그삭제", G5_ADMIN_URL . "/visit_delete.php", true, 3, "palette2", 0); +$menu["member"]->addChildMenu("member", "접속자로그삭제", G5_ADMIN_URL . "/visit_delete.php", true, 3, "\F5DE", 0); $menu["member"]->getLastAddedMenu()->addSubURL("/visit_delete_update.php"); diff --git a/AvocadoEdition_Light/adm/_gnb.other.menu.php b/AvocadoEdition_Light/adm/_gnb.other.menu.php index 98a662e..81bb597 100644 --- a/AvocadoEdition_Light/adm/_gnb.other.menu.php +++ b/AvocadoEdition_Light/adm/_gnb.other.menu.php @@ -4,8 +4,8 @@ if (!defined('_GNUBOARD_')) $menu["other"] = new MenuCategory("other", "other", "기타관리", "/config_form.php", true, 99, "", 0); -$menu["other"]->addChildMenu("other", "홈페이지 상세관리", G5_ADMIN_URL . "/config_form.php", true, 1, "gear-wide-connected", 0); +$menu["other"]->addChildMenu("other", "홈페이지 상세관리", G5_ADMIN_URL . "/config_form.php", true, 1, "\F3E3", 0); $menu["other"]->getLastAddedMenu()->addSubURL("/config_form_update.php"); -$menu["other"]->addChildMenu("other", "세션파일 일괄삭제", G5_ADMIN_URL . "/session_file_delete.php", true, 1, "gear-wide-connected", 0); -$menu["other"]->addChildMenu("other", "캐시파일 일괄삭제", G5_ADMIN_URL . "/cache_file_delete.php", true, 1, "gear-wide-connected", 0); +$menu["other"]->addChildMenu("other", "세션파일 일괄삭제", G5_ADMIN_URL . "/session_file_delete.php", true, 1, "\F8C3", 0); +$menu["other"]->addChildMenu("other", "캐시파일 일괄삭제", G5_ADMIN_URL . "/cache_file_delete.php", true, 1, "\F8C3", 0); diff --git a/AvocadoEdition_Light/adm/_gnb.site.menu.php b/AvocadoEdition_Light/adm/_gnb.site.menu.php index 4255b76..fa714b1 100644 --- a/AvocadoEdition_Light/adm/_gnb.site.menu.php +++ b/AvocadoEdition_Light/adm/_gnb.site.menu.php @@ -4,22 +4,25 @@ if (!defined('_GNUBOARD_')) $menu["config"] = new MenuCategory("config", "config", "사이트 설정", "/site_config_form.php", true, 0, "", 0); -$menu["config"]->addChildMenu("config", "환경설정", G5_ADMIN_URL . "/site_config_form.php", true, 1, "gear-wide-connected", 0); +$menu["config"]->addChildMenu("config", "환경설정", G5_ADMIN_URL . "/site_config_form.php", true, 1, "\F3E5", 0); $menu["config"]->getLastAddedMenu()->addSubURL("/site_config_form_update.php"); -$menu["config"]->addChildMenu("config", "메인 편집", G5_ADMIN_URL . "/viewer_form.php", true, 2, "grid-1x2", 0); +$menu["config"]->addChildMenu("config", "메인 편집", G5_ADMIN_URL . "/viewer_form.php", true, 2, "\F3F4", 0); $menu["config"]->getLastAddedMenu()->addSubURL("/viewer_form_update.php"); -$menu["config"]->addChildMenu("config", "테마 설정", G5_ADMIN_URL . "/theme.php", true, 3, "palette2", 0); +$menu["config"]->addChildMenu("config", "테마 설정", G5_ADMIN_URL . "/theme.php", true, 3, "\F4B2", 0); $menu["config"]->getLastAddedMenu()->addSubURL("/theme_config_load.php"); $menu["config"]->getLastAddedMenu()->addSubURL("/theme_detail.php"); $menu["config"]->getLastAddedMenu()->addSubURL("/theme_update.php"); $menu["config"]->getLastAddedMenu()->addSubURL("/theme_preview.php"); -$menu["config"]->addChildMenu("config", "디자인 설정", G5_ADMIN_URL . "/design_form.php", true, 4, "brush", 0); +$menu["config"]->addChildMenu("config", "디자인 설정", G5_ADMIN_URL . "/design_form.php", true, 4, "\F1D8", 0); $menu["config"]->getLastAddedMenu()->addSubURL("/design_form_update.php"); -$menu["config"]->addChildMenu("config", "메뉴 설정", G5_ADMIN_URL . "/menu_list.php", true, 5, "list", 0); +$menu["config"]->addChildMenu("config", "폰트 설정", G5_ADMIN_URL . "/editor_font.php", true, 5, "\F3DA", 0); +$menu["config"]->getLastAddedMenu()->addSubURL("/editor_font_update.php"); + +$menu["config"]->addChildMenu("config", "메뉴 설정", G5_ADMIN_URL . "/menu_list.php", true, 6, "\F478", 0); $menu["config"]->getLastAddedMenu()->addSubURL("/menu_list_update.php"); $menu["config"]->getLastAddedMenu()->addSubURL("/menu_form.php"); $menu["config"]->getLastAddedMenu()->addSubURL("/menu_form_search.php"); diff --git a/AvocadoEdition_Light/adm/board_copy_update.php b/AvocadoEdition_Light/adm/board_copy_update.php index 45efac1..ba9c240 100644 --- a/AvocadoEdition_Light/adm/board_copy_update.php +++ b/AvocadoEdition_Light/adm/board_copy_update.php @@ -30,7 +30,7 @@ if ($copy_case == 'schema_only') { } // 게시판 정보 -$sql = " insert into {$g5['board_table']} +$sql = "INSERT INTO {$g5['board_table']} set bo_table = '$target_table', bo_type = '{$board['bo_type']}', gr_id = '{$board['gr_id']}', @@ -180,7 +180,7 @@ if ($copy_case == 'schema_data_both') { if (count($file_copy)) { for ($i = 0; $i < count($file_copy); $i++) { - $sql = " insert into {$g5['board_file_table']} + $sql = "INSERT INTO {$g5['board_file_table']} set bo_table = '$target_table', wr_id = '{$file_copy[$i]['wr_id']}', bf_no = '{$file_copy[$i]['bf_no']}', diff --git a/AvocadoEdition_Light/adm/board_delete.inc.php b/AvocadoEdition_Light/adm/board_delete.inc.php index 44c1737..26f1060 100644 --- a/AvocadoEdition_Light/adm/board_delete.inc.php +++ b/AvocadoEdition_Light/adm/board_delete.inc.php @@ -16,19 +16,19 @@ if (!$tmp_bo_table) { //if ($row['cnt'] <= 1) { return; } // 게시판 설정 삭제 -sql_query(" delete from {$g5['board_table']} where bo_table = '{$tmp_bo_table}' "); +sql_query("DELETE FROM {$g5['board_table']} WHERE bo_table = '{$tmp_bo_table}' "); // 최신글 삭제 -sql_query(" delete from {$g5['board_new_table']} where bo_table = '{$tmp_bo_table}' "); +sql_query("DELETE FROM {$g5['board_new_table']} WHERE bo_table = '{$tmp_bo_table}' "); // 스크랩 삭제 -sql_query(" delete from {$g5['scrap_table']} where bo_table = '{$tmp_bo_table}' "); +sql_query("DELETE FROM {$g5['scrap_table']} WHERE bo_table = '{$tmp_bo_table}' "); // 파일 삭제 -sql_query(" delete from {$g5['board_file_table']} where bo_table = '{$tmp_bo_table}' "); +sql_query("DELETE FROM {$g5['board_file_table']} WHERE bo_table = '{$tmp_bo_table}' "); // 게시판 테이블 DROP -sql_query(" drop table {$g5['write_prefix']}{$tmp_bo_table} ", FALSE); +sql_query("DROP TABLE {$g5['write_prefix']}{$tmp_bo_table} ", FALSE); delete_cache_latest($tmp_bo_table); diff --git a/AvocadoEdition_Light/adm/board_form.php b/AvocadoEdition_Light/adm/board_form.php index 0036965..ab0c7f5 100644 --- a/AvocadoEdition_Light/adm/board_form.php +++ b/AvocadoEdition_Light/adm/board_form.php @@ -18,39 +18,39 @@ if (!isset($board['bo_device'])) { // pc : pc 전용 사용 // mobile : mobile 전용 사용 // none : 사용 안함 - sql_query(" ALTER TABLE `{$g5['board_table']}` ADD `bo_device` ENUM( 'both', 'pc', 'mobile' ) NOT NULL DEFAULT 'both' AFTER `bo_subject` ", false); + sql_query("ALTER TABLE `{$g5['board_table']}` ADD `bo_device` ENUM( 'both', 'pc', 'mobile' ) NOT NULL DEFAULT 'both' AFTER `bo_subject` ", false); } if (!isset($board['bo_mobile_skin'])) { - sql_query(" ALTER TABLE `{$g5['board_table']}` ADD `bo_mobile_skin` VARCHAR(255) NOT NULL DEFAULT '' AFTER `bo_skin` ", false); + sql_query("ALTER TABLE `{$g5['board_table']}` ADD `bo_mobile_skin` VARCHAR(255) NOT NULL DEFAULT '' AFTER `bo_skin` ", false); } if (!isset($board['bo_gallery_width'])) { - sql_query(" ALTER TABLE `{$g5['board_table']}` ADD `bo_gallery_width` INT NOT NULL AFTER `bo_gallery_cols`, ADD `bo_gallery_height` INT NOT NULL DEFAULT '0' AFTER `bo_gallery_width`, ADD `bo_mobile_gallery_width` INT NOT NULL DEFAULT '0' AFTER `bo_gallery_height`, ADD `bo_mobile_gallery_height` INT NOT NULL DEFAULT '0' AFTER `bo_mobile_gallery_width` ", false); + sql_query("ALTER TABLE `{$g5['board_table']}` ADD `bo_gallery_width` INT NOT NULL AFTER `bo_gallery_cols`, ADD `bo_gallery_height` INT NOT NULL DEFAULT '0' AFTER `bo_gallery_width`, ADD `bo_mobile_gallery_width` INT NOT NULL DEFAULT '0' AFTER `bo_gallery_height`, ADD `bo_mobile_gallery_height` INT NOT NULL DEFAULT '0' AFTER `bo_mobile_gallery_width` ", false); } if (!isset($board['bo_mobile_subject_len'])) { - sql_query(" ALTER TABLE `{$g5['board_table']}` ADD `bo_mobile_subject_len` INT(11) NOT NULL DEFAULT '0' AFTER `bo_subject_len` ", false); + sql_query("ALTER TABLE `{$g5['board_table']}` ADD `bo_mobile_subject_len` INT(11) NOT NULL DEFAULT '0' AFTER `bo_subject_len` ", false); } if (!isset($board['bo_mobile_page_rows'])) { - sql_query(" ALTER TABLE `{$g5['board_table']}` ADD `bo_mobile_page_rows` INT(11) NOT NULL DEFAULT '0' AFTER `bo_page_rows` ", false); + sql_query("ALTER TABLE `{$g5['board_table']}` ADD `bo_mobile_page_rows` INT(11) NOT NULL DEFAULT '0' AFTER `bo_page_rows` ", false); } if (!isset($board['bo_mobile_content_head'])) { - sql_query(" ALTER TABLE `{$g5['board_table']}` ADD `bo_mobile_content_head` TEXT NOT NULL AFTER `bo_content_head`, ADD `bo_mobile_content_tail` TEXT NOT NULL AFTER `bo_content_tail`", false); + sql_query("ALTER TABLE `{$g5['board_table']}` ADD `bo_mobile_content_head` TEXT NOT NULL AFTER `bo_content_head`, ADD `bo_mobile_content_tail` TEXT NOT NULL AFTER `bo_content_tail`", false); } if (!isset($board['bo_use_cert'])) { - sql_query(" ALTER TABLE `{$g5['board_table']}` ADD `bo_use_cert` ENUM('','cert','adult') NOT NULL DEFAULT '' AFTER `bo_use_email` ", false); + sql_query("ALTER TABLE `{$g5['board_table']}` ADD `bo_use_cert` ENUM('','cert','adult') NOT NULL DEFAULT '' AFTER `bo_use_email` ", false); } if (!isset($board['bo_use_sns'])) { - sql_query(" ALTER TABLE `{$g5['board_table']}` ADD `bo_use_sns` TINYINT NOT NULL DEFAULT '0' AFTER `bo_use_cert` ", false); + sql_query("ALTER TABLE `{$g5['board_table']}` ADD `bo_use_sns` TINYINT NOT NULL DEFAULT '0' AFTER `bo_use_cert` ", false); $result = sql_query(" select bo_table from `{$g5['board_table']}` "); for ($i = 0; $row = sql_fetch_array($result); $i++) { - sql_query(" ALTER TABLE `{$g5['write_prefix']}{$row['bo_table']}` + sql_query("ALTER TABLE `{$g5['write_prefix']}{$row['bo_table']}` ADD `wr_facebook_user` VARCHAR(255) NOT NULL DEFAULT '' AFTER `wr_ip`, ADD `wr_twitter_user` VARCHAR(255) NOT NULL DEFAULT '' AFTER `wr_facebook_user` ", false); } @@ -59,21 +59,21 @@ if (!isset($board['bo_use_sns'])) { $sql = " SHOW COLUMNS FROM `{$g5['board_table']}` LIKE 'bo_use_cert' "; $row = sql_fetch($sql); if (strpos($row['Type'], 'hp-') === false) { - sql_query(" ALTER TABLE `{$g5['board_table']}` CHANGE `bo_use_cert` `bo_use_cert` ENUM('','cert','adult','hp-cert','hp-adult') NOT NULL DEFAULT '' ", false); + sql_query("ALTER TABLE `{$g5['board_table']}` CHANGE `bo_use_cert` `bo_use_cert` ENUM('','cert','adult','hp-cert','hp-adult') NOT NULL DEFAULT '' ", false); } if (!isset($board['bo_use_list_file'])) { - sql_query(" ALTER TABLE `{$g5['board_table']}` ADD `bo_use_list_file` TINYINT NOT NULL DEFAULT '0' AFTER `bo_use_list_view` ", false); + sql_query("ALTER TABLE `{$g5['board_table']}` ADD `bo_use_list_file` TINYINT NOT NULL DEFAULT '0' AFTER `bo_use_list_view` ", false); $result = sql_query(" select bo_table from `{$g5['board_table']}` "); for ($i = 0; $row = sql_fetch_array($result); $i++) { - sql_query(" ALTER TABLE `{$g5['write_prefix']}{$row['bo_table']}` + sql_query("ALTER TABLE `{$g5['write_prefix']}{$row['bo_table']}` ADD `wr_file` TINYINT NOT NULL DEFAULT '0' AFTER `wr_datetime` ", false); } } if (!isset($board['bo_mobile_subject'])) { - sql_query(" ALTER TABLE `{$g5['board_table']}` ADD `bo_mobile_subject` VARCHAR(255) NOT NULL DEFAULT '' AFTER `bo_subject` ", false); + sql_query("ALTER TABLE `{$g5['board_table']}` ADD `bo_mobile_subject` VARCHAR(255) NOT NULL DEFAULT '' AFTER `bo_subject` ", false); } $required = ""; diff --git a/AvocadoEdition_Light/adm/board_list.php b/AvocadoEdition_Light/adm/board_list.php index 207c73f..e9deab2 100644 --- a/AvocadoEdition_Light/adm/board_list.php +++ b/AvocadoEdition_Light/adm/board_list.php @@ -73,7 +73,7 @@ $colspan = 11; diff --git a/AvocadoEdition_Light/adm/board_list_update.php b/AvocadoEdition_Light/adm/board_list_update.php index c6ac550..f02b4fe 100644 --- a/AvocadoEdition_Light/adm/board_list_update.php +++ b/AvocadoEdition_Light/adm/board_list_update.php @@ -18,25 +18,25 @@ if ($_POST['act_button'] == "선택수정") { $k = $_POST['chk'][$i]; if ($is_admin != 'super') { - $sql = " select count(*) as cnt from {$g5['board_table']} a, {$g5['group_table']} b - where a.gr_id = '{$_POST['gr_id'][$k]}' - and a.gr_id = b.gr_id - and b.gr_admin = '{$member['mb_id']}' "; + $sql = "SELECT count(*) AS cnt FROM {$g5['board_table']} a, {$g5['group_table']} b + WHERE a.gr_id = '{$_POST['gr_id'][$k]}' + AND a.gr_id = b.gr_id + AND b.gr_admin = '{$member['mb_id']}' "; $row = sql_fetch($sql); if (!$row['cnt']) alert('최고관리자가 아닌 경우 다른 관리자의 게시판(' . $board_table[$k] . ')은 수정이 불가합니다.'); } - $sql = " update {$g5['board_table']} - set gr_id = '{$_POST['gr_id'][$k]}', - bo_subject = '{$_POST['bo_subject'][$k]}', - bo_skin = '{$_POST['bo_skin'][$k]}', - bo_list_level = '{$_POST['bo_list_level'][$k]}', - bo_read_level = '{$_POST['bo_read_level'][$k]}', - bo_write_level = '{$_POST['bo_write_level'][$k]}', - bo_comment_level = '{$_POST['bo_comment_level'][$k]}', - bo_reply_level = '{$_POST['bo_reply_level'][$k]}' - where bo_table = '{$_POST['board_table'][$k]}' "; + $sql = "UPDATE {$g5['board_table']} + SET gr_id = '{$_POST['gr_id'][$k]}', + bo_subject = '{$_POST['bo_subject'][$k]}', + bo_skin = '{$_POST['bo_skin'][$k]}', + bo_list_level = '{$_POST['bo_list_level'][$k]}', + bo_read_level = '{$_POST['bo_read_level'][$k]}', + bo_write_level = '{$_POST['bo_write_level'][$k]}', + bo_comment_level = '{$_POST['bo_comment_level'][$k]}', + bo_reply_level = '{$_POST['bo_reply_level'][$k]}' + WHERE bo_table = '{$_POST['board_table'][$k]}' "; sql_query($sql); } @@ -46,7 +46,6 @@ if ($_POST['act_button'] == "선택수정") { alert('게시판 삭제는 최고관리자만 가능합니다.'); auth_check($auth[$sub_menu], 'd'); - check_admin_token(); // _BOARD_DELETE_ 상수를 선언해야 board_delete.inc.php 가 정상 작동함 @@ -60,8 +59,6 @@ if ($_POST['act_button'] == "선택수정") { $tmp_bo_table = trim($_POST['board_table'][$k]); include('./board_delete.inc.php'); } - - } goto_url('./board_list.php'); diff --git a/AvocadoEdition_Light/adm/css/admin.layout.css b/AvocadoEdition_Light/adm/css/admin.layout.css index 89507c2..75f8b13 100644 --- a/AvocadoEdition_Light/adm/css/admin.layout.css +++ b/AvocadoEdition_Light/adm/css/admin.layout.css @@ -314,72 +314,10 @@ body { height: 16px; } - -#gnb .gnb_2dli>a[data-text="메뉴 설정"]:before { - content: "\F488"; +#gnb .gnb_2dli>a:before { + content: var(--icon, "\F3E3"); } -#gnb .gnb_2dli>a[data-text="환경설정"]:before { - content: "\F3E3"; -} - -#gnb .gnb_2dli>a[data-text="메인 편집"]:before { - content: "\F6CF"; -} - -#gnb .gnb_2dli>a[data-text="테마 설정"]:before { - content: "\F4B1"; -} - -#gnb .gnb_2dli>a[data-text="디자인 설정"]:before { - content: "\F7BF"; -} - -#gnb .gnb_2dli>a[data-text="DB관리"]:before { - content: "\F8C4"; -} - -#gnb .gnb_2dli>a[data-text="회원관리"]:before { - content: "\F4D6"; -} - -#gnb .gnb_2dli>a[data-text="접속자집계"]:before { - content: "\F17E"; -} - -#gnb .gnb_2dli>a[data-text="접속자검색"]:before { - content: "\F52A"; -} - -#gnb .gnb_2dli>a[data-text="접속자로그삭제"]:before { - content: "\F5DE"; -} - -#gnb .gnb_2dli>a[data-text="게시판관리"]:before { - content: "\F463"; -} - -#gnb .gnb_2dli>a[data-text="게시판그룹관리"]:before { - content: "\F2EE"; -} - -#gnb .gnb_2dli>a[data-text="내용관리"]:before { - content: "\F4CB"; -} - -#gnb .gnb_2dli>a[data-text="이모티콘관리"]:before { - content: "\e9e1"; -} - -#gnb .gnb_2dli>a[data-text="세션파일 일괄삭제"]:before { - content: "\F8C1"; -} - -#gnb .gnb_2dli>a[data-text="캐시파일 일괄삭제"]:before { - content: "\F8C1"; -} - - #container { padding: 25px; } diff --git a/AvocadoEdition_Light/adm/editor_font.php b/AvocadoEdition_Light/adm/editor_font.php new file mode 100644 index 0000000..236820c --- /dev/null +++ b/AvocadoEdition_Light/adm/editor_font.php @@ -0,0 +1,15 @@ + + + +탈퇴함'; } else if ($row['mb_intercept_date']) { - $mb_id = $mb_id; + // $mb_id = $mb_id; $intercept_msg = '차단됨'; $intercept_title = '차단해제'; } diff --git a/AvocadoEdition_Light/adm/visit_list.php b/AvocadoEdition_Light/adm/visit_list.php index ddb1b46..d783962 100644 --- a/AvocadoEdition_Light/adm/visit_list.php +++ b/AvocadoEdition_Light/adm/visit_list.php @@ -11,8 +11,9 @@ $colspan = 6; $sql_common = " from {$g5['visit_table']} "; $sql_search = " where vi_date between '{$fr_date}' and '{$to_date}' "; -if (isset($domain)) +if (isset($domain) && is_string($domain)) { $sql_search .= " and vi_referer like '%{$domain}%' "; +} $sql = " select count(*) as cnt {$sql_common} diff --git a/AvocadoEdition_Light/classes/menucategory/menucategory.class.php b/AvocadoEdition_Light/classes/menucategory/menucategory.class.php index ad6e3d8..f4b37c1 100644 --- a/AvocadoEdition_Light/classes/menucategory/menucategory.class.php +++ b/AvocadoEdition_Light/classes/menucategory/menucategory.class.php @@ -76,7 +76,7 @@ class MenuCategory extends Menu $this->selected = true; } - $str .= '
  • ' . $menu->name . '
    • '; + $str .= '
  • ' . $menu->name . '
    • '; } $str .= ""; diff --git a/AvocadoEdition_Light/plugin/editor/smarteditor2/editor.lib.php b/AvocadoEdition_Light/plugin/editor/smarteditor2/editor.lib.php index 0a527e8..558c670 100644 --- a/AvocadoEdition_Light/plugin/editor/smarteditor2/editor.lib.php +++ b/AvocadoEdition_Light/plugin/editor/smarteditor2/editor.lib.php @@ -1,6 +1,6 @@ ')) { //textarea로 작성되고, html 내용이 없다면 + ) { + if (preg_match('/\r|\n/', $content) && $content === strip_tags($content, '')) { $content = nl2br($content); } } @@ -23,29 +23,31 @@ function editor_html($id, $content, $is_dhtml_editor = true) $html = ""; $html .= "웹에디터 시작"; - if ($is_dhtml_editor) + + if ($is_dhtml_editor) { $html .= ''; + } if ($is_dhtml_editor && $js) { - $html .= "\n" . ''; - $html .= "\n" . ''; - $html .= "\n" . ''; + $html .= "\n"; + $html .= "\n"; + $html .= "\n"; $html .= "\n"; $js = false; } diff --git a/AvocadoEdition_Light/skin/board/basic/list.skin.php b/AvocadoEdition_Light/skin/board/basic/list.skin.php index b5832bf..f324757 100644 --- a/AvocadoEdition_Light/skin/board/basic/list.skin.php +++ b/AvocadoEdition_Light/skin/board/basic/list.skin.php @@ -1,214 +1,228 @@ ', 0); +add_stylesheet('', 0); ?>
    - - -
    - -
    - - - -     - - + +
    + +
    + - -
    - - - - - - - - - - -
    -

    Scroll →

    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - '; } ?> - -
    목록
    No제목작성자작성일조회
    - 공지'; - else if ($wr_id == $list[$i]['wr_id']) - echo "열람중"; - else - echo $list[$i]['num']; - ?> - - - [] - - - - - 댓글개 - - - -
    게시물이 없습니다.
    -
    -
    + + + + + - -
    - - list 목록 - edit 글쓰기 - -
    - -
    +
    + + + + + + + + + - - - +
    +

    Scroll →

    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + '; + } ?> + +
    목록
    No제목작성자작성일조회
    + 공지'; + else if ($wr_id == $list[$i]['wr_id']) + echo "열람중"; + else + echo $list[$i]['num']; + ?> + + + [] + - -
    - 게시물 검색 + + + 댓글개 + - - - - - - - - - - -
    - + +
    게시물이 없습니다.
    +
    +
    + + + +
    + + list + 목록 + edit 글쓰기 + +
    + + + + + + + + +
    + 게시물 검색 + +
    + + + + + + + + +
    +
    +
    - - + + - + f.sw.value = sw; + f.target = "move"; + f.action = "./move.php"; + f.submit(); + } + diff --git a/AvocadoEdition_Light/skin/board/basic/style.css b/AvocadoEdition_Light/skin/board/basic/style.css index 110b11f..e63c05c 100644 --- a/AvocadoEdition_Light/skin/board/basic/style.css +++ b/AvocadoEdition_Light/skin/board/basic/style.css @@ -1,4 +1 @@ @charset "utf-8"; - - - diff --git a/AvocadoEdition_Light/skin/board/basic/view.skin.php b/AvocadoEdition_Light/skin/board/basic/view.skin.php index a2597db..6ac626c 100644 --- a/AvocadoEdition_Light/skin/board/basic/view.skin.php +++ b/AvocadoEdition_Light/skin/board/basic/view.skin.php @@ -1,189 +1,180 @@ ', 0); +add_stylesheet('', 0); ?> - - -
    - - -
    - -
    - + +
    + +
    + +
    + {$view['ca_name']}"; // 분류 출력 끝 + echo "" . cut_str(get_text($view['wr_subject']), 70) . ""; // 글제목 출력 + ?> +
    +
    + + + +
    + + + +
    + +
    + + +
    + \n"; -
    - {$view['ca_name']}"; // 분류 출력 끝 - echo "".cut_str(get_text($view['wr_subject']), 70).""; // 글제목 출력 - ?> -
    - -
    - - - -
    - - - - - -
    - -
    - - - -
    - \n"; - - for ($i=0; $i<=count($view['file']); $i++) { - if ($view['file'][$i]['view']) { - //echo $view['file'][$i]['view']; - echo get_view_thumbnail($view['file'][$i]['view']); - } - } - - echo "
    \n"; - } - ?> - - -
    - -
    - - - - - - + for ($i = 0; $i <= count($view['file']); $i++) { + if ($view['file'][$i]['view']) { + //echo $view['file'][$i]['view']; + echo get_view_thumbnail($view['file'][$i]['view']); + } + } + echo "\n"; + } + ?> + +
    + + + + +
    - diff --git a/AvocadoEdition_Light/skin/board/basic/view_comment.skin.php b/AvocadoEdition_Light/skin/board/basic/view_comment.skin.php index 51f9bf1..5b030d4 100644 --- a/AvocadoEdition_Light/skin/board/basic/view_comment.skin.php +++ b/AvocadoEdition_Light/skin/board/basic/view_comment.skin.php @@ -1,324 +1,328 @@
    - \]/i", "", $comment); - $cmt_sv = $cmt_amt - $i + 1; // 댓글 헤더 z-index 재설정 ie8 이하 사이드뷰 겹침 문제 해결 - ?> + \]/i", "", $comment); + $cmt_sv = $cmt_amt - $i + 1; // 댓글 헤더 z-index 재설정 ie8 이하 사이드뷰 겹침 문제 해결 + ?> -
    class="is-reply" style="border-left-width:px;"> -
    - - - - - - -
    +
    class="is-reply" + style="border-left-width:px;" > +
    + + + + + + +
    - -

    - 비밀글 - -

    + +

    + 비밀글 + +

    - - + + - " id="secret_comment_"> - + " + id="secret_comment_"> + - - - -
    - -

    등록된 댓글이 없습니다.

    + $c_reply_href = './board.php?' . $query_string . '&c_id=' . $comment_id . '&w=c#bo_vc_w'; + $c_edit_href = './board.php?' . $query_string . '&c_id=' . $comment_id . '&w=cu#bo_vc_w'; + ?> + + +
    + + +

    등록된 댓글이 없습니다.

    - -