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

This commit is contained in:
whitedot
2013-01-31 15:53:31 +09:00
4 changed files with 39 additions and 49 deletions

View File

@ -112,20 +112,10 @@ for ($i=0; $row=mysql_fetch_array($result); $i++)
$list = $i%2;
// 리스트 썸네일 이미지
$filepath = G4_DATA_PATH.'/item/'.$row['it_id'];
for($k=1; $k<=10; $k++) {
$idx = 'it_img'.$k;
if(file_exists($filepath.'/'.$row[$idx]) && is_file($filepath.'/'.$row[$idx])) {
$filename = $row[$idx];
break;
}
}
echo "
<tr class='list$list center'>
<td>$num</td>
<td style='padding-top:5px; padding-bottom:5px;'><a href='$href'>".get_it_image($row['it_id'], $filename, 50, 50)."</a></td>
<td style='padding-top:5px; padding-bottom:5px;'><a href='$href'>".get_it_image($row['it_id'], 50, 50)."</a></td>
<td align=left><a href='$href'>".cut_str($row[it_name],30)."</a></td>
<td>$row[ct_status_1]</td>
<td>$row[ct_status_2]</td>

View File

@ -41,7 +41,7 @@ if(!$ct_count) {
}
$g4['title'] = '선택사항/수량 변경';
include_once ($g4['path'].'/head.sub.php');
include_once (G4_PATH.'/head.sub.php');
?>
<style type="text/css">
@ -193,10 +193,10 @@ $(function() {
if((idx + 1) < option_count) {
if(val == '') {
var $gt_select = $("select[name^=item-option-]:gt(" + idx + ")");
$gt_select.val("");
$gt_select.attr("disabled", true);
$("select[name^=item-option-]:gt(" + idx + ")").val("").attr("disabled", true);
} else {
$("select[name^=item-option-]:gt(" + idx + ")").val("").attr("disabled", true);
var $next_select = $option_select.eq(idx + 1);
// 옵션정보갱신
@ -510,5 +510,5 @@ function calculatePrice()
</script>
<?php
include_once($g4['path'] . '/tail.sub.php');
include_once(G4_PATH.'/tail.sub.php');
?>

View File

@ -1,4 +1,4 @@
<?
<?
include_once("./_common.php");
if (!$is_member)
@ -8,22 +8,22 @@ if (!$is_member)
$token = md5(uniqid(rand(), true));
set_session("ss_token", $token);
$sql = " select it_name from $g4[yc4_item_table] where it_id='$it_id' ";
$sql = " select it_name from {$g4['yc4_item_table']} where it_id='$it_id' ";
$it = sql_fetch($sql);
if (!$it[it_name])
if (!$it['it_name'])
alert_close("등록된 상품이 아닙니다.");
$g4[title] = "$it[it_name] - 추천하기";
include_once("$g4[path]/head.sub.php");
$g4['title'] = "$it[it_name] - 추천하기";
include_once(G4_PATH.'/head.sub.php');
?>
<table width="600" height="50" border="0" cellpadding="0" cellspacing="0">
<tr>
<td align="center" valign="middle" bgcolor="#EBEBEB">
<table width="590" height="40" border="0" cellspacing="0" cellpadding="0">
<tr>
<td width="25" align="center" bgcolor="#FFFFFF" ><img src="<?=$g4[shop_img_path]?>/icon_01.gif" width="5" height="5"></td>
<td width="490" align="left" bgcolor="#FFFFFF" ><font color="#666666"><b><?=get_text($g4[title])?></b></font></td>
<tr>
<td width="25" align="center" bgcolor="#FFFFFF" ><img src="<?=G4_SHOP_IMG_URL?>/icon_01.gif" width="5" height="5"></td>
<td width="490" align="left" bgcolor="#FFFFFF" ><font color="#666666"><b><?=get_text($g4['title'])?></b></font></td>
<td width="75" bgcolor="#FFFFFF" ></td>
</tr>
</table></td>
@ -32,24 +32,24 @@ include_once("$g4[path]/head.sub.php");
<form name="fitemrecommend" method="post" action="./itemrecommendmail.php" onsubmit="return fitemrecommend_check(this);" style='margin:0px;' autocomplete='off'>
<input type=hidden name=token value='<?=$token?>'>
<input type=hidden name=it_id value='<?=$it_id?>'>
<input type="hidden" name="token" value='<?=$token?>'>
<input type="hidden" name="it_id" value='<?=$it_id?>'>
<table width="600" border="0" cellspacing="0" cellpadding="0">
<tr>
<tr>
<td height="300" align="center" valign="top">
<table width="540" border="0" cellspacing="0" cellpadding="0">
<tr>
<tr>
<td height="20"></td>
</tr>
<tr>
<tr>
<td height="2" bgcolor="#808080"></td>
</tr>
<tr>
<tr>
<td width="540" height="2" align="center" valign="top" bgcolor="#FFFFFF">
<table width=100% cellpadding=0 cellspacing=0 border=0 height=40 bgcolor='#F6F6F6'>
<colgroup width=130>
<colgroup width=''>
<tr>
<table width="100%" cellpadding="0" cellspacing="0" border="0" height="40" bgcolor="#F6F6F6">
<colgroup width="130">
<colgroup width="">
<tr>
<td height="24" rowspan="2">&nbsp; 추천하실 분 E-mail</td>
<td><input type=text id='to_email' name='to_email' required itemname='추천하실 분 E-mail' class=ed style="width:97%;"></td>
</tr>
@ -76,7 +76,7 @@ include_once("$g4[path]/head.sub.php");
</tr>
</table></td>
</tr>
<tr>
<tr>
<td height="2" align="center" valign="top" bgcolor="#D5D5D5"></td>
</tr>
<tr>
@ -84,15 +84,15 @@ include_once("$g4[path]/head.sub.php");
</tr>
<tr>
<td height="40" align="center" valign="bottom">
<input id=btn_submit type=image src="<?=$g4[shop_img_path]?>/btn_confirm.gif" border=0>&nbsp;
<a href="javascript:window.close();"><img src="<?=$g4[shop_img_path]?>/btn_close.gif" border="0"></a>
<input id=btn_submit type=image src="<?=G4_SHOP_IMG_URL?>/btn_confirm.gif" border=0>&nbsp;
<a href="javascript:window.close();"><img src="<?=G4_SHOP_IMG_URL?>/btn_close.gif" border="0"></a>
</td>
</tr>
</table>
</form>
<script language="javascript">
function fitemrecommend_check(f)
function fitemrecommend_check(f)
{
return true;
}
@ -101,5 +101,5 @@ document.getElementById('to_email').focus();
</script>
<?
include_once("$g4[path]/tail.sub.php");
include_once(G4_PATH.'/tail.sub.php');
?>

View File

@ -1,6 +1,6 @@
<?
include_once("./_common.php");
include_once("$g4[path]/lib/mailer.lib.php");
include_once(G4_LIB_PATH.'/mailer.lib.php');
if (!$is_member)
alert_close('회원만 메일을 발송할 수 있습니다.');
@ -9,9 +9,9 @@ if (!$is_member)
//if (substr_count($to_email, "@") > 3) alert("최대 3명까지만 메일을 발송할 수 있습니다.");
if (substr_count($to_email, "@") > 1) alert('메일 주소는 하나씩만 입력해 주십시오.');
if ($_SESSION["ss_recommend_datetime"] >= ($g4[server_time] - 120))
if ($_SESSION["ss_recommend_datetime"] >= ($g4['server_time'] - 120))
alert("너무 빠른 시간내에 메일을 연속해서 보낼 수 없습니다.");
set_session("ss_recommend_datetime", $g4[server_time]);
set_session("ss_recommend_datetime", $g4['server_time']);
$recommendmail_count = (int)get_session('ss_recommendmail_count') + 1;
if ($recommendmail_count > 3)
@ -28,19 +28,19 @@ if ($_POST["token"] && get_session("ss_token") == $_POST["token"]) {
}
// 상품
$sql = " select * from $g4[yc4_item_table] where it_id = '$it_id' ";
$sql = " select * from {$g4['yc4_item_table']} where it_id = '$it_id' ";
$it = sql_fetch($sql);
if (!$it[it_id])
if (!$it['it_id'])
alert("등록된 상품이 아닙니다.");
$subject = stripslashes($subject);
$content = nl2br(stripslashes($content));
$from_name = $member[mb_name];
$from_email = $member[mb_email];
$it_id = $it[it_id];
$it_name = $it[it_name];
$it_mimg = $it[it_id]."_m";
$from_name = $member['mb_name'];
$from_email = $member['mb_email'];
$it_id = $it['it_id'];
$it_name = $it['it_name'];
$it_mimg = $it['it_id']."_m";
ob_start();
include "./mail/itemrecommend.mail.php";