diff --git a/adm/admin.lib.php b/adm/admin.lib.php index df560e7d8..52fbf5da4 100644 --- a/adm/admin.lib.php +++ b/adm/admin.lib.php @@ -221,7 +221,7 @@ else if ($is_admin != 'super') if (!$i) { - alert('최고관리자 또는 관리권한이 있는 회원만 접근 가능합니다.', $g4['path']); + alert('최고관리자 또는 관리권한이 있는 회원만 접근 가능합니다.', G4_URL); } } diff --git a/adm/poll_form.php b/adm/poll_form.php index 50c35238f..0642bf178 100644 --- a/adm/poll_form.php +++ b/adm/poll_form.php @@ -51,7 +51,7 @@ include_once('./admin.head.php'); - + class="frm_input " maxlength="125"> diff --git a/bbs/ckeditor/config.js b/bbs/ckeditor/config.js index ca3000337..6a8713729 100644 --- a/bbs/ckeditor/config.js +++ b/bbs/ckeditor/config.js @@ -106,4 +106,65 @@ CKEDITOR.editorConfig = function( config ) { config.enterMode = CKEDITOR.ENTER_BR; config.shiftEnterMode = CKEDITOR.ENTER_P; config.filebrowserUploadUrl = g4_ckeditor_url+"/upload.php?type=Images"; + config.keystrokes=[ + // Formatting + [ CKEDITOR.CTRL + 81 /*Q*/, 'blockquote' ], + [ CKEDITOR.CTRL + 66 /*B*/, 'bold' ], + [ CKEDITOR.CTRL + 56 /*8*/, 'bulletedlist' ], + [ CKEDITOR.CTRL + CKEDITOR.SHIFT + 56 /*8*/, 'bulletedListStyle' ], + [ CKEDITOR.CTRL + 77 /*M*/, 'indent' ], + [ CKEDITOR.CTRL + CKEDITOR.SHIFT + 77 /*M*/, 'outdent' ], + [ CKEDITOR.CTRL + 73 /*I*/, 'italic' ], + [ CKEDITOR.CTRL + 74 /*J*/, 'justifyblock' ], + [ CKEDITOR.CTRL + 69 /*E*/, 'justifycenter' ], + [ CKEDITOR.CTRL + 76 /*L*/, 'justifyleft' ], + [ CKEDITOR.CTRL + 82 /*R*/, 'justifyright' ], + [ CKEDITOR.CTRL + 55 /*7*/, 'numberedlist' ], + [ CKEDITOR.CTRL + CKEDITOR.SHIFT + 55 /*7*/, 'numberedListStyle' ], + [ CKEDITOR.CTRL + 89 /*Y*/, 'redo' ], + [ CKEDITOR.CTRL + 32 /*SPACE*/, 'removeFormat' ], + [ CKEDITOR.CTRL + 65 /*A*/, 'selectall' ], + [ CKEDITOR.CTRL + CKEDITOR.SHIFT + 88 /*X*/, 'strike' ], + [ CKEDITOR.CTRL + 188 /*COMMA*/, 'subscript' ], + [ CKEDITOR.CTRL + 190 /*PERIOD*/, 'superscript' ], + [ CKEDITOR.CTRL + 85 /*U*/, 'underline' ], + [ CKEDITOR.CTRL + 90 /*Z*/, 'undo' ], + // Insert + [ CKEDITOR.ALT + 65 /*A*/, 'anchor' ], + [ CKEDITOR.ALT + 68 /*D*/, 'creatediv' ], + [ CKEDITOR.ALT + CKEDITOR.SHIFT + 68 /*D*/, 'editdiv' ], + [ CKEDITOR.ALT + 70 /*F*/, 'flash' ], + [ CKEDITOR.ALT + 72 /*H*/, 'horizontalrule' ], + [ CKEDITOR.CTRL + 57 /*9*/, 'image' ], + [ CKEDITOR.ALT + 73 /*I*/, 'image' ], + [ CKEDITOR.CTRL + 75 /*K*/, 'link' ], + [ CKEDITOR.ALT + 76 /*L*/, 'link' ], + [ CKEDITOR.CTRL + CKEDITOR.SHIFT + 75 /*K*/, 'unlink' ], + [ CKEDITOR.ALT + CKEDITOR.SHIFT + 76 /*L*/, 'unlink' ], + [ CKEDITOR.CTRL + 13 /*ENTER*/, 'pagebreak' ], + [ CKEDITOR.ALT + 13 /*ENTER*/, 'pagebreak' ], + [ CKEDITOR.ALT + 69 /*E*/, 'smiley' ], + [ CKEDITOR.ALT + 67 /*C*/, 'specialchar' ], + [ CKEDITOR.ALT + 84 /*T*/, 'table' ], + [ CKEDITOR.ALT + 79 /*O*/, 'templates' ], + // Other - dialogs, views, etc. + [ 112 /*F1*/, 'about' ], + [ CKEDITOR.ALT + 48 /*ZERO*/, 'blur' ], + [ CKEDITOR.ALT + 8 /*Backspace*/, 'blur' ], + [ CKEDITOR.CTRL + 87 /*W*/, 'blur' ], + [ CKEDITOR.ALT + 51 /*#3*/, 'colordialog' ], + [ CKEDITOR.ALT + 77 /*M*/, 'contextMenu' ], + [ CKEDITOR.ALT + 122 /*F11*/, 'elementsPathFocus' ], + [ CKEDITOR.CTRL + CKEDITOR.SHIFT + 70 /*F*/, 'find' ], + [ CKEDITOR.ALT + 88 /*X*/, 'maximize' ], + [ CKEDITOR.CTRL + 113 /*F2*/, 'preview' ], + [ CKEDITOR.CTRL + CKEDITOR.SHIFT + 80 /*P*/, 'print' ], + [ CKEDITOR.CTRL + 72 /*H*/, 'replace' ], + [ CKEDITOR.ALT + 83 /*S*/, 'scaytcheck' ], + [ CKEDITOR.ALT + 66 /*B*/, 'showblocks' ], + [ CKEDITOR.ALT + CKEDITOR.SHIFT + 84 /*T*/, 'showborders' ], + [ CKEDITOR.ALT + 90 /*Z*/, 'source' ], + [ CKEDITOR.ALT + 48 /*ZERO*/, 'toolbarCollapse' ], + [ CKEDITOR.ALT + 121 /*F10*/, 'toolbarFocus' ], + ]; }; diff --git a/bbs/list.php b/bbs/list.php index 77a8bc3b4..6a0877866 100644 --- a/bbs/list.php +++ b/bbs/list.php @@ -36,7 +36,7 @@ if ($sca || $stx) { // 가장 작은 번호를 얻어서 변수에 저장 (하단의 페이징에서 사용) $sql = " select MIN(wr_num) as min_wr_num from {$write_table} "; $row = sql_fetch($sql); - $min_spt = $row['min_wr_num']; + $min_spt = (int)$row['min_wr_num']; if (!$spt) $spt = $min_spt; diff --git a/bbs/poll_result.php b/bbs/poll_result.php index bd67ad76c..027223855 100644 --- a/bbs/poll_result.php +++ b/bbs/poll_result.php @@ -60,7 +60,7 @@ for ($i=0; $row=sql_fetch_array($result); $i++) { $list2[$i]['del'] = ''; if ($is_admin == 'super' || ($row['mb_id'] == $member['mb_id'] && $row['mb_id'])) - $list2[$i]['del'] = ''; + $list2[$i]['del'] = ''; } // 기타의견 입력 diff --git a/mobile/skin/poll/basic/poll_result.skin.php b/mobile/skin/poll/basic/poll_result.skin.php index 627942365..0db0c9106 100644 --- a/mobile/skin/poll/basic/poll_result.skin.php +++ b/mobile/skin/poll/basic/poll_result.skin.php @@ -98,6 +98,13 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가