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

merge

Browse Source
This commit is contained in:
whitedot
2012-12-28 16:48:28 +09:00
parent 3cc1b5463a 6040266aed
commit 2acfb5c582
42 changed files with 639 additions and 983 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
skin/board/basic/view.skin.php
View File

@ -45,7 +45,6 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
</td>
<td align="right" style="padding:6px 6px 0 0;" width=120>
<? if ($scrap_href) { echo "<a href=\"javascript:;\" onclick=\"win_scrap('$scrap_href');\"><img src='$board_skin_path/img/btn_scrap.gif' border='0' align='absmiddle'></a> "; } ?>
<? if ($trackback_url) { ?><a href="javascript:trackback_send_server('<?=$trackback_url?>');" style="letter-spacing:0;" title='주소 복사'><img src="<?=$board_skin_path?>/img/btn_trackback.gif" border='0' align="absmiddle"></a><?}?>
</td>
</tr>
</table>

1
skin/board/basic/view_comment.skin.php
View File

@ -58,7 +58,6 @@ for ($i=0; $i<count($list); $i++) {
echo $str;
?>
</div>
<? if ($list[$i]['trackback']) { echo "<p>".$list[$i]['trackback']."</p>"; } ?>
<span id='edit_<?=$comment_id?>' style='display:none;'></span><!-- 수정 -->
<span id='reply_<?=$comment_id?>' style='display:none;'></span><!-- 답변 -->
</div>

9
skin/board/basic/write.skin.php
View File

@ -225,15 +225,6 @@ if ($option) {
<tr><td colspan=2 height=1 bgcolor=#e7e7e7></td></tr>
<? } ?>
<? if ($is_trackback) { ?>
<tr>
<td class=write_head>트랙백주소</td>
<td><input class='ed' size=50 name=wr_trackback itemname="트랙백" value="<?=$trackback?>">
<? if ($w=='u') { ?><input type=checkbox name="re_trackback" value="1">핑 보냄<? } ?></td>
</tr>
<tr><td colspan=2 height=1 bgcolor=#e7e7e7></td></tr>
<? } ?>
<? if ($is_guest) { ?>
<tr>
<td class=write_head><img id='kcaptcha_image' /></td>

5
skin/board/neo/view.skin.php
View File

@ -7,7 +7,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<aside>
<h2>게시물 상단 링크</h2>
<!-- 링크 버튼 -->
<? if ($update_href || $deleter_href) {?>
<? if ($update_href || $delete_href) {?>
<ul>
<? if ($update_href) { ?>
<li><a href="<?=$update_href?>">수정</a></li>
@ -133,10 +133,9 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<? if ($is_signature) { ?><p><?=$signature?></p><? } ?>
<? if ($scrap_href || $trackback_url || $good_href || $nogood_href) { ?>
<? if ($scrap_href || $good_href || $nogood_href) { ?>
<ul>
<? if ($scrap_href) { ?><li><a href="javascript:;" onclick="win_scrap('<?=$scrap_href?>');">스크랩</a></li><? } ?>
<? if ($trackback_url) { ?><li><a href="javascript:trackback_send_server('<?=$trackback_url?>');">트랙백주소</a></li><?}?>
<? if ($good_href) {?><li>추천 <?=number_format($view['wr_good'])?> <a href="<?=$good_href?>" target="hiddenframe">추천</a></li><? } ?>
<? if ($nogood_href) {?><li>비추천 <?=number_format($view['wr_nogood'])?> <a href="<?=$nogood_href?>" target="hiddenframe">비추천</a></li><? } ?>
</ul>

3
skin/board/neo/view_comment.skin.php
View File

@ -45,9 +45,6 @@ var char_max = parseInt(<?=$comment_max?>); // 최대
<!-- 댓글 출력 -->
<p><?=$str?></p>
<? if ($list[$i]['trackback']) { ?>
<p><?=$list[$i]['trackback']?></p>
<? } ?>
<span id="edit_<?=$comment_id?>"></span><!-- 수정 -->
<span id="reply_<?=$comment_id?>"></span><!-- 답변 -->

53
skin/board/neo/write.skin.php
View File

@ -8,7 +8,7 @@ var char_min = parseInt(<?=$write_min?>); // 최소
var char_max = parseInt(<?=$write_max?>); // 최대
</script>
<form id="fwrite" name="fwrite" action="./write_update.php" onsubmit="return fwrite_submit(this);" method="post" enctype="multipart/form-data">
<form id="fwrite" name="fwrite" method="post" action="<?=$action_url?>" onsubmit="return fwrite_submit(this);" enctype="multipart/form-data">
<input type="hidden" name="w" value="<?=$w?>">
<input type="hidden" name="bo_table" value="<?=$bo_table?>">
<input type="hidden" name="wr_id" value="<?=$wr_id?>">
@ -26,7 +26,7 @@ var char_max = parseInt(<?=$write_max?>); // 최대
<? if ($is_name) { ?>
<tr>
<th scope="row"><label for="wr_name">이름</label></th>
<td><input type="text" id="wr_name" name="wr_name" maxlength="20" class="required" value="<?=$name?>" title="이름"></td>
<td><input type="text" id="wr_name" name="wr_name" maxlength="20" class="required" required="required" value="<?=$name?>" title="이름"></td>
</tr>
<? } ?>
@ -40,7 +40,7 @@ var char_max = parseInt(<?=$write_max?>); // 최대
<? if ($is_email) { ?>
<tr>
<th scope="row"><label for="wr_email">이메일</label></th>
<td><input type="text" id="wr_email" name="wr_email" maxlength="100" value="<?=$email?>"></td>
<td><input type="text" id="wr_email" name="wr_email" class="email" value="<?=$email?>" title="이메일" maxlength="100"></td>
</tr>
<? } ?>
@ -104,7 +104,7 @@ if ($option) {
<tr>
<th scope="row"><label for="wr_subject">제목</label></th>
<td><input id="wr_subject" name="wr_subject" required value="<?=$subject?>"></td>
<td><input id="wr_subject" name="wr_subject" required="required" value="<?=$subject?>" title="제목"></td>
</tr>
<tr>
@ -173,8 +173,7 @@ if ($option) {
// file_length 이하로는 필드가 삭제되지 않아야 합니다.
var file_length = <?=(int)$file_length?>;
var objTbl = document.getElementById("variableFiles");
if (objTbl.rows.length - 1 > file_length)
{
if (objTbl.rows.length - 1 > file_length) {
objTbl.deleteRow(objTbl.rows.length - 1);
flen--;
}
@ -189,30 +188,14 @@ if ($option) {
<span onclick="del_file();" style="cursor:pointer;">파일감소</span>
</td>
</tr>
<?}?>
<? } ?>
<? if ($is_trackback) { ?>
<tr>
<th scope="row"><label for="wr_trackback">트랙백주소</label></th>
<td>
<input id="wr_trackback" name="wr_trackback" value="<?=$trackback?>">
<? if ($w=='u') { ?><input type="checkbox" id="re_trackback" name="re_trackback" value="1">핑 보냄<? } ?>
</td>
</tr>
<? } ?>
</tbody>
</table>
<? if ($is_guest) { ?>
<fieldset id="captcha">
<legend>자동등록방지</legend>
<div><img id="kcaptcha_image" alt="" /></div>
<label for="wr_key">자동등록방지</label>
<input type="text" id="wr_key" name="wr_key" required>
왼쪽의 글자를 입력하세요.
</fieldset>
<? } ?>
<?
echo run_captcha();
?>
<div class="btn_confirm">
<input type="submit" id="btn_submit" value="글쓰기" accesskey="s">
@ -279,6 +262,7 @@ function fwrite_submit(f)
}
*/
/*
if (document.getElementById('char_count')) {
if (char_min > 0 || char_max > 0) {
var cnt = parseInt(document.getElementById('char_count').innerHTML);
@ -292,6 +276,7 @@ function fwrite_submit(f)
}
}
}
*/
if (document.getElementById('tx_wr_content')) {
if (!ed_wr_content.outputBodyText()) {
@ -301,10 +286,6 @@ function fwrite_submit(f)
}
}
<?
if ($is_dhtml_editor) echo cheditor3('wr_content');
?>
var subject = "";
var content = "";
$.ajax({
@ -338,18 +319,8 @@ function fwrite_submit(f)
return false;
}
if (!check_kcaptcha(f.wr_key)) {
return false;
}
//document.getElementById('btn_submit').disabled = true;
//document.getElementById('btn_list').disabled = true;
<?
if ($g4['https_url'])
echo "f.action = '{$g4['https_url']}/{$g4['bbs']}/write_update.php';";
else
echo "f.action = './write_update.php';";
echo chk_js_captcha();
?>
return true;

4
skin/member/neo/password.skin.php
View File

@ -2,8 +2,6 @@
if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
?>
<script src="<?=$g4[path]?>/js/capslock.js"></script>
<form name="fboardpassword" method="post" onsubmit="return fboardpassword_submit(this);">
<input type="hidden" name="w" value="<?=$w?>">
<input type="hidden" name="bo_table" value="<?=$bo_table?>">
@ -17,7 +15,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<legend>패스워드 확인</legend>
<p>비밀글 기능으로 보호된 글입니다. 작성자와 관리자만 열람하실 수 있습니다. 작성자 본인이시라면 패스워드를 입력하세요.</p>
<label for="password_wr_password">패스워드</label>
<input type="password" id="password_wr_password" name="wr_password" maxLength="20" size="15" required onkeypress="check_capslock(event, 'password_wr_password');">
<input type="password" id="password_wr_password" name="wr_password" maxLength="20" size="15" required="required" title="패스워드">
<input type="submit" value="확인">
</fieldset>

46
skin/outlogin/neo/outlogin.skin.1.php
View File

@ -23,11 +23,18 @@ if ($g4['https_url']) {
else {
$outlogin_url = $urlencode;
}
if ($g4['https_url'])
$action_url = "{$g4['https_url']}/$g4[bbs]/login_check.php";
else
$action_url = "{$g4['bbs_path']}/login_check.php";
?>
<section id="ol_before" class="outlogin">
<h2>사이트 회원</h2>
<!-- 로그인 전 외부로그인 시작 -->
<<<<<<< HEAD
<form name="fhead" method="post" onsubmit="return fhead_submit(this);" autocomplete="off">
<fieldset>
<legend>로그인</legend>
@ -44,30 +51,27 @@ else {
</fieldset>
</form>
</section>
=======
<form name="fhead" method="post" action="<?=$action_url?>" onsubmit="return fhead_submit(this);" autocomplete="off">
<fieldset>
<legend>로그인</legend>
<input type="hidden" name="url" value="<?=$outlogin_url?>">
<label for="mb_id">아이디</label>
<input type="text" id="mb_id" name="mb_id" maxlength="20" required>
<label for="mb_password">패스워드</label>
<input type="password" id="mb_password" name="mb_password" maxlength="20">
<input type="checkbox" id="auto_login" name="auto_login" value="1" onclick="if (this.checked) { if (confirm('자동로그인을 사용하시면 다음부터 회원아이디와 패스워드를 입력하실 필요가 없습니다.\n\n\공공장소에서는 개인정보가 유출될 수 있으니 사용을 자제하여 주십시오.\n\n자동로그인을 사용하시겠습니까?')) { this.checked = true; } else { this.checked = false; } }">
<label for="auto_login">자동로그인</label>
<input type="submit" value="로그인">
<a href="javascript:win_password_lost();">아이디/패스워드 찾기</a>
<a href="<?=$g4['bbs_path']?>/register.php">회원가입</a>
</fieldset>
</form>
>>>>>>> 6040266aed7f782fddaf6f63366be5b06bdfa780
<script src="<?=$g4[path]?>/js/capslock.js"></script>
<script>
<script type="text/javascript">
function fhead_submit(f)
{
if (!f.mb_id.value) {
alert("회원아이디를 입력하십시오.");
f.mb_id.focus();
return false;
}
if (!f.mb_password.value) {
alert("패스워드를 입력하십시오.");
f.mb_password.focus();
return false;
}
<?
if ($g4['https_url'])
echo "f.action = '$g4[https_url]/$g4[bbs]/login_check.php';";
else
echo "f.action = '$g4[bbs_path]/login_check.php';";
?>
return true;
}
</script>