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-06-26 10:02:43 +09:00
parent 0ba6e054dd 5bc81f27a9
commit 4d714f6273
17 changed files with 84 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -10,3 +10,4 @@ rankiss*
thumb.lib.php
test.php
itzimara*
nemoluv*

2
adm/board_copy_update.php
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);
?>

2
adm/config_form.php
View File

@ -773,7 +773,7 @@ $pg_anchor = '<ul class="anchor">
<th scope="row"><label for="cf_add_script">추가 script, css</label></th>
<td>
<?php echo help('HTML의 &lt;/HEAD&gt; 태그위로 추가될 JavaScript와 css 코드를 설정합니다.<br>관리자 페이지에서는 이 코드를 사용하지 않습니다.') ?>
<textarea name="cf_add_script" id="cf_add_script"><?php echo $config['cf_add_script'] ?></textarea>
<textarea name="cf_add_script" id="cf_add_script"><?php echo get_text($config['cf_add_script']); ?></textarea>
</td>
</tr>
</tbody>

5
adm/mail_list.php
View File

@ -19,14 +19,15 @@ $result = sql_query($sql);
$g4['title'] = '회원메일발송';
include_once('./admin.head.php');
$colspan = 6;
$colspan = 7;
?>
<section class="cbox">
<h2>등록된 메일내용 목록</h2>
<p>
<strong>테스트</strong>는 등록된 최고관리자의 이메일로 테스트 메일을 발송합니다.<br>
현재 등록된 메일은 총 <?php echo $total_count ?>건입니다.
현재 등록된 메일은 총 <?php echo $total_count ?>건입니다.<br>
<span class="str_caution">주의) 수신자가 동의하지 않은 대량 메일 발송에는 적합하지 않습니다. 수십건 단위로 발송해 주십시오.</span>
</p>
<div class="btn_add">

76
adm/member_list.php
View File

