firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

Merge branch 'master' of github.com:gnuboard/g4s

Browse Source
This commit is contained in:
whitedot
2013-03-13 16:38:54 +09:00
parent aed92d534e 96b074f14e
commit 639e2eba42
7 changed files with 79 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
adm/admin.lib.php
View File

@ -221,7 +221,7 @@ else if ($is_admin != 'super')
if (!$i)
{
alert('최고관리자 또는 관리권한이 있는 회원만 접근 가능합니다.', $g4['path']);
alert('최고관리자 또는 관리권한이 있는 회원만 접근 가능합니다.', G4_URL);
}
}

2
adm/poll_form.php
View File

@ -51,7 +51,7 @@ include_once('./admin.head.php');
<tr>
<th scope="row"><label for="po_poll<?=$i?>">항목 <?=$i?><?=$sound_only?></label></th>
<td>
<input type="text" name="po_poll<?=$i?>" value="<?=$po_poll?>" id="po_poll<?=$i?>" required class="frm_input <?=$required?>" maxlength="125">
<input type="text" name="po_poll<?=$i?>" value="<?=$po_poll?>" id="po_poll<?=$i?>" <?=$required?> class="frm_input <?=$required?>" maxlength="125">
<label for="po_cnt<?=$i?>">항목 <?=$i?> 투표수</label>
<input type="text" name="po_cnt<?=$i?>" value="<?=$po['po_cnt'.$i]?>" id="po_cnt<?=$i?>" class="frm_input" size="3">
</td>

61
bbs/ckeditor/config.js
View File

@ -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' ],
];
};

2
bbs/list.php
View File

@ -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;

2
bbs/poll_result.php
View File

@ -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'] = '<a href="'.G4_BBS_URL.'/poll_etc_update.php?w=d&amp;pc_id='.$row['pc_id'].'&amp;po_id='.$po_id.'&amp;skin_dir='.$skin_dir.'">';
$list2[$i]['del'] = '<a href="'.G4_BBS_URL.'/poll_etc_update.php?w=d&amp;pc_id='.$row['pc_id'].'&amp;po_id='.$po_id.'&amp;skin_dir='.$skin_dir.'" class="poll_delete">';
}
// 기타의견 입력

7
mobile/skin/poll/basic/poll_result.skin.php
View File

@ -98,6 +98,13 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
</div>
<script>
$(function() {
$(".poll_delete").click(function() {
if(!confirm("해당 기타의견을 삭제하시겠습니까?"))
return false;
});
});
function fpollresult_submit(f)
{
<? if ($is_guest) { echo chk_captcha_js(); } ?>

7
skin/poll/basic/poll_result.skin.php
View File

@ -101,6 +101,13 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
</div>
<script>
$(function() {
$(".poll_delete").click(function() {
if(!confirm("해당 기타의견을 삭제하시겠습니까?"))
return false;
});
});
function fpollresult_submit(f)
{
<? if ($is_guest) { echo chk_captcha_js(); } ?>