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

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

Browse Source
This commit is contained in:
whitedot
2013-12-09 12:44:50 +09:00
parent e600920fb3 8eb22243bc
commit 023a3a4813
10 changed files with 62 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
adm/board_form.php
View File

@ -535,7 +535,7 @@ $pg_anchor = '<ul class="anchor">
<input type="checkbox" name="bo_use_signature" value="1" id="bo_use_signature" <?php echo $board['bo_use_signature']?'checked':''; ?>>
사용
</td>
<td class="group_setting">
<td class="td_grpset">
<input type="checkbox" name="chk_grp_use_signature" value="1" id="chk_grp_use_signature">
<label for="chk_grp_use_signature">그룹적용</label>
<input type="checkbox" name="chk_all_use_signature" value="1" id="chk_all_use_signature">
@ -548,7 +548,7 @@ $pg_anchor = '<ul class="anchor">
<input type="checkbox" name="bo_use_ip_view" value="1" id="bo_use_ip_view" <?php echo $board['bo_use_ip_view']?'checked':''; ?>>
사용
</td>
<td class="group_setting">
<td class="td_grpset">
<input type="checkbox" name="chk_grp_use_ip_view" value="1" id="chk_grp_use_ip_view">
<label for="chk_grp_use_ip_view">그룹적용</label>
<input type="checkbox" name="chk_all_use_ip_view" value="1" id="chk_all_use_ip_view">
@ -562,7 +562,7 @@ $pg_anchor = '<ul class="anchor">
<input type="checkbox" name="bo_use_list_content" value="1" id="bo_use_list_content" <?php echo $board['bo_use_list_content']?'checked':''; ?>>
사용 (사용시 속도가 느려질 수 있습니다.)
</td>
<td class="group_setting">
<td class="td_grpset">
<input type="checkbox" name="chk_grp_use_list_content" value="1" id="chk_grp_use_list_content">
<label for="chk_grp_use_list_content">그룹적용</label>
<input type="checkbox" name="chk_all_use_list_content" value="1" id="chk_all_use_list_content">
@ -576,7 +576,7 @@ $pg_anchor = '<ul class="anchor">
<input type="checkbox" name="bo_use_list_file" value="1" id="bo_use_list_file" <?php echo $board['bo_use_list_file']?'checked':''; ?>>
사용 (사용시 속도가 느려질 수 있습니다.)
</td>
<td class="group_setting">
<td class="td_grpset">
<input type="checkbox" name="chk_grp_use_list_file" value="1" id="chk_grp_use_list_file">
<label for="chk_grp_use_list_file">그룹적용</label>
<input type="checkbox" name="chk_all_use_list_file" value="1" id="chk_all_use_list_file">
@ -589,7 +589,7 @@ $pg_anchor = '<ul class="anchor">
<input type="checkbox" name="bo_use_list_view" value="1" id="bo_use_list_view" <?php echo $board['bo_use_list_view']?'checked':''; ?>>
사용
</td>
<td class="group_setting">
<td class="td_grpset">
<input type="checkbox" name="chk_grp_use_list_view" value="1" id="chk_grp_use_list_view">
<label for="chk_grp_use_list_view">그룹적용</label>
<input type="checkbox" name="chk_all_use_list_view" value="1" id="chk_all_use_list_view">
@ -602,7 +602,7 @@ $pg_anchor = '<ul class="anchor">
<input type="checkbox" name="bo_use_email" value="1" id="bo_use_email" <?php echo $board['bo_use_email']?'checked':''; ?>>
사용
</td>
<td class="group_setting">
<td class="td_grpset">
<input type="checkbox" name="chk_grp_use_email" value="1" id="chk_grp_use_email">
<label for="chk_grp_use_email">그룹적용</label>
<input type="checkbox" name="chk_all_use_email" value="1" id="chk_all_use_email">
@ -625,7 +625,7 @@ $pg_anchor = '<ul class="anchor">
?>
</select>
</td>
<td class="group_setting">
<td class="td_grpset">
<input type="checkbox" name="chk_grp_use_cert" value="1" id="chk_grp_use_cert">
<label for="chk_grp_use_cert">그룹적용</label>
<input type="checkbox" name="chk_all_use_cert" value="1" id="chk_all_use_cert">
@ -638,7 +638,7 @@ $pg_anchor = '<ul class="anchor">
<?php echo help('게시물 한건당 업로드 할 수 있는 파일의 최대 개수 (0 은 파일첨부 사용하지 않음)') ?>
<input type="text" name="bo_upload_count" value="<?php echo $board['bo_upload_count'] ?>" id="bo_upload_count" required class="required numeric frm_input" size="4">
</td>
<td class="group_setting">
<td class="td_grpset">
<input type="checkbox" name="chk_grp_upload_count" value="1" id="chk_grp_upload_count">
<label for="chk_grp_upload_count">그룹적용</label>
<input type="checkbox" name="chk_all_upload_count" value="1" id="chk_all_upload_count">
@ -657,7 +657,7 @@ $pg_anchor = '<ul class="anchor">
<?php echo help('최대 '.ini_get("upload_max_filesize").' 이하 업로드 가능, 1 MB = 1,048,576 bytes') ?>
업로드 파일 한개당 <input type="text" name="bo_upload_size" value="<?php echo $board['bo_upload_size'] ?>" id="bo_upload_size" required class="required numeric frm_input" size="10"> bytes 이하
</td>
<td class="group_setting">
<td class="td_grpset">
<input type="checkbox" name="chk_grp_upload_size" value="1" id="chk_grp_upload_size">
<label for="chk_grp_upload_size">그룹적용</label>
<input type="checkbox" name="chk_all_upload_size" value="1" id="chk_all_upload_size">
@ -669,7 +669,7 @@ $pg_anchor = '<ul class="anchor">
<td>
<input type="checkbox" name="bo_use_file_content" value="1" id="bo_use_file_content" <?php echo $board['bo_use_file_content']?'checked':''; ?>>사용
</td>
<td class="group_setting">
<td class="td_grpset">
<input type="checkbox" name="chk_grp_use_file_content" value="1" id="chk_grp_use_file_content">
<label for="chk_grp_use_file_content">그룹적용</label>
<input type="checkbox" name="chk_all_use_file_content" value="1" id="chk_all_use_file_content">
@ -682,7 +682,7 @@ $pg_anchor = '<ul class="anchor">
<?php echo help('글 입력시 최소 글자수를 설정. 0을 입력하거나 최고관리자, DHTML 에디터 사용시에는 검사하지 않음') ?>
<input type="text" name="bo_write_min" value="<?php echo $board['bo_write_min'] ?>" id="bo_write_min" class="numeric frm_input" size="4">
</td>
<td class="group_setting">
<td class="td_grpset">
<input type="checkbox" name="chk_grp_write_min" value="1" id="chk_grp_write_min">
<label for="chk_grp_write_min">그룹적용</label>
<input type="checkbox" name="chk_all_write_min" value="1" id="chk_all_write_min">
@ -695,7 +695,7 @@ $pg_anchor = '<ul class="anchor">
<?php echo help('글 입력시 최대 글자수를 설정. 0을 입력하거나 최고관리자, DHTML 에디터 사용시에는 검사하지 않음') ?>
<input type="text" name="bo_write_max" value="<?php echo $board['bo_write_max'] ?>" id="bo_write_max" class="numeric frm_input" size="4">
</td>
<td class="group_setting">
<td class="td_grpset">
<input type="checkbox" name="chk_grp_write_max" value="1" id="chk_grp_write_max">
<label for="chk_grp_write_max">그룹적용</label>
<input type="checkbox" name="chk_all_write_max" value="1" id="chk_all_write_max">
@ -708,7 +708,7 @@ $pg_anchor = '<ul class="anchor">
<?php echo help('댓글 입력시 최소 글자수, 최대 글자수를 설정. 0을 입력하면 검사하지 않음') ?>
<input type="text" name="bo_comment_min" value="<?php echo $board['bo_comment_min'] ?>" id="bo_comment_min" class="numeric frm_input" size="4">
</td>
<td class="group_setting">
<td class="td_grpset">
<input type="checkbox" name="chk_grp_comment_min" value="1" id="chk_grp_comment_min">
<label for="chk_grp_comment_min">그룹적용</label>
<input type="checkbox" name="chk_all_comment_min" value="1" id="chk_all_comment_min">
@ -721,7 +721,7 @@ $pg_anchor = '<ul class="anchor">
<?php echo help('댓글 입력시 최소 글자수, 최대 글자수를 설정. 0을 입력하면 검사하지 않음') ?>
<input type="text" name="bo_comment_max" value="<?php echo $board['bo_comment_max'] ?>" id="bo_comment_max" class="numeric frm_input" size="4">
</td>
<td class="group_setting">
<td class="td_grpset">
<input type="checkbox" name="chk_grp_comment_max" value="1" id="chk_grp_comment_max">
<label for="chk_grp_comment_max">그룹적용</label>
<input type="checkbox" name="chk_all_comment_max" value="1" id="chk_all_comment_max">
@ -735,7 +735,7 @@ $pg_anchor = '<ul class="anchor">
<input type="checkbox" name="bo_use_sns" value="1" id="bo_use_sns" <?php echo $board['bo_use_sns']?'checked':''; ?>>
사용
</td>
<td class="group_setting">
<td class="td_grpset">
<input type="checkbox" name="chk_grp_use_sns" value="1" id="chk_grp_use_sns">
<label for="chk_grp_use_sns">그룹적용</label>
<input type="checkbox" name="chk_all_use_sns" value="1" id="chk_all_use_sns">
@ -748,7 +748,7 @@ $pg_anchor = '<ul class="anchor">
<input type="checkbox" name="bo_use_search" value="1" id="bo_use_search" <?php echo $board['bo_use_search']?'checked':''; ?>>
사용
</td>
<td class="group_setting">
<td class="td_grpset">
<input type="checkbox" name="chk_grp_use_search" value="1" id="chk_grp_use_search">
<label for="chk_grp_use_search">그룹적용</label>
<input type="checkbox" name="chk_all_use_search" value="1" id="chk_all_use_search">
@ -762,7 +762,7 @@ $pg_anchor = '<ul class="anchor">
<input type="checkbox" name="bo_show_menu" value="1" id="bo_show_menu" <?php echo $board['bo_show_menu']?'checked':''; ?>>
사용
</td>
<td class="group_setting">
<td class="td_grpset">
<input type="checkbox" name="chk_grp_show_menu" value="1" id="chk_grp_show_menu">
<label for="chk_grp_show_menu">그룹적용</label>
<input type="checkbox" name="chk_all_show_menu" value="1" id="chk_all_show_menu">
@ -775,7 +775,7 @@ $pg_anchor = '<ul class="anchor">
<?php echo help('숫자가 낮은 게시판 부터 메뉴나 검색시 우선 출력합니다.') ?>
<input type="text" name="bo_order" value="<?php echo $board['bo_order'] ?>" id="bo_order" class="frm_input" size="4">
</td>
<td class="group_setting">
<td class="td_grpset">
<input type="checkbox" name="chk_grp_order" value="1" id="chk_grp_order">
<label for="chk_grp_order">그룹적용</label>
<input type="checkbox" name="chk_all_order" value="1" id="chk_all_order">