@ -134,30 +134,30 @@ $colspan = 15;
<table class="tbl_mb_list">
<thead>
<tr>
<th scope="col" rowspan="2">
<th scope="col" rowspan="2" id="mb_list_chk">
<label for="chkall" class="sound_only">회원 전체</label>
<input type="checkbox" name="chkall" value="1" id="chkall" onclick="check_all(this.form)">
</th>
<th scope="col">회원아이디</th>
<th scope="col">이름</th>
<th scope="col">휴대폰</th>
<th scope="col" colspan="6">주소</th>
<th scope="col">최종접속</th>
<th scope="col">포인트</th>
<th scope="col" rowspan="2">관리</th>
<th scope="col" id="mb_list_id">회원아이디</th>
<th scope="col" id="mb_list_name">이름</th>
<th scope="col" id="mb_list_mobile">휴대폰</th>
<th scope="col" colspan="6" id="mb_list_addr">주소</th>
<th scope="col" id="mb_list_lastcall">최종접속</th>
<th scope="col" id="mb_list_point">포인트</th>
<th scope="col" rowspan="2" id="mb_list_mng">관리</th>
</tr>
<tr>
<th scope="col">별명</th>
<th scope="col">상태/권한</th>
<th scope="col">전화번호</th>
<th scope="col">메일<br>인증</th>
<th scope="col">메일<br>수신</th>
<th scope="col">정보<br>공개</th>
<th scope="col">본인<br>확인</th>
<th scope="col">성인<br>인증</th>
<th scope="col">접근<br>차단</th>
<th scope="col">가입일</th>
<th scope="col" title="접근가능한 그룹수">접근그룹</th>
<th scope="col" id="mb_list_nick">별명</th>
<th scope="col" id="mb_list_auth">상태/권한</th>
<th scope="col" id="mb_list_tel">전화번호</th>
<th scope="col" id="mb_list_mailc">메일<br>인증</th>
<th scope="col" id="mb_list_mailr">메일<br>수신</th>
<th scope="col" id="mb_list_open">정보<br>공개</th>
<th scope="col" id="mb_list_selfc">본인<br>확인</th>
<th scope="col" id="mb_list_adultc">성인<br>인증</th>
<th scope="col" id="mb_list_deny">접근<br>차단</th>
<th scope="col" id="mb_list_join">가입일</th>
<th scope="col" id="mb_list_grp">접근그룹</th>
</tr>
</thead>
<tbody>
@ -207,41 +207,41 @@ $colspan = 15;
?>
<tr <?php echo $tr_bg; ?>>
<td class="td_chk" rowspan="2">
<td headers="mb_list_chk" class="td_chk" rowspan="2">
<input type="hidden" name="mb_id[<?php echo $i ?>]" value="<?php echo $row['mb_id'] ?>" id="mb_id_<?php echo $i ?>">
<label for="chk_<?php echo $i; ?>" class="sound_only"><?php echo $row['mb_name']; ?> <?php echo $row['mb_nick']; ?>님</label>
<input type="checkbox" name="chk[]" value="<?php echo $i ?>" id="chk_<?php echo $i ?>">
</td>
<td class="td_name sv_use"><?php echo $mb_id ?></td>
<td class="td_mbname"><?php echo $row['mb_name']; ?></td>
<td><?php echo $row['mb_hp']; ?></td>
<td colspan="6" class="td_addr"><?php echo $address; ?></td>
<td><?php echo substr($row['mb_today_login'],2,8); ?></td>
<td class="td_bignum"><a href="point_list.php?sfl=mb_id&amp;stx=<?php echo $row['mb_id'] ?>"><?php echo number_format($row['mb_point']) ?></a></td>
<td rowspan="2"><?php echo $s_mod ?><br><?php echo $s_grp ?></td>
<td headers="mb_list_id" class="td_name sv_use"><?php echo $mb_id ?></td>
<td headers="mb_list_name" class="td_mbname"><?php echo $row['mb_name']; ?></td>
<td headers="mb_list_mobile"><?php echo $row['mb_hp']; ?></td>
<td colspan="6" headers="mb_list_addr" class="td_addr"><?php echo $address; ?></td>
<td headers="mb_list_lastcall"><?php echo substr($row['mb_today_login'],2,8); ?></td>
<td headers="mb_list_point" class="td_bignum"><a href="point_list.php?sfl=mb_id&amp;stx=<?php echo $row['mb_id'] ?>"><?php echo number_format($row['mb_point']) ?></a></td>
<td rowspan="2" headers="mb_list_mng"><?php echo $s_mod ?><br><?php echo $s_grp ?></td>
</tr>
<tr <?php echo $tr_bg; ?>>
<td class="td_name sv_use"><div><?php echo $mb_nick ?></div></td>
<td class="">
<td headers="mb_list_nick" class="td_name sv_use"><div><?php echo $mb_nick ?></div></td>
<td headers="mb_list_auth" class="">
<?php
if ($leave_msg || $intercept_msg) echo $leave_msg.' '.$intercept_msg;
else echo "정상";
?>
<?php echo get_member_level_select("mb_level[$i]", 1, $member['mb_level'], $row['mb_level']) ?>
</td>
<td><?php echo $row['mb_tel']; ?></td>
<td class="td_chk"><?php echo preg_match('/[1-9]/', $row['mb_email_certify'])?'<span class="txt_true">Yes</span>':'<span class="txt_false">No</span>'; ?></td>
<td class="td_chk"><input type="checkbox" name="mb_mailling[<?php echo $i; ?>]" <?php echo $row['mb_mailling']?'checked':''; ?> value="1"></td>
<td class="td_chk"><input type="checkbox" name="mb_open[<?php echo $i; ?>]" <?php echo $row['mb_open']?'checked':''; ?> value="1"></td>
<td class="td_chk"><input type="checkbox" name="mb_hp_certify[<?php echo $i; ?>]" <?php echo $row['mb_hp_certify']?'checked':''; ?> value="1"></td>
<td class="td_chk"><input type="checkbox" name="mb_adult[<?php echo $i; ?>]" <?php echo $row['mb_adult']?'checked':''; ?> value="1"></td>
<td class="td_chk">
<td headers="mb_list_tel"><?php echo $row['mb_tel']; ?></td>
<td headers="mb_list_mailc" class="td_chk"><?php echo preg_match('/[1-9]/', $row['mb_email_certify'])?'<span class="txt_true">Yes</span>':'<span class="txt_false">No</span>'; ?></td>
<td headers="mb_list_mailr" class="td_chk"><input type="checkbox" name="mb_mailling[<?php echo $i; ?>]" <?php echo $row['mb_mailling']?'checked':''; ?> value="1"></td>
<td headers="mb_list_open" class="td_chk"><input type="checkbox" name="mb_open[<?php echo $i; ?>]" <?php echo $row['mb_open']?'checked':''; ?> value="1"></td>
<td headers="mb_list_selfc" class="td_chk"><input type="checkbox" name="mb_hp_certify[<?php echo $i; ?>]" <?php echo $row['mb_hp_certify']?'checked':''; ?> value="1"></td>
<td headers="mb_list_adultc" class="td_chk"><input type="checkbox" name="mb_adult[<?php echo $i; ?>]" <?php echo $row['mb_adult']?'checked':''; ?> value="1"></td>
<td headers="mb_list_deny" class="td_chk">
<?php if(empty($row['mb_leave_date'])){ ?>
<input type="checkbox" name="mb_intercept_date[<?php echo $i; ?>]" <?php echo $row['mb_intercept_date']?'checked':''; ?> value="<?php echo $intercept_date ?>" id="mb_intercept_date_<?php echo $i ?>" title="<?php echo $intercept_title ?>">
<?php } ?>
</td>
<td><?php echo substr($row['mb_datetime'],2,8); ?></td>
<td class="td_chk"><?php echo $group ?></td>
<td headers="mb_list_join"><?php echo substr($row['mb_datetime'],2,8); ?></td>
<td headers="mb_list_grp" class="td_chk"><?php echo $group ?></td>
</tr>
<?php

