Merge branch 'g4s'

This commit is contained in:
chicpro
2013-06-04 18:52:24 +09:00
32 changed files with 123 additions and 66 deletions

View File

@ -73,7 +73,7 @@ $colspan = 5;
<h2>설정된 관리권한 내역</h2>
<p>권한 <strong>r</strong>은 읽기권한, <strong>w</strong>는 쓰기권한, <strong>d</strong>는 삭제권한입니다.</p>
<form name="fauthlist" id="fauthlist" method="post" action="./auth_list_delete.php">
<form name="fauthlist" id="fauthlist" method="post" action="./auth_list_delete.php" onsubmit="return fauthlist_submit(this);">
<input type="hidden" name="sst" value="<?php echo $sst ?>">
<input type="hidden" name="sod" value="<?php echo $sod ?>">
<input type="hidden" name="sfl" value="<?php echo $sfl ?>">
@ -129,7 +129,7 @@ $colspan = 5;
</table>
<div class="btn_list">
<button onclick="btn_check(this.form, 'delete')">선택삭제</button>
<input type="submit" name="act_button" value="선택삭제" onclick="document.pressed=this.value">
</div>
<?php
@ -211,16 +211,21 @@ $colspan = 5;
</form>
<script>
$(function() {
$('#fauthlist').submit(function() {
if (!is_checked("chk[]")) {
alert("선택삭제 하실 항목을 하나 이상 선택하세요.");
function fauthlist_submit(f)
{
if (!is_checked("chk[]")) {
alert(document.pressed+" 하실 항목을 하나 이상 선택하세요.");
return false;
}
if(document.pressed == "선택삭제") {
if(!confirm("선택한 자료를 정말 삭제하시겠습니까?")) {
return false;
}
}
return true;
});
});
return true;
}
</script>
<?php

View File

@ -9,7 +9,12 @@ if ($is_admin != 'super')
check_token();
for ($i=0; $i<count($chk); $i++)
$count = count($_POST['chk']);
if (!$count)
alert($_POST['act_button']." 하실 항목을 하나 이상 체크하세요.");
for ($i=0; $i<$count; $i++)
{
// 실제 번호를 넘김
$k = $chk[$i];

View File

@ -199,7 +199,7 @@ if (count($file_copy)) {
delete_cache_latest($bo_table);
delete_cache_latest($target_table);
echo "<script>opener.document.location.reload();</script>";
//echo "<script>opener.document.location.reload();</script>";
alert("복사에 성공 했습니다.", './board_copy.php?bo_table='.$bo_table.'&amp;'.$qstr);
?>

View File

@ -68,7 +68,8 @@ $colspan = 15;
<option value="bo_subject"<?php echo get_selected($_GET['sfl'], "bo_subject"); ?>>제목</option>
<option value="a.gr_id"<?php echo get_selected($_GET['sfl'], "a.gr_id"); ?>>그룹ID</option>
</select>
<input type="text" name="stx" value="<?php echo $stx ?>" title="검색어(필수)" required class="required frm_input">
<label for="stx" class="sound_only">검색어<strong class="sound_only"> 필수</strong></label>
<input type="text" name="stx" value="<?php echo $stx ?>" id="stx" required class="required frm_input">
<input type="submit" value="검색" class="btn_submit">
</fieldset>
</form>

View File

@ -123,7 +123,7 @@ include_once('./admin.head.php');
</tr>
<?php for ($i=1;$i<=10;$i++) { ?>
<tr>
<th scope="row">회원여분필드<?php echo $i ?></th>
<th scope="row">여분필드<?php echo $i ?></th>
<td class="td_gr_extra">
<label for="gr_<?php echo $i ?>_subj">여분필드 <?php echo $i ?> 제목</label>
<input type="text" name="gr_<?php echo $i ?>_subj" value="<?php echo get_text($group['gr_'.$i.'_subj']) ?>" id="gr_<?php echo $i ?>_subj" class="frm_input">

View File

@ -72,7 +72,8 @@ $colspan = 8;
<option value="gr_id"<?php echo get_selected($_GET['sfl'], "gr_id"); ?>>ID</option>
<option value="gr_admin"<?php echo get_selected($_GET['sfl'], "gr_admin"); ?>>그룹관리자</option>
</select>
<input type="text" name="stx" value="<?php echo $stx ?>" title="검색어(필수)" required class="required frm_input">
<label for="stx" class="sound_only">검색어<strong class="sound_only"> 필수</strong></label>
<input type="text" name="stx" value="<?php echo $stx ?>" required class="required frm_input">
<input type="submit" value="검색" class="btn_submit">
</fieldset>
</form>

View File

@ -63,7 +63,8 @@ $colspan = 7;
<select id="sfl" name="sfl">
<option value="a.mb_id"<?php echo get_selected($_GET['sfl'], "a.mb_id") ?>>회원아이디</option>
</select>
<input type="text" name="stx" value="<?php echo $stx ?>" id="stx" title="검색어(필수)" required class="required frm_input">
<label for="stx" class="sound_only">검색어<strong class="sound_only"> 필수</strong></label>
<input type="text" name="stx" value="<?php echo $stx ?>" id="stx" required class="required frm_input">
<input type="submit" value="검색" class="btn_submit">
</fieldset>
</form>

View File

@ -53,7 +53,7 @@ if ($sfl || $stx) // 검색렬일 때만 처음 버튼을 보여줌
$mb = array();
if ($sfl == 'mb_id' && $stx)
$mb = get_member(isset($stx));
$mb = get_member($stx);
$g4['title'] = '포인트관리';
include_once ('./admin.head.php');
@ -61,11 +61,6 @@ include_once ('./admin.head.php');
$colspan = 8;
?>
<script>
var list_update_php = '';
var list_delete_php = 'point_list_delete.php';
</script>
<script>
function point_clear()
{
@ -96,7 +91,8 @@ function point_clear()
<option value="mb_id"<?php echo get_selected($_GET['sfl'], "mb_id"); ?>>회원아이디</option>
<option value="po_content"<?php echo get_selected($_GET['sfl'], "po_content"); ?>>내용</option>
</select>
<input type="text" name="stx" value="<?php echo $stx ?>" title="검색어(필수)" required class="required frm_input">
<label for="stx" class="sound_only">검색어<strong class="sound_only"> 필수</strong></label>
<input type="text" name="stx" value="<?php echo $stx ?>" id="stx" required class="required frm_input">
<input type="submit" class="btn_submit" value="검색">
</fieldset>
</form>
@ -104,7 +100,7 @@ function point_clear()
<section class="cbox">
<h2>포인트 내역</h2>
<form name="fpointlist" id="fpointlist" method="post">
<form name="fpointlist" id="fpointlist" method="post" action="./point_list_delete.php" onsubmit="return fpointlist_submit(this);">
<input type="hidden" name="sst" value="<?php echo $sst ?>">
<input type="hidden" name="sod" value="<?php echo $sod ?>">
<input type="hidden" name="sfl" value="<?php echo $sfl ?>">
@ -167,7 +163,7 @@ function point_clear()
</table>
<div class="btn_list">
<button onclick="btn_check(this.form, 'delete')">선택삭제</button>
<input type="submit" name="act_button" value="선택삭제" onclick="document.pressed=this.value">
</div>
</form>
@ -215,6 +211,24 @@ function point_clear()
</section>
<script>
function fpointlist_submit(f)
{
if (!is_checked("chk[]")) {
alert(document.pressed+" 하실 항목을 하나 이상 선택하세요.");
return false;
}
if(document.pressed == "선택삭제") {
if(!confirm("선택한 자료를 정말 삭제하시겠습니까?")) {
return false;
}
}
return true;
}
</script>
<?php
include_once ('./admin.tail.php');
?>

View File

@ -10,7 +10,7 @@ check_token();
$count = count($_POST['chk']);
if(!$count)
alert("선택삭제 하실 항목을 하나이상 선택해 주세요.");
alert($_POST['act_button']." 하실 항목을 하나 이상 체크하세요.");
for ($i=0; $i<$count; $i++)
{

View File

@ -64,7 +64,8 @@ $colspan = 6;
<select name="sfl" id="sfl" title="검색대상">
<option value="po_subject"<?php echo get_selected($_GET['sfl'], "po_subject"); ?>>제목</option>
</select>
<input type="text" name="stx" value="<?php echo $stx ?>" title="검색어(필수)" required class="required frm_input">
<label for="stx" class="sound_only">검색어<strong class="sound_only"> 필수</strong></label>
<input type="text" name="stx" value="<?php echo $stx ?>" id="stx" required class="required frm_input">
<input type="submit" class="btn_submit" value="검색">
</fieldset>
</form>

View File

@ -82,7 +82,8 @@ var list_delete_php = 'popular_list.php';
<option value="pp_word"<?php echo get_selected($_GET['sfl'], "pp_word"); ?>>검색어</option>
<option value="pp_date"<?php echo get_selected($_GET['sfl'], "pp_date"); ?>>등록일</option>
</select>
<input type="text" name="stx" value="<?php echo $stx ?>" title="검색어(필수)" required class="required frm_input">
<label for="stx" class="sound_only">검색어<strong class="sound_only"> 필수</strong></label>
<input type="text" name="stx" value="<?php echo $stx ?>" id="stx" required class="required frm_input">
<input type="submit" value="검색" class="btn_submit">
</fieldset>
</form>

View File

@ -38,7 +38,7 @@ for($i=0; $row=sql_fetch_array($result); $i++) {
?>
<div id="point" class="new_win">
<h1><?php echo $g4['title'] ?></h1>
<h1 id="new_win_title"><?php echo $g4['title'] ?></h1>
<table class="basic_tbl">
<caption>포인트 사용내역 목록</caption>

View File

@ -182,8 +182,6 @@ if ($w == '') {
set mb_id = '{$mb_id}',
mb_password = '".sql_password($mb_password)."',
mb_name = '{$mb_name}',
mb_sex = '{$mb_sex}',
mb_birth = '{$mb_birth}',
mb_nick = '{$mb_nick}',
mb_nick_date = '".G4_TIME_YMD."',
mb_email = '{$mb_email}',
@ -286,10 +284,6 @@ if ($w == '') {
if ($mb_open_default != $mb_open)
$sql_open_date = " , mb_open_date = '".G4_TIME_YMD."' ";
$sql_sex = "";
if (isset($mb_sex))
$sql_sex = " , mb_sex = '{$mb_sex}' ";
// 이전 메일주소와 수정한 메일주소가 틀리다면 인증을 다시 해야하므로 값을 삭제
$sql_email_certify = '';
if ($old_email != $mb_email && $config['cf_use_email_certify'])
@ -323,7 +317,6 @@ if ($w == '') {
{$sql_icon}
{$sql_nick_date}
{$sql_open_date}
{$sql_sex}
{$sql_email_certify}
{$sql_hp_certify}
where mb_id = '$mb_id' ";

View File

@ -134,6 +134,8 @@ if ($w == 'c') // 댓글 입력
$tmp_comment_reply = '';
}
$wr_subject = get_text(stripslashes($wr['wr_subject']));
// SNS 등록
include_once("./write_comment_update.sns.php");
@ -185,9 +187,6 @@ if ($w == 'c') // 댓글 입력
// 포인트 부여
insert_point($member['mb_id'], $board['bo_comment_point'], "{$board['bo_subject']} {$wr_id}-{$comment_id} 댓글쓰기", $bo_table, $comment_id, '댓글');
$wr_subject = get_text(stripslashes($wr['wr_subject']));
// 메일발송 사용
if ($config['cf_email_use'] && $board['bo_use_email'])
{

View File

@ -132,7 +132,7 @@ a:active {color:#000;text-decoration:underline}
.basic_tbl thead th input {vertical-align:top} /* middle 로 하면 게시판 읽기에서 목록 사용시 체크박스 라인 깨짐 */
.basic_tbl tfoot th {border-top:1px solid #666;border-bottom:1px solid #666;background:#484848;color:#fff}
.basic_tbl tfoot td {border-color:#666;background:#484848;color:#fff;font-weight:bold;text-align:center}
.basic_tbl td {padding:0.5em 0;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9;line-height:1.5em;word-break:break-all}
.basic_tbl td {padding:0.5em;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9;line-height:1.5em;word-break:break-all}
.basic_tbl a {display:block;padding:0.5em;color:#000;text-decoration:none}
.bo_sideview td {} /* 사이드뷰 사용하는 테이블 셀 패딩값 */
td.empty_table {padding:5em 0;text-align:center}
@ -166,7 +166,7 @@ td.empty_table {padding:5em 0;text-align:center}
.td_nick {width:100px;text-align:center}
.td_name {width:100px;text-align:left}
.td_date {width:60px;text-align:center}
.td_datetime {width:130px;text-align:center}
.td_datetime {width:150px;text-align:center}
.td_mng {width:80px;text-align:center}
/* 광고 레이아웃 */

View File

@ -78,7 +78,7 @@ if ($is_admin) {
if(G4_IS_MOBILE) {
echo '<script> set_cookie("device_width", screen.width, 6, g4_cookie_domain); </script>'.PHP_EOL;
}
if(!defined('G4_IS_ADMIN'))
//if(!defined('G4_IS_ADMIN'))
echo $config['cf_add_script'];
?>
</head>

View File

@ -166,8 +166,7 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
}
?>
<?php
// SNS 보내기
@include(G4_SKIN_PATH."/board/basic/view.sns.skin.php");
include(G4_SNS_PATH."/view.sns.skin.php");
?>
</section>

View File

@ -32,6 +32,9 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
<?php } ?>
작성일
<span class="bo_vc_hdinfo"><time datetime="<?php echo date('Y-m-d\TH:i:s+09:00', strtotime($list[$i]['datetime'])) ?>"><?php echo $list[$i]['datetime'] ?></time></span>
<?php
include(G4_SNS_PATH."/view_comment_list.sns.skin.php");
?>
</header>
<!-- 댓글 출력 -->
@ -113,7 +116,7 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
</tr>
<?php } ?>
<?php
@include(G4_SKIN_PATH."/board/basic/view_comment.sns.skin.php");
include(G4_SNS_PATH."/view_comment_write.sns.skin.php");
?>
<tr>
<th scope="row">내용</th>

View File

@ -54,9 +54,9 @@
/* 게시판 읽기 */
#bo_v {margin-bottom:1.5em;padding-bottom:1.5em}
#bo_v_cate {padding:0 1em;color:#999;font-size:0.9em;font-weight:bold}
#bo_v_table {padding:0 1em;color:#999;font-size:0.9em;font-weight:bold}
#bo_v_h1 {padding:0 0.7em 0.5em;font-size:1.2em}
#bo_v_title {padding:0 0.7em 0.5em;font-size:1.2em}
#bo_v_info {padding:0 0.9em 1em;border-bottom:1px solid #ddd}
#bo_v_info h2 {margin:0;padding:0;height:0;overflow:hidden}
@ -116,6 +116,10 @@
#bo_v_act_good,
#bo_v_act_nogood {display:inline-block;width:1px;height:1px;font-size:0;line-height:0;overflow:hidden}
#bo_v_sns {margin:0 0 2em;padding:0;list-style:none;zoom:1}
#bo_v_sns:after {display:block;visibility:hidden;clear:both;content:""}
#bo_v_sns li {float:left;margin:0 0.5em 0 0}
#bo_v form {padding-top:1.5em}
/* 게시판 댓글 */
@ -146,4 +150,9 @@
#bo_vc_w #char_cnt {display:block;margin-bottom:0.3em}
#bo_vc_w textarea {width:99%}
#bo_vc_sns {margin:0;padding:0;list-style:none;zoom:1}
#bo_vc_sns:after {display:block;visibility:hidden;clear:both;content:""}
#bo_vc_sns li {float:left;margin:0 1em 0 0}
#bo_vc_sns input {margin:0 0 0 0.5em}
#bo_vc form {padding:0}

View File

@ -166,8 +166,7 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
}
?>
<?php
// SNS 보내기
@include(G4_SKIN_PATH."/board/basic/view.sns.skin.php");
include(G4_SNS_PATH."/view.sns.skin.php");
?>
</section>

View File

@ -32,6 +32,9 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
<?php } ?>
작성일
<span class="bo_vc_hdinfo"><time datetime="<?php echo date('Y-m-d\TH:i:s+09:00', strtotime($list[$i]['datetime'])) ?>"><?php echo $list[$i]['datetime'] ?></time></span>
<?php
include(G4_SNS_PATH."/view_comment_list.sns.skin.php");
?>
</header>
<!-- 댓글 출력 -->
@ -113,6 +116,9 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
</tr>
<?php } ?>
<?php
include(G4_SNS_PATH."/view_comment_write.sns.skin.php");
?>
<?php
@include(G4_SKIN_PATH."/board/basic/view_comment.sns.skin.php");
?>
<tr>
@ -128,7 +134,7 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
</table>
<div class="btn_confirm">
<input type="submit" class="btn_submit" value="댓글등록">
<input type="submit" id="btn_submit" class="btn_submit" value="댓글등록">
</div>
</form>
@ -236,6 +242,8 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
<?php if($is_guest) echo chk_captcha_js(); ?>
document.getElementById("btn_submit").disabled = "disabled";
return true;
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 884 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1022 B

View File

@ -0,0 +1,18 @@
<?php
if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
$mobile_sns_icon = '';
if (G4_IS_MOBILE) $sns_mc_icon = '';
else $sns_mc_icon = '_cmt';
if (!$board['bo_use_sns']) return;
?>
<?php if ($list[$i]['wr_facebook_user']) { ?>
<a href="https://www.facebook.com/profile.php?id=<?php echo $list[$i]['wr_facebook_user']; ?>" target="_blank"><img src="<?php echo G4_SNS_URL; ?>/icon/facebook<?php echo $sns_mc_icon; ?>.png" alt="페이스북에도 등록됨"></a>
<?php } ?>
<?php if ($list[$i]['wr_twitter_user']) { ?>
<a href="https://www.twitter.com/<?php echo $list[$i]['wr_twitter_user']; ?>" target="_blank"><img src="<?php echo G4_SNS_URL; ?>/icon/twitter<?php echo $sns_mc_icon; ?>.png" alt="트위터에도 등록됨"></a>
<?php } ?>
<?php if ($list[$i]['wr_me2day_user']) { ?>
<a href="http://me2day.net/<?php echo $list[$i]['wr_me2day_user']; ?>" target="_blank"><img src="<?php echo G4_SNS_URL; ?>/icon/me2day<?php echo $sns_mc_icon; ?>.png" alt="미투데이에도 등록됨"></a>
<?php } ?>

View File

@ -4,7 +4,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
if (!$board['bo_use_sns']) return;
?>
<tr>
<th scope="row">SNS 등록</th>
<th scope="row">SNS 동시등록</th>
<td>
<ul id="bo_vc_sns">
<?php

View File

@ -167,9 +167,8 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
?>
</section>
<?php
// SNS 보내기
include_once($board_skin_path."/view.sns.skin.php");
<?php
include(G4_SNS_PATH."/view.sns.skin.php");
?>
<?php

View File

@ -24,6 +24,7 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
*/
$comment = preg_replace("/\[\<a\s.*href\=\"(http|https|ftp|mms)\:\/\/([^[:space:]]+)\.(mp3|wma|wmv|asf|asx|mpg|mpeg)\".*\<\/a\>\]/i", "<script>doc_write(obj_movie('$1://$2.$3'));</script>", $comment);
?>
<article id="c_<?php echo $comment_id ?>" <?php if ($cmt_depth) { ?>style="margin-left:<?php echo $cmt_depth ?>px;border-top-color:#e0e0e0"<?php } ?>>
<header>
<h1><?php echo $list[$i]['wr_name'] ?>님의 댓글</h1>
@ -35,9 +36,9 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
<?php } ?>
작성일
<span class="bo_vc_hdinfo"><time datetime="<?php echo date('Y-m-d\TH:i:s+09:00', strtotime($list[$i]['datetime'])) ?>"><?php echo $list[$i]['datetime'] ?></time></span>
<?php if ($list[$i]['wr_facebook_user']) { ?><a href="https://www.facebook.com/profile.php?id=<?php echo $list[$i]['wr_facebook_user']; ?>" target="_blank"><img src="<?php echo G4_SNS_URL; ?>/icon/facebook.png" alt="페이스북에도 등록됨"></a><?php } ?>
<?php if ($list[$i]['wr_twitter_user']) { ?><a href="https://www.twitter.com/<?php echo $list[$i]['wr_twitter_user']; ?>" target="_blank"><img src="<?php echo G4_SNS_URL; ?>/icon/twitter.png" alt="트위터에도 등록됨"></a><?php } ?>
<?php if ($list[$i]['wr_me2day_user']) { ?><a href="http://me2day.net/<?php echo $list[$i]['wr_me2day_user']; ?>" target="_blank"><img src="<?php echo G4_SNS_URL; ?>/icon/me2day.png" alt="미투데이에도 등록됨"></a><?php } ?>
<?php
include(G4_SNS_PATH.'/view_comment_list.sns.skin.php');
?>
</header>
<!-- 댓글 출력 -->
@ -119,7 +120,7 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
</tr>
<?php } ?>
<?php
include_once($board_skin_path."/view_comment.sns.skin.php");
include(G4_SNS_PATH."/view_comment_write.sns.skin.php");
?>
<tr>
<th scope="row">내용</th>

View File

@ -58,10 +58,6 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
}
?>
</ul>
<?php
// SNS 보내기
@include(G4_SKIN_PATH."/board/basic/view.sns.skin.php");
?>
</section>
<?php } ?>
@ -172,8 +168,7 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
</section>
<?php
// SNS 보내기
include_once($board_skin_path."/view.sns.skin.php");
include(G4_SNS_PATH."/view.sns.skin.php");
?>
<?php

View File

@ -33,6 +33,9 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
<?php } ?>
작성일
<span class="bo_vc_hdinfo"><time datetime="<?php echo date('Y-m-d\TH:i:s+09:00', strtotime($list[$i]['datetime'])) ?>"><?php echo $list[$i]['datetime'] ?></time></span>
<?php
include(G4_SNS_PATH."/view_comment_list.sns.skin.php");
?>
</header>
<!-- 댓글 출력 -->
@ -113,7 +116,9 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
<td><?php echo $captcha_html; ?></td>
</tr>
<?php } ?>
<?php
include(G4_SNS_PATH."/view_comment_write.sns.skin.php");
?>
<?php
@include(G4_SKIN_PATH."/board/basic/view_comment.sns.skin.php");
?>
@ -141,7 +146,7 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
</table>
<div class="btn_confirm">
<input type="submit" class="btn_submit" value="댓글등록">
<input type="submit" id="btn_submit" class="btn_submit" value="댓글등록">
</div>
</form>

View File

@ -219,7 +219,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
<?php if ($w == "" && $config['cf_use_recommend']) { ?>
<tr>
<th scope="row"><label for="reg_mb_recommend">추천인아이디</label></th>
<td><input type="text" name="mb_recommend" id="reg_mb_recommend" class="frm_input" required></td>
<td><input type="text" name="mb_recommend" id="reg_mb_recommend" class="frm_input"></td>
</tr>
<?php } ?>