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

This commit is contained in:
whitedot
2013-03-21 15:30:48 +09:00
95 changed files with 2216 additions and 1834 deletions

View File

@ -114,10 +114,6 @@ function imageview(id, w, h)
echo $gnb_str;
?>
</nav>
<div id="current_loc">
<p><?=$member['mb_id']?>님 현재위치</p>
</div>
</div>
</header>

View File

@ -15,6 +15,7 @@ function get_skin_select($skin_gubun, $id, $name, $selected='', $event='')
$skins = get_skin_dir($skin_gubun);
$str = "<select id=\"$id\" name=\"$name\" $event>\n";
for ($i=0; $i<count($skins); $i++) {
if ($i == 0) $str .= "<option value=\"\">선택</option>";
$str .= option_selected($skins[$i], $selected);
}
$str .= "</select>";
@ -27,6 +28,7 @@ function get_mobile_skin_select($skin_gubun, $id, $name, $selected='', $event=''
$skins = get_skin_dir($skin_gubun, G4_MOBILE_PATH.'/'.G4_SKIN_DIR);
$str = "<select id=\"$id\" name=\"$name\" $event>\n";
for ($i=0; $i<count($skins); $i++) {
if ($i == 0) $str .= "<option value=\"\">선택</option>";
$str .= option_selected($skins[$i], $selected);
}
$str .= "</select>";

View File

@ -13,7 +13,10 @@ if (!defined('_GNUBOARD_')) exit;
</div>
<footer id="ft">
<p>Copyright &copy; 소유하신 도메인. All rights reserved.</p>
<p>
Copyright &copy; 소유하신 도메인. All rights reserved.<br>
<a href="#">상단으로</a>
</p>
</footer>
<!-- <p>실행시간 : <?=get_microtime() - $begin_time;?> -->

View File

@ -41,14 +41,15 @@ include_once(G4_PATH.'/head.sub.php');
</tr>
</tbody>
</table>
</div>
<div class="btn_confirm">
<input type="submit" class="btn_submit" value="복사">
<input type="button" class="btn_cancel" value="창닫기" onclick="window.close();">
</div>
<div class="btn_confirm">
<input type="submit" class="btn_submit" value="복사">
<input type="button" class="btn_cancel" value="창닫기" onclick="window.close();">
</div>
</form>
</form>
</div>
<script>
function fboardcopy_check(f)

View File

@ -68,6 +68,7 @@ $sql = " insert into {$g4['board_table']}
bo_hot = '{$board[bo_hot]}',
bo_image_width = '{$board[bo_image_width]}',
bo_skin = '{$board['bo_skin']}',
bo_mobile_skin = '{$board['bo_mobile']}',
bo_include_head = '{$board['bo_include_head']}',
bo_include_tail = '{$board['bo_include_tail']}',
bo_content_head = '".addslashes($board['bo_content_head'])."',

View File

@ -37,7 +37,7 @@ if ($w == '') {
$html_title .= ' 생성';
$bo_table_attr = 'class="required alnum_"';
$bo_table_attr = 'required alnum_';
$sound_only = '<strong class="sound_only">필수</strong>';
$board['bo_count_delete'] = 1;
@ -48,11 +48,11 @@ if ($w == '') {
$board['bo_download_point'] = $config['cf_download_point'];
$board['bo_gallery_cols'] = 4;
$board['bo_gallery_width'] = 200;
$board['bo_gallery_height'] = 150;
$board['bo_mobile_gallery_cols'] = 2;
$board['bo_mobile_gallery_width'] = 160;
$board['bo_mobile_gallery_height'] = 120;
$board['bo_gallery_width'] = 174;
$board['bo_gallery_height'] = 124;
$board['bo_mobile_gallery_cols'] = 3;
$board['bo_mobile_gallery_width'] = 125;
$board['bo_mobile_gallery_height'] = 100;
$board['bo_table_width'] = 100;
$board['bo_page_rows'] = $config['cf_page_rows'];
$board['bo_subject_len'] = 60;
@ -127,7 +127,7 @@ $pg_anchor = "<ul class=\"anchor\">
<tr>
<th scope="row"><label for="bo_table">TABLE<?=$sound_only?></label></th>
<td colspan="2">
<input type="text" name="bo_table" value="<?=$board['bo_table'] ?>" id="bo_table" required class="required frm_input" maxlength="20" <?=$bo_table_attr?>>
<input type="text" name="bo_table" value="<?=$board['bo_table'] ?>" id="bo_table" required class="frm_input <?=$bo_table_attr?>" maxlength="20">
<? if ($w == '') { ?>
영문자, 숫자, _ 만 가능 (공백없이 20자 이내)
<? } else { ?>
@ -160,10 +160,10 @@ $pg_anchor = "<ul class=\"anchor\">
</select>
</td>
<td class="group_setting">
<input type="checkbox" name="chk_grp_use" value="1" id="chk_grp_use">
<label for="chk_grp_use">그룹적용</label>
<input type="checkbox" name="chk_all_use" value="1" id="chk_all_use">
<label for="chk_all_use">전체적용</label>
<input type="checkbox" name="chk_grp_device" value="1" id="chk_grp_device">
<label for="chk_grp_device">그룹적용</label>
<input type="checkbox" name="chk_all_device" value="1" id="chk_all_device">
<label for="chk_all_device">전체적용</label>
</td>
</tr>
<tr>
@ -530,7 +530,7 @@ $pg_anchor = "<ul class=\"anchor\">
<tr>
<th scope="row"><label for="bo_upload_count">파일 업로드 갯수<strong class="sound_only">필수</strong></label></th>
<td>
<?=help('게시물 한건당 업로드 할 수 있는 파일의 최대 개수 (0 이면 제한 없음)')?>
<?=help('게시물 한건당 업로드 할 수 있는 파일의 최대 개수 (0 은 파일첨부 사용하지 않음)')?>
<input type="text" name="bo_upload_count" value="<?=$board['bo_upload_count']?>" id="bo_upload_count" required class="required numeric frm_input" size="4">
</td>
<td class="group_setting">

View File

@ -53,7 +53,7 @@ $bo_category_list = str_replace($src_char, $dst_char, $bo_category_list);
$sql_common = " gr_id = '{$_POST['gr_id']}',
bo_subject = '{$_POST['bo_subject']}',
bo_device = '{$_POST['bo_device']}',
bo_device = '{$_POST['bo_device']}',
bo_admin = '{$_POST['bo_admin']}',
bo_list_level = '{$_POST['bo_list_level']}',
bo_read_level = '{$_POST['bo_read_level']}',
@ -109,6 +109,7 @@ $sql_common = " gr_id = '{$_POST['gr_id']}',
bo_reply_order = '{$_POST['bo_reply_order']}',
bo_use_search = '{$_POST['bo_use_search']}',
bo_order = '{$_POST['bo_order']}',
bo_show_menu = '{$_POST['bo_show_menu']}',
bo_write_min = '{$_POST['bo_write_min']}',
bo_write_max = '{$_POST['bo_write_max']}',
bo_comment_min = '{$_POST['bo_comment_min']}',
@ -222,7 +223,7 @@ if ($w == '') {
// 같은 그룹내 게시판 동일 옵션 적용
$grp_fields = '';
if (is_checked('chk_grp_use')) $grp_fields .= " , bo_use = '{$bo_use}' ";
if (is_checked('chk_grp_device')) $grp_fields .= " , bo_device = '{$bo_device}' ";
if (is_checked('chk_grp_admin')) $grp_fields .= " , bo_admin = '{$bo_admin}' ";
if (is_checked('chk_grp_list_level')) $grp_fields .= " , bo_list_level = '{$bo_list_level}' ";
if (is_checked('chk_grp_read_level')) $grp_fields .= " , bo_read_level = '{$bo_read_level}' ";
@ -285,6 +286,7 @@ if (is_checked('chk_grp_content_tail')) $grp_fields .= " , bo_content_ta
if (is_checked('chk_grp_insert_content')) $grp_fields .= " , bo_insert_content = '{$bo_insert_content}' ";
if (is_checked('chk_grp_use_search')) $grp_fields .= " , bo_use_search = '{$bo_use_search}' ";
if (is_checked('chk_grp_order')) $grp_fields .= " , bo_order = '{$bo_order}' ";
if (is_checked('chk_grp_show_menu')) $grp_fields .= " , bo_show_menu = '{$bo_show_menu}' ";
for ($i=1; $i<=10; $i++) {
if (is_checked('chk_grp_'.$i)) {
$grp_fields .= " , bo_{$i}_subj = '".$_POST['bo_'.$i.'_subj']."' ";
@ -299,7 +301,7 @@ if ($grp_fields) {
// 모든 게시판 동일 옵션 적용
$all_fields = '';
if (is_checked('chk_all_use')) $all_fields .= " , bo_use = '{$bo_use}' ";
if (is_checked('chk_all_device')) $all_fields .= " , bo_device = '{$bo_device}' ";
if (is_checked('chk_all_admin')) $all_fields .= " , bo_admin = '{$bo_admin}' ";
if (is_checked('chk_all_list_level')) $all_fields .= " , bo_list_level = '{$bo_list_level}' ";
if (is_checked('chk_all_read_level')) $all_fields .= " , bo_read_level = '{$bo_read_level}' ";
@ -362,6 +364,7 @@ if (is_checked('chk_all_content_tail')) $all_fields .= " , bo_content_ta
if (is_checked('chk_all_insert_content')) $all_fields .= " , bo_insert_content = '{$bo_insert_content}' ";
if (is_checked('chk_all_use_search')) $all_fields .= " , bo_use_search = '{$bo_use_search}' ";
if (is_checked('chk_all_order')) $all_fields .= " , bo_order = '{$bo_order}' ";
if (is_checked('chk_all_show_menu')) $all_fields .= " , bo_show_menu = '{$bo_show_menu}' ";
for ($i=1; $i<=10; $i++) {
if (is_checked('chk_all_'.$i)) {
$all_fields .= " , bo_{$i}_subj = '".$_POST['bo_'.$i.'_subj']."' ";

View File

@ -76,7 +76,7 @@ include_once('./admin.head.php');
<th scope="row"><label for="gr_device">접속기기</label></th>
<td>
<?=help("PC 와 모바일 사용을 구분합니다.")?>
<select id="gr_device_" name="gr_device">
<select id="gr_device" name="gr_device">
<option value="both"<?=get_selected($group['gr_device'], 'both', true);?>>PC와 모바일에서 모두 사용</option>
<option value="pc"<?=get_selected($group['gr_device'], 'pc');?>>PC 전용</option>
<option value="mobile"<?=get_selected($group['gr_device'], 'mobile');?>>모바일 전용</option>
@ -144,11 +144,6 @@ include_once('./admin.head.php');
</div>
<script>
if (document.fboardgroup.w.value == '')
document.fboardgroup.gr_id.focus();
else
document.fboardgroup.gr_subject.focus();
function fboardgroup_check(f)
{
f.action = './boardgroup_form_update.php';

View File

@ -123,6 +123,7 @@ $colspan = 15;
<th scope="col"><?=subject_sort_link('mb_level', '', 'desc')?>권한</a></th>
<th scope="col"><?=subject_sort_link('mb_point', '', 'desc')?> 포인트</a></th>
<th scope="col"><?=subject_sort_link('mb_today_login', '', 'desc')?>최종접속</a></th>
<th scope="col"><?=subject_sort_link('mb_datetime', '', 'desc')?>가입일</a></th>
<th scope="col"><?=subject_sort_link('mb_mailling', '', 'desc')?>수신</a></th>
<th scope="col"><?=subject_sort_link('mb_open', '', 'desc')?>공개</a></th>
<th scope="col"><?=subject_sort_link('mb_email_certify', '', 'desc')?>인증</a></th>
@ -189,6 +190,7 @@ $colspan = 15;
<td><?=get_member_level_select("mb_level[$i]", 1, $member['mb_level'], $row['mb_level'])?></td>
<td class="td_bignum"><a href="point_list.php?sfl=mb_id&amp;stx=<?=$row['mb_id']?>"><?=number_format($row['mb_point'])?></a></td>
<td><?=substr($row['mb_today_login'],2,8)?></td>
<td><?=substr($row['mb_datetime'],2,8)?></td>
<td><?=$row['mb_mailling']?'<span class="txt_true">Yes</span>':'<span class="txt_false">No</span>';?></td>
<td><?=$row['mb_open']?'<span class="txt_true">Yes</span>':'<span class="txt_false">No</span>';?></td>
<td><?=preg_match('/[1-9]/', $row['mb_email_certify'])?'<span class="txt_true">Yes</span>':'<span class="txt_false">No</span>';?></td>

View File

@ -482,7 +482,15 @@ if ($ii) {
<script>
function search_relation(fld) {
if (fld.value) {
window.open('itemformrelation.php?it_id=<?=$it_id?>&ca_id='+fld.value, 'hiddenframe', '');
$.post(
'./itemformrelation.php',
{ it_id: '<?=$it_id?>', ca_id: fld.value },
function(data) {
if(data) {
$("#relation").html(data);
}
}
);
}
}
</script>
@ -527,16 +535,18 @@ if ($ii) {
// 김선용 2006.10
function relation_img(name, id)
{
item_image_dir = "<?=G4_DATA_URL?>/item";
if(!name) return;
var item_image_url = "";
if(!name) return;
temp = name.split("/");
if(temp[1] == ''){
temp[1] = "no_image.gif";
var item_image_dir = "<?=G4_SHOP_URL?>/img";
}
item_image_url = "<?=G4_SHOP_URL?>/img";
} else {
item_image_url = "<?=G4_DATA_URL?>/item";
}
view_span = document.getElementById(id);
item_price = number_format(String(temp[2]));
view_span.innerHTML = "<img src='"+item_image_dir+"/"+temp[1]+"' width=100 height=80 border=1 style='border-color:#333333; cursor:pointer' onclick=\"popup_window('"+g4_path+"/shop/item.php?it_id="+temp[0]+"', '', '')\" title='새창으로 상품보기' alt='새창으로 상품보기'><br>"+item_price+" 원";
view_span.innerHTML = "<a href=\"<?=G4_SHOP_URL?>/item.php?it_id="+temp[0]+"\" target=\"_blank\"><img src=\""+item_image_url+"/"+temp[1]+"\"width=\"100\" height=\"80\" border=\"1\" style=\"border-color:#333333;\" title=\"상품 새창으로 보기\"></a><br>"+item_price+" 원";
}
function relation_add(fld)
@ -795,7 +805,7 @@ function codedupcheck(id)
return false;
} else {
alert("'"+data.code+"' 은(는) 등록된 코드가 없으므로 사용하실 수 있습니다.");
document.fcategoryform.codedup.value = '';
document.fitemform.codedup.value = '';
}
}, "json"
);

View File

@ -11,12 +11,7 @@ $sql = " select ca_id, it_id, it_name, it_amount
and it_id <> '$it_id'
order by ca_id, it_name ";
$result = sql_query($sql);
$num = @mysql_num_rows($result);
?>
<script>
parent.document.getElementById('relation').length = <?=$num?>;
<?
$cnt = 0;
for($i=0;$row=sql_fetch_array($result);$i++) {
//$sql2 = " select count(*) as cnt from $g4[yc4_item_relation_table] where it_id = '$row[it_id]' ";
$sql2 = " select count(*) as cnt from {$g4['yc4_item_relation_table']} where it_id = '$it_id' and it_id2 = '{$row['it_id']}' ";
@ -33,14 +28,9 @@ for($i=0;$row=sql_fetch_array($result);$i++) {
$it_image = "{$row['it_id']}_s";
else
$it_image = "";
//echo "parent.document.getElementById('relation').length++;";
echo "parent.document.getElementById('relation').options[$cnt].text = '$ca_name : $it_name';\n";
echo "parent.document.getElementById('relation').options[$cnt].value = '$row[it_id]/$it_image/{$row['it_amount']}';\n";
$cnt++;
$options .= "<option value=\"".$row['it_id']."/".$it_image."/".$row['it_amount']."\">$ca_name : $it_name</option>\n";
}
?>
parent.document.getElementById('relation').length = <?=$cnt?>;
</script>
<?
include_once (G4_PATH.'/tail.sub.php');
echo $options;
?>

View File

@ -63,15 +63,8 @@ $result = sql_query($sql);
$referer = get_text(cut_str($row['vi_referer'], 255, ''));
$referer = urldecode($referer);
if (strtolower($g4['charset']) == 'utf-8') {
if (!is_utf8($referer)) {
$referer = iconv('euc-kr', 'utf-8', $referer);
}
}
else {
if (is_utf8($referer)) {
$referer = iconv('utf-8', 'euc-kr', $referer);
}
if (!is_utf8($referer)) {
$referer = iconv_utf8($referer);
}
$title = str_replace(array('<', '>', '&'), array("&lt;", "&gt;", "&amp;"), $referer);