2
adm/board_form_update.php
View File

@ -337,7 +337,7 @@ if (is_checked('chk_all_use_name')) $all_fields .= " , bo_use_name =
if (is_checked('chk_all_use_signature')) $all_fields .= " , bo_use_signature = '{$bo_use_signature}' ";
if (is_checked('chk_all_use_ip_view')) $all_fields .= " , bo_use_ip_view = '{$bo_use_ip_view}' ";
if (is_checked('chk_all_use_list_view')) $all_fields .= " , bo_use_list_view = '{$bo_use_list_view}' ";
if (is_checked('chk_all_use_list_file')) $all_fields .= " , bo_use_list_view = '{$bo_use_list_file}' ";
if (is_checked('chk_all_use_list_file')) $all_fields .= " , bo_use_list_file = '{$bo_use_list_file}' ";
if (is_checked('chk_all_use_list_content')) $all_fields .= " , bo_use_list_content = '{$bo_use_list_content}' ";
if (is_checked('chk_all_use_email')) $all_fields .= " , bo_use_email = '{$bo_use_email}' ";
if (is_checked('chk_all_use_cert')) $all_fields .= " , bo_use_cert = '{$bo_use_cert}' ";

4
css/default.css
View File

@ -190,7 +190,9 @@ a.btn_admin:focus, a.btn_admin:hover {text-decoration:none}
.tbl_frm01 table {width:100%;border-collapse:collapse;border-spacing:0}
.tbl_frm01 th {width:100px;padding:7px 13px;border:1px solid #e9e9e9;border-left:0;background:#f5f8f9;text-align:left}
.tbl_frm01 td {padding:7px 10px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9;background:transparent}
.tbl_frm01 textarea, .frm_input {height:22px;border:1px solid #e4eaec;background:#f7f7f7;color:#000;vertical-align:middle;line-height:2em}
.tbl_frm01 textarea, .frm_input {border:1px solid #e4eaec;background:#f7f7f7;color:#000;vertical-align:middle;line-height:2em}
.tbl_frm01 textarea {padding:2px 2px 3px}
.frm_input {height:22px}
.tbl_frm01 textarea {width:98%;height:100px}
.tbl_frm01 a {text-decoration:none}
.tbl_frm01 .frm_address {display:block;margin-top:5px}

2
head.php
View File

@ -32,7 +32,7 @@ if ($config['cf_include_head']) {
<div id="hd_wrapper">
<div id="logo">
<a href="<?php echo G5_URL ?>"><img src="<?php echo G5_IMG_URL ?>/logo.jpg" alt="처음으로"></a>
<a href="<?php echo G5_URL ?>"><img src="<?php echo G5_IMG_URL ?>/logo.jpg" alt="<?php echo $config['cf_title']; ?>"></a>
</div>
<fieldset id="hd_sch">

6
install/install.inc.php
View File

@ -20,13 +20,13 @@ if (!$title) $title = G5_VERSION." 설치";
<span id="bar_txt">INSTALLATION</span>
</div>
<h1><?php echo $title ?></h1>
<?php
// 파일이 존재한다면 설치할 수 없다.
$dbconfig_file = $data_path.'/'.G5_DBCONFIG_FILE;
if (file_exists($dbconfig_file)) {
?>
<h1><?php echo G5_VERSION; ?> 프로그램이 이미 설치되어 있습니다.</h1>
<div class="ins_inner">
<p>프로그램이 이미 설치되어 있습니다.<br />새로 설치하시려면 다음 파일을 삭제 하신 후 새로고침 하십시오.</p>
<ul>
@ -44,6 +44,8 @@ $exists_data_dir = true;
if (!is_dir($data_path))
{
?>
<h1><?php echo G5_VERSION; ?> 설치를 위해 아래 내용을 확인해 주십시오.</h1>
<div class="ins_inner">
<p>
루트 디렉토리에 아래로 <?php echo G5_DATA_DIR ?> 디렉토리를 생성하여 주십시오.<br />

6
install/install_config.php
View File

@ -10,9 +10,9 @@ include_once ('../config.php');
$title = G5_VERSION." 초기환경설정 2/3";
include_once ('./install.inc.php');
if (isset($_POST['agree']) && $_POST['agree'] != '동의함') {
echo "<div>라이센스(License) 내용에 동의하셔야 설치를 계속하실 수 있습니다.</div>".PHP_EOL;
echo "<div><a href=\"./\">뒤로가기</a></div>".PHP_EOL;
if (!isset($_POST['agree']) || $_POST['agree'] != '동의함') {
echo "<div class=\"ins_inner\"><p>라이센스(License) 내용에 동의하셔야 설치를 계속하실 수 있습니다.</p>".PHP_EOL;
echo "<div class=\"inner_btn\"><a href=\"./\">뒤로가기</a></div></div>".PHP_EOL;
exit;
}
?>

24
install/install_db.php
View File

@ -28,17 +28,29 @@ $g5_shop_install= $_POST['g5_shop_install'];
$dblink = @mysql_connect($mysql_host, $mysql_user, $mysql_pass);
if (!$dblink) {
echo '<meta http-equiv="content-type" content="text/html; charset=utf-8">'.PHP_EOL;
echo '<div>MySQL Host, User, Password 를 확인해 주십시오.</div>'.PHP_EOL;
echo '<div><a href="./install_config.php">뒤로가기</a></div>'.PHP_EOL;
?>
<div class="ins_inner">
<p>MySQL Host, User, Password 를 확인해 주십시오.</p>
<div class="inner_btn"><a href="./install_config.php">뒤로가기</a></div>
</div>
<?php
include_once ('./install.inc2.php');
exit;
}
$select_db = @mysql_select_db($mysql_db, $dblink);
if (!$select_db) {
echo '<meta http-equiv="content-type" content="text/html; charset=utf-8">'.PHP_EOL;
echo '<div>MySQL DB 를 확인해 주십시오.</div>'.PHP_EOL;
echo '<div><a href="./install_config.php">뒤로가기</a></div>'.PHP_EOL;
?>
<div class="ins_inner">
<p>MySQL DB 를 확인해 주십시오.</p>
<div class="inner_btn"><a href="./install_config.php">뒤로가기</a></div>
</div>
<?php
include_once ('./install.inc2.php');
exit;
}

6
mobile/shop/orderform.php
View File

@ -908,7 +908,11 @@ $(function() {
$("#od_coupon_btn").click(function() {
$("#od_coupon_frm").remove();
var $this = $(this);
var price = parseInt($("input[name=org_od_price]").val());
var price = parseInt($("input[name=org_od_price]").val()) - parseInt($("input[name=item_coupon]").val());
if(price <= 0) {
alert('상품금액이 0원이므로 쿠폰을 사용할 수 없습니다.');
return false;
}
$.post(
"./ordercoupon.php",
{ price: price },

5
shop/ordercoupon.php
View File

@ -4,7 +4,10 @@ include_once('./_common.php');
if($is_guest)
exit;
$price = $_POST['price'];
$price = (int)$_POST['price'];
if($price <= 0)
die('상품금액이 0원이므로 쿠폰을 사용할 수 없습니다.');
// 쿠폰정보
$sql = " select *

6
shop/orderform.php
View File

@ -1171,7 +1171,11 @@ $(function() {
$("#od_coupon_btn").click(function() {
$("#od_coupon_frm").remove();
var $this = $(this);
var price = parseInt($("input[name=org_od_price]").val());
var price = parseInt($("input[name=org_od_price]").val()) - parseInt($("input[name=item_coupon]").val());
if(price <= 0) {
alert('상품금액이 0원이므로 쿠폰을 사용할 수 없습니다.');
return false;
}
$.post(
"./ordercoupon.php",
{ price: price },