2
adm/visit_domain.php
View File

@ -70,7 +70,7 @@ while ($row=sql_fetch_array($result)) {
$link2 = '';
$key = '직접';
} else {
$link = '<a href="./visit_list.php?$qstr&amp;domain='.$key.'">';
$link = '<a href="./visit_list.php?'.$qstr.'&amp;domain='.$key.'">';
$link2 = '</a>';
}

5
css/admin.css
View File

@ -32,7 +32,7 @@ h2 {font-size:1.2em}
#tnb {float:right;margin:0;padding:0;zoom:1}
#tnb:after {display:block;visibility:hidden;clear:both;content:""}
#tnb li {float:left}
#tnb a {display:block;position:relative;width:68px;height:68px;color:#e0e0e0;font-size:0.9em;text-decoration:none}
#tnb a {display:block;position:relative;width:68px;height:68px;color:#e0e0e0;font-size:0.95em;text-decoration:none}
#tnb span {position:absolute;bottom:10px;left:0;width:100%;text-align:center}
#tnb_modify {background:url('../adm/img/tnb_modify.jpg')}
#tnb_chome_cf {background:url('../adm/img/tnb_chome_cf.jpg')}
@ -147,6 +147,9 @@ fieldset .btn_submit:focus {height:21px;background:#555;line-height:1.7em}
/* 외부서비스 사이트코드 */
.sitecode {display:inline-block;font:bold 15px 'Verdana';vertical-align:middle}
/* 주의문구 */
.str_caution {color:#ff3061}
/* 폼 */
label {vertical-align:middle}
textarea, .frm_input {padding:2px;border:1px solid #ced9de;background:#f6f9fa;vertical-align:middle}

7
css/default.css
View File

@ -157,6 +157,7 @@ button.btn_frmline {font-size:1em}
.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 tbody th {}
.basic_tbl td {padding:8px 5px 6px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9;line-height:1.5em;word-break:break-all}
.basic_tbl a {}
.bo_sideview td {padding:6px 4px} /* 사이드뷰 사용하는 테이블 셀 패딩값 */
@ -170,11 +171,11 @@ td.empty_table {padding:85px 0;text-align:center}
/* 폼 테이블 */
.frm_tbl {margin-bottom:20px;width:100%;border-collapse:collapse;border-spacing:0}
.frm_tbl caption {padding:10px 0;font-weight:bold;text-align:left}
.frm_tbl th {width:100px;padding:7px 13px;border:1px solid #e9e9e9;border-left:0;background:#f7f7f7;vertical-align:top;text-align:left}
.frm_tbl td {padding:7px 10px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9;background:transparent;vertical-align:top}
.frm_tbl th {width:100px;padding:7px 13px;border:1px solid #e9e9e9;border-left:0;background:#f7f7f7;text-align:left}
.frm_tbl td {padding:7px 10px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9;background:transparent}
.frm_tbl textarea, .frm_input {padding:2px 2px 3px;border:1px solid #b8c9c2;background:#f7f7f7;vertical-align:middle}
.frm_input:focus, input.required:focus {padding:3px 3px 4px;border:0;background:#21272e !important;color:#fff}
.frm_tbl textarea {width:90%;height:150px}
.frm_tbl textarea {width:98%;height:100px}
.frm_address {display:block;margin-top:5px}
.frm_file {display:block;margin-bottom:5px}
.frm_tbl #captcha {margin:0;padding:0;border:0;background:transparent}

1
css/mobile.css
View File

@ -123,6 +123,7 @@ pre {overflow-x:scroll;font-size:1.1em}
.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 tbody th {}
.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 {} /* 사이드뷰 사용하는 테이블 셀 패딩값 */

28
lib/thumbnail.lib.php
View File

@ -76,24 +76,26 @@ function get_list_thumbnail($bo_table, $wr_id, $thumb_width, $thumb_height, $is_
}
// 게시글보기 썸네일 생성
function get_view_thumbnail($contents)
function get_view_thumbnail($contents, $thumb_width=0)
{
global $board, $config;
$dvc_width = intval($_COOKIE['device_width']);
if(G4_IS_MOBILE && $dvc_width) {
// 썸네일 width 설정
$thumb_width = 320;
if (!$thumb_width) {
$dvc_width = intval($_COOKIE['device_width']);
if(G4_IS_MOBILE && $dvc_width) {
// 썸네일 width 설정
$thumb_width = 320;
if($dvc_width >= 1000) {
return $contents;
} else if($dvc_width >= 760 && $dvc_width < 1000) {
$thumb_width = 760;
} else if($dvc_width >= 480 && $dvc_width < 760) {
$thumb_width = 480;
if($dvc_width >= 1000) {
return $contents;
} else if($dvc_width >= 760 && $dvc_width < 1000) {
$thumb_width = 760;
} else if($dvc_width >= 480 && $dvc_width < 760) {
$thumb_width = 480;
}
} else {
$thumb_width = $board['bo_image_width'];
}
} else {
$thumb_width = $board['bo_image_width'];
}
// $contents 중 img 태그 추출

1
plugin/syndi/func/site.func.php
View File

@ -110,7 +110,6 @@ function _Syndi_getNextChannelId($channel_id=null)
$sql .= " order by b.gr_id,b.bo_table limit 1";
$row = sql_fetch($sql);
sql_free_result($result);
return $row['bo_table'];
}

10
skin/board/basic/list.skin.php
View File

@ -128,20 +128,20 @@ if ($is_nogood) $colspan++;
<?php if ($list_href || $is_checkbox || $write_href) { ?>
<div class="bo_fx">
<?php if ($is_checkbox) { ?>
<ul class="btn_bo_adm">
<?php if ($list_href) { ?>
<li><a href="<?php echo $list_href ?>" class="btn_b01"> 목록</a></li>
<?php } ?>
<?php if ($is_checkbox) { ?>
<li><input type="submit" name="btn_submit" value="선택삭제" onclick="document.pressed=this.value"></li>
<li><input type="submit" name="btn_submit" value="선택복사" onclick="document.pressed=this.value"></li>
<li><input type="submit" name="btn_submit" value="선택이동" onclick="document.pressed=this.value"></li>
<?php } ?>
</ul>
<?php } ?>
<?php if ($list_href || $write_href) { ?>
<ul class="btn_bo_user">
<?php if ($list_href) { ?><li><a href="<?php echo $list_href ?>" class="btn_b01">목록</a></li><?php } ?>
<?php if ($write_href) { ?><li><a href="<?php echo $write_href ?>" class="btn_b02">글쓰기</a></li><?php } ?>
</ul>
<?php } ?>
</div>
<?php } ?>
</form>

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

@ -168,7 +168,7 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
</section>
<?php
include(G4_SNS_PATH."/view.sns.skin.php");
include_once(G4_SNS_PATH."/view.sns.skin.php");
?>
<?php

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

@ -124,10 +124,6 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
<?php
include(G4_SNS_PATH."/view_comment_write.sns.skin.php");
?>
<?php
@include(G4_SKIN_PATH."/board/basic/view_comment.sns.skin.php");
?>
<tr>
<th scope="row">내용</th>
<td>

13
skin/board/gallery/list.skin.php
View File

@ -124,23 +124,22 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
<?php if ($list_href || $is_checkbox || $write_href) { ?>
<div class="bo_fx">
<?php if ($is_checkbox) { ?>
<ul class="btn_bo_adm">
<?php if ($list_href) { ?>
<li><a href="<?php echo $list_href ?>" class="btn_b01"> 목록</a></li>
<?php } ?>
<?php if ($is_checkbox) { ?>
<li><input type="submit" name="btn_submit" value="선택삭제" onclick="document.pressed=this.value"></li>
<li><input type="submit" name="btn_submit" value="선택복사" onclick="document.pressed=this.value"></li>
<li><input type="submit" name="btn_submit" value="선택이동" onclick="document.pressed=this.value"></li>
<?php } ?>
</ul>
<?php } ?>
<?php if ($list_href || $write_href) { ?>
<ul class="btn_bo_user">
<li><?php if ($write_href) { ?><a href="<?php echo $write_href ?>" class="btn_b02">글쓰기</a><?php } ?></li>
<?php if ($list_href) { ?><li><a href="<?php echo $list_href ?>" class="btn_b01">목록</a></li><?php } ?>
<?php if ($write_href) { ?><li><a href="<?php echo $write_href ?>" class="btn_b02">글쓰기</a></li><?php } ?>
</ul>
<?php } ?>
</div>
<?php } ?>
</form>
</div>

3
skin/search/basic/search.skin.php
View File

@ -21,7 +21,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
</select>
<label for="stx" class="sound_only">검색어<strong class="sound_only"> 필수</strong></label>
<input type="text" name="stx" value="<?php echo $text_stx ?>" class="frm_input" required class="required" maxlength="20">
<input type="text" name="stx" value="<?php echo $text_stx ?>" id="stx" required class="frm_input required" maxlength="20">
<input type="submit" class="btn_submit" value="검색">
<script>
@ -113,6 +113,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
$comment_href = "#c_".$list[$idx][$i][wr_id];
}
?>
<li>
<a href="<?php echo $list[$idx][$i][href] ?><?php echo $comment_href ?>" class="sch_res_title"><?php echo $comment_def ?><?php echo $list[$idx][$i][subject] ?></a>
<a href="<?php echo $list[$idx][$i][href] ?><?php echo $comment_href ?>" target="_blank">새창</a>

1
skin/search/basic/style.css
View File

@ -20,4 +20,5 @@
.sch_res_list h2 {margin:0 0 15px;font-size:1.2em}
.sch_res_list ul {margin:0;padding:0;list-style:none}
.sch_res_list li {margin:0 0 10px;padding:0 0 10px;border-bottom:1px solid #e9e9e9}
.sch_res_title {font-weight:bold}
.sch_more {text-align:right}