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-01-29 14:17:06 +09:00
parent 41b62750b4 0ffccb29e6
commit b0e764aef5
6 changed files with 116 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
adm/admin.tail.php
View File

@ -16,7 +16,7 @@ if (!defined('_GNUBOARD_')) exit;
<!-- <p>실행시간 : <?=get_microtime() - $begin_time;?> -->
<script src="<?=G4_ADM_PATH?>/admin.js"></script>
<script src="<?=G4_ADMIN_PATH?>/admin.js"></script>
<?
include_once(G4_PATH.'/tail.sub.php');

34
adm/shop_admin/itemform.php
View File

@ -386,25 +386,15 @@ ul { margin: 0; padding: 0; list-style: none; }
<tr>
<td>이미지(대)</td>
<td colspan=3>
<input type=file class=ed name=it_limg1 size=40>
<input type=file class=ed name=it_img1 size=40>
<?
$limg1 = G4_DATA_PATH."/item/{$it[it_id]}_l1";
if (file_exists($limg1)) {
$size = getimagesize($limg1);
echo "<img src='".G4_ADMIN_URL."/img/icon_viewer.gif' border=0 align=absmiddle onclick=\"imageview('limg1', $size[0], $size[1]);\"><input type=checkbox name=it_limg1_del value='1'>삭제";
echo "<div id='limg1' style='left:0; top:0; z-index:+1; display:none; position:absolute;'><img src='$limg1' border=1></div>";
$img1 = G4_DATA_PATH."/item/{$it['it_img1']}";
if (file_exists($img1) && is_file($img1)) {
$size = getimagesize($img1);
echo "<img src='".G4_ADMIN_URL."/img/icon_viewer.gif' border=0 align=absmiddle onclick=\"imageview('img1', $size[0], $size[1]);\"><input type=checkbox name=it_img1_del value='1'>삭제";
echo "<div id='img1' style='left:0; top:0; z-index:+1; display:none; position:absolute;'><img src='$img1' border=1></div>";
}
?>
<?
/*
if (function_exists("imagecreatefromjpeg")) {
//echo "<input type=checkbox name=createimage value='1'> <FONT COLOR=FF6600>이미지(중), 이미지(소)를 자동생성 하시려면 체크하세요. JPG 파일만 가능합니다.</FONT> ";
echo "<br><input type=checkbox name=createimage value='1'> 중, 소 이미지를 자동으로 생성하시는 경우에 체크하세요. (JPG 파일만 가능)";
echo help("이미지(중) 이미지(소) 의 사이즈를 환경설정에서 정한 폭과 높이로 자동생성합니다.\n\nJPG 파일만 가능합니다.");
}
*/
?>
</td>
</tr>
<tr class=ht>
@ -442,13 +432,13 @@ ul { margin: 0; padding: 0; list-style: none; }
<tr class=ht>
<td>이미지(대) <?=$i?></td>
<td colspan=3>
<input type=file class=ed name=it_limg<?=$i?> size=40>
<input type=file class=ed name=it_img<?=$i?> size=40>
<?
$limg = "$g4[path]/data/item/{$it[it_id]}_l{$i}";
if (file_exists($limg)) {
$size = getimagesize($limg);
echo "<img src='".G4_ADMIN_URL."/img/icon_viewer.gif' border=0 align=absmiddle onclick=\"imageview('limg$i', $size[0], $size[1]);\"><input type=checkbox name=it_limg{$i}_del value='1'>삭제";
echo "<span id=limg{$i} style='left:0; top:0; z-index:+1; display:none; position:absolute;'><img src='$limg' border=1></div>";
$img = G4_DATA_PATH."/item/{$it['it_img$i']}";
if (file_exists($img) && is_file($img)) {
$size = getimagesize($img);
echo "<img src='".G4_ADMIN_URL."/img/icon_viewer.gif' border=0 align=absmiddle onclick=\"imageview('img$i', $size[0], $size[1]);\"><input type=checkbox name=it_img{$i}_del value='1'>삭제";
echo "<span id=img{$i} style='left:0; top:0; z-index:+1; display:none; position:absolute;'><img src='$img' border=1></div>";
}
?>
</td>

148
adm/shop_admin/itemformupdate.php
View File

@ -120,62 +120,70 @@ function itemdelete($it_id)
sql_query($sql);
}
@mkdir("$g4[path]/data/item", 0707);
@chmod("$g4[path]/data/item", 0707);
if ($it_himg_del) @unlink("$g4[path]/data/item/{$it_id}_h");
if ($it_timg_del) @unlink("$g4[path]/data/item/{$it_id}_t");
if ($it_simg_del) @unlink("$g4[path]/data/item/{$it_id}_s");
if ($it_mimg_del) @unlink("$g4[path]/data/item/{$it_id}_m");
if ($it_limg1_del) @unlink("$g4[path]/data/item/{$it_id}_l1");
if ($it_limg2_del) @unlink("$g4[path]/data/item/{$it_id}_l2");
if ($it_limg3_del) @unlink("$g4[path]/data/item/{$it_id}_l3");
if ($it_limg4_del) @unlink("$g4[path]/data/item/{$it_id}_l4");
if ($it_limg5_del) @unlink("$g4[path]/data/item/{$it_id}_l5");
// 이미지(대)만 업로드하고 자동생성 체크일 경우 이미지(중,소) 자동생성
if ($createimage && $_FILES[it_limg1][name])
{
upload_file($_FILES[it_limg1][tmp_name], $it_id."_l1", "$g4[path]/data/item");
$image = "$g4[path]/data/item/$it_id"."_l1";
$size = getimagesize($image);
$src = @imagecreatefromjpeg($image);
if (!$src)
{
echo "<meta http-equiv=\"content-type\" content=\"text/html; charset=$g4[charset]\">";
echo "<script>alert('이미지(대)가 JPG 파일이 아닙니다.');</script>";
}
else
{
// gd 버전에 따라
if (function_exists("imagecopyresampled")) {
// 이미지(소) 생성
$dst = imagecreatetruecolor($default[de_simg_width], $default[de_simg_height]);
imagecopyresampled($dst, $src, 0, 0, 0, 0, $default[de_simg_width], $default[de_simg_height], $size[0], $size[1]);
} else {
// 이미지(소) 생성
$dst = imagecreate($default[de_simg_width], $default[de_simg_height]);
imagecopyresized($dst, $src, 0, 0, 0, 0, $default[de_simg_width], $default[de_simg_height], $size[0], $size[1]);
}
imagejpeg($dst, "$g4[path]/data/item/$it_id"."_s", 90);
if (function_exists("imagecopyresampled")) {
// 이미지(중) 생성
$dst = imagecreatetruecolor($default[de_mimg_width], $default[de_mimg_height]);
imagecopyresampled($dst, $src, 0, 0, 0, 0, $default[de_mimg_width], $default[de_mimg_height], $size[0], $size[1]);
} else {
// 이미지(중) 생성
$dst = imagecreate($default[de_mimg_width], $default[de_mimg_height]);
imagecopyresized($dst, $src, 0, 0, 0, 0, $default[de_mimg_width], $default[de_mimg_height], $size[0], $size[1]);
}
@imagejpeg($dst, "$g4[path]/data/item/$it_id"."_m", 90);
}
if($w == "" && !trim($it_id)) {
alert("상품 코드가 없으므로 상품을 추가하실 수 없습니다.");
}
@mkdir(G4_DATA_PATH.'/item', 0707);
@chmod(G4_DATA_PATH.'/item', 0707);
// 파일정보
if($w == "u") {
$sql = " select it_img1, it_img2, it_img3, it_img4, it_img5, it_img6, it_img7, it_img8, it_img9, it_img10
from {$g4['yc4_item_table']}
where it_id = '$it_id' ";
$file = sql_fetch($sql);
$it_img1 = $file['it_img1'];
$it_img2 = $file['it_img2'];
$it_img3 = $file['it_img3'];
$it_img4 = $file['it_img4'];
$it_img5 = $file['it_img5'];
$it_img6 = $file['it_img6'];
$it_img7 = $file['it_img7'];
$it_img8 = $file['it_img8'];
$it_img9 = $file['it_img9'];
$it_img10 = $file['it_img10'];
}
$it_img_dir = G4_DATA_PATH.'/item/'.$it_id;
if ($it_himg_del) @unlink(G4_DATA_PATH."/item/{$it_id}_h");
if ($it_timg_del) @unlink(G4_DATA_PATH."/item/{$it_id}_t");
if ($it_img1_del) @unlink("$it_img_dir/$it_img1");
if ($it_img2_del) @unlink("$it_img_dir/$it_img2");
if ($it_img3_del) @unlink("$it_img_dir/$it_img3");
if ($it_img4_del) @unlink("$it_img_dir/$it_img4");
if ($it_img5_del) @unlink("$it_img_dir/$it_img5");
if ($it_img6_del) @unlink("$it_img_dir/$it_img6");
if ($it_img7_del) @unlink("$it_img_dir/$it_img7");
if ($it_img8_del) @unlink("$it_img_dir/$it_img8");
if ($it_img9_del) @unlink("$it_img_dir/$it_img9");
if ($it_img10_del) @unlink("$it_img_dir/$it_img10");
// 이미지업로드
if ($_FILES['it_img1']['name'])
$it_img1 = it_img_upload($_FILES['it_img1']['tmp_name'], $_FILES['it_img1']['name'], $it_img_dir);
if ($_FILES['it_img2']['name'])
$it_img2 = it_img_upload($_FILES['it_img2']['tmp_name'], $_FILES['it_img2']['name'], $it_img_dir);
if ($_FILES['it_img3']['name'])
$it_img3 = it_img_upload($_FILES['it_img3']['tmp_name'], $_FILES['it_img3']['name'], $it_img_dir);
if ($_FILES['it_img4']['name'])
$it_img4 = it_img_upload($_FILES['it_img4']['tmp_name'], $_FILES['it_img4']['name'], $it_img_dir);
if ($_FILES['it_img5']['name'])
$it_img5 = it_img_upload($_FILES['it_img5']['tmp_name'], $_FILES['it_img5']['name'], $it_img_dir);
if ($_FILES['it_img6']['name'])
$it_img6 = it_img_upload($_FILES['it_img6']['tmp_name'], $_FILES['it_img6']['name'], $it_img_dir);
if ($_FILES['it_img7']['name'])
$it_img7 = it_img_upload($_FILES['it_img7']['tmp_name'], $_FILES['it_img7']['name'], $it_img_dir);
if ($_FILES['it_img8']['name'])
$it_img8 = it_img_upload($_FILES['it_img8']['tmp_name'], $_FILES['it_img8']['name'], $it_img_dir);
if ($_FILES['it_img9']['name'])
$it_img9 = it_img_upload($_FILES['it_img9']['tmp_name'], $_FILES['it_img9']['name'], $it_img_dir);
if ($_FILES['it_img10']['name'])
$it_img10 = it_img_upload($_FILES['it_img10']['tmp_name'], $_FILES['it_img10']['name'], $it_img_dir);
if ($w == "" || $w == "u")
{
// 다음 입력을 위해서 옵션값을 쿠키로 한달동안 저장함
@ -225,7 +233,6 @@ if($default['de_send_cost_case'] == "개별배송") {
}
}
$sql_common = " ca_id = '$ca_id',
ca_id2 = '$ca_id2',
ca_id3 = '$ca_id3',
@ -273,18 +280,24 @@ $sql_common = " ca_id = '$ca_id',
it_sc_condition = '$condition',
it_head_html = '$it_head_html',
it_tail_html = '$it_tail_html',
it_time = '$g4[time_ymdhis]',
it_ip = '$_SERVER[REMOTE_ADDR]',
it_time = '{$g4['time_ymdhis']}',
it_ip = '{$_SERVER['REMOTE_ADDR']}',
it_order = '$it_order',
it_tel_inq = '$it_tel_inq'
it_tel_inq = '$it_tel_inq',
it_img1 = '$it_img1',
it_img2 = '$it_img2',
it_img3 = '$it_img3',
it_img4 = '$it_img4',
it_img5 = '$it_img5',
it_img6 = '$it_img6',
it_img7 = '$it_img7',
it_img8 = '$it_img8',
it_img9 = '$it_img9',
it_img10 = '$it_img10'
";
if ($w == "")
{
if (!trim($it_id)) {
alert("상품 코드가 없으므로 상품을 추가하실 수 없습니다.");
}
$sql = " insert $g4[yc4_item_table]
set it_id = '$it_id',
$sql_common ";
@ -381,17 +394,6 @@ if ($w == "" || $w == "u")
sql_query($sql, false);
}
}
if ($_FILES[it_simg][name]) upload_file($_FILES[it_simg][tmp_name], $it_id . "_s", "$g4[path]/data/item");
if ($_FILES[it_mimg][name]) upload_file($_FILES[it_mimg][tmp_name], $it_id . "_m", "$g4[path]/data/item");
if ($_FILES[it_limg1][name]) upload_file($_FILES[it_limg1][tmp_name], $it_id . "_l1", "$g4[path]/data/item");
if ($_FILES[it_limg2][name]) upload_file($_FILES[it_limg2][tmp_name], $it_id . "_l2", "$g4[path]/data/item");
if ($_FILES[it_limg3][name]) upload_file($_FILES[it_limg3][tmp_name], $it_id . "_l3", "$g4[path]/data/item");
if ($_FILES[it_limg4][name]) upload_file($_FILES[it_limg4][tmp_name], $it_id . "_l4", "$g4[path]/data/item");
if ($_FILES[it_limg5][name]) upload_file($_FILES[it_limg5][tmp_name], $it_id . "_l5", "$g4[path]/data/item");
if ($_FILES[it_himg][name]) upload_file($_FILES[it_himg][tmp_name], $it_id . "_h", "$g4[path]/data/item");
if ($_FILES[it_timg][name]) upload_file($_FILES[it_timg][tmp_name], $it_id . "_t", "$g4[path]/data/item");
}
// 선택, 추가 옵션 테이블을 체크해 상품정보가 없는 것은 삭제

24
lib/shop.lib.php
View File

@ -277,6 +277,30 @@ function htmlspecialchars2($str)
return $str;
}
// 상품이미지 업로드
function it_img_upload($srcfile, $filename, $dir)
{
if($filename == "")
return "";
if(!is_dir($dir)) {
@mkdir($dir, 0707);
@chmod($dir, 0707);
}
$filename = preg_replace("/\s+/", "", $filename);
$filename = preg_replace("/[#\&\+\-%@=\/\\:;,'\"\^`~\|\!\?\*\$#<>\(\)\[\]\{\}]/", "", $filename);
$filename = preg_replace_callback(
"/[가-힣]+/",
create_function('$matches', 'return base64_encode($matches[0]);'),
$filename);
upload_file($srcfile, $filename, $dir);
return $filename;
}
// 파일을 업로드 함
function upload_file($srcfile, $destfile, $dir)
{

2
shop/orderform.php
View File

@ -122,7 +122,7 @@ else
</script>
<form name="forderform" method="post" action="<? echo $action_url; ?>" autocomplete="off">
<input type="hidden" name="w" value="<? echo $w; ?>" />
<input type="hidden" name="act" value="<? echo $act; ?>" />
<input type="hidden" name="od_uq_id" value="<? echo $od_uq_id; ?>" />
<input type="hidden" name="od_amount" value="<? echo $tot_sell_amount; ?>" />
<input type="hidden" name="od_send_cost" value="<? echo $send_cost; ?>" />

6
shop/orderformupdate.php
View File

@ -57,7 +57,7 @@ $sql = " select a.it_id,
and a.ct_direct = '$sw_direct'
and a.it_id = b.it_id ";
if($w == "selectedbuy")
if($act == "selectedbuy")
$sql .= " and a.ct_selected = '1' ";
$result = sql_query($sql);
@ -158,7 +158,7 @@ else if($default['de_send_cost_case'] == "상한") {
and a.ct_direct = '$sw_direct'
and a.ct_parent = '0' ";
if($w == "selectedbuy")
if($act == "selectedbuy")
$sql .= " and a.ct_selected = '1' ";
$sql .= " order by a.ct_id ";
@ -748,7 +748,7 @@ if ($default['de_sms_use2'] && $receive_number)
// 세션값 제거
if($w != "selectedbuy")
if($act != "selectedbuy")
set_session('ss_uniqid', '');
set_session('ss_order_uniqid', '');
set_session('ss_direct', '');