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:
chicpro
2013-05-08 14:26:21 +09:00
parent bb2dcf29d3 6aa700db5b
commit 3749a213d7
6 changed files with 8 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
shop/itemuse.inc.php
View File

@ -130,7 +130,7 @@ if (!$i)
<?php
if ($use_pages) {
$use_pages = get_paging(10, $use_page, $use_total_page, "./item.php?it_id=$it_id&$qstr&use_page=", "#use");
$use_pages = get_paging(10, $use_page, $use_total_page, "./item.php?it_id=$it_id&amp;$qstr&amp;use_page=", "#use");
}
?>

4
shop/itemuselist.php
View File

@ -98,9 +98,7 @@ if ($i == 0)
</table>
<br><br>
<div style="text-align:center;">
<?php echo get_paging($config['cf_write_pages'], $page, $total_page, "{$_SERVER['PHP_SELF']}?$qstr&page="); ?>
</div>
<?php echo get_paging($config['cf_write_pages'], $page, $total_page, "{$_SERVER['PHP_SELF']}?$qstr&amp;page="); ?>
<?php
include_once('./_tail.php');

4
shop/listtype.php
View File

@ -87,8 +87,8 @@ if ($i==0)
<br>
<div align=center>
<?php
$qstr .= "&type=$type&sort=$sort";
echo get_paging($config['cf_write_pages'], $page, $total_page, "{$_SERVER['PHP_SELF']}?$qstr&page=");
$qstr .= '&amp;type='.$type.'&amp;sort='.$sort;
echo get_paging($config['cf_write_pages'], $page, $total_page, "{$_SERVER['PHP_SELF']}?$qstr&amp;page=");
?>
</div><br>

38
shop/newwinpop.php
View File

@ -1,38 +0,0 @@
<?php
include_once('./_common.php');
$sql = " select * from {$g4['shop_new_win_table']} where nw_id = '$nw_id' ";
$nw = sql_fetch($sql);
$g4['title'] = $nw['nw_subject'];
$nw['nw_subject'] = get_text($nw['nw_subject']);
$nw['nw_content'] = conv_content($nw['nw_content'], 1);
include_once(G4_PATH.'/head.sub.php');
?>
<script language="JavaScript">
function div_close_<?php echo $nw['nw_id']; ?>()
{
if (check_notice_<?php echo $nw['nw_id']; ?>.checked == true) {
set_cookie("ck_notice_<?php echo $nw['nw_id']; ?>", "1" , <?php echo $nw['nw_disable_hours']; ?>);
}
window.close();
}
</script>
<div id="div_notice_<?php echo $nw['nw_id']; ?>">
<table width="<?php echo $nw['nw_width']; ?>" height="<?php echo $nw['nw_height']; ?>" cellpadding="0" cellspacing="0">
<tr>
<td valign=top><?php echo conv_content($nw['nw_content'], $nw['nw_content_html']); ?></td>
</tr>
<tr>
<td height=30 align=center><input type=checkbox id='check_notice_<?php echo $nw['nw_id']; ?>' name='check_notice_<?php echo $nw['nw_id']; ?>' value='1' onclick="div_close_<?php echo $nw['nw_id']; ?>();"><font color="<?php echo $nw['nw_font_color']; ?>">&nbsp;<label for='check_notice_<?php echo $nw['nw_id']; ?>'>오늘 하루 이창을 열지 않습니다.</label><!-- <?php echo $nw[nw_disable_hours]; ?> 시간동안 이창을 다시 띄우지 않겠습니다. --></font></td>
</tr>
</table>
</div>
<?php
include_once(G4_PATH.'/tail.sub.php');
?>

4
shop/orderinquirycancel.php
View File

@ -18,7 +18,7 @@ if (!$od['od_id']) {
if ($od['od_temp_bank'] > 0 && $od['od_receipt_bank'] == 0) {
;
} else {
alert("취소할 수 있는 주문이 아닙니다.", G4_SHOP_URL."/orderinquiryview.php?od_id=$od_id&uq_id=$uq_id");
alert("취소할 수 있는 주문이 아닙니다.", G4_SHOP_URL."/orderinquiryview.php?od_id=$od_id&amp;uq_id=$uq_id");
}
// 장바구니 자료 취소
@ -34,5 +34,5 @@ if ($od['od_receipt_point'] > 0) {
insert_point($member['mb_id'], $od['od_receipt_point'], "주문번호 $od_id 본인 취소");
}
goto_url(G4_SHOP_URL."/orderinquiryview.php?od_id=$od_id&uq_id=$uq_id");
goto_url(G4_SHOP_URL."/orderinquiryview.php?od_id=$od_id&amp;uq_id=$uq_id");
?>

4
shop/sns_send.php
View File

@ -9,7 +9,7 @@ $title_url = $title.' : '.$url;
switch($_REQUEST['sns']) {
case 'facebook' :
header("Location:http://www.facebook.com/sharer/sharer.php?s=100&p[url]=".$url."&p[title]=".$title);
header("Location:http://www.facebook.com/sharer/sharer.php?s=100&amp;p[url]=".$url."&amp;p[title]=".$title);
break;
case 'twitter' :
header("Location:http://twitter.com/home?status=".$title_url);
@ -18,7 +18,7 @@ switch($_REQUEST['sns']) {
header("Location:http://me2day.net/posts/new?new_post[body]=".$title_url);
break;
case 'yozm' :
header("Location:http://yozm.daum.net/api/popup/prePost?sourceid=41&prefix=".$title_url);
header("Location:http://yozm.daum.net/api/popup/prePost?sourceid=41&amp;prefix=".$title_url);
break;
case 'google' :
header("Location:https://plus.google.com/share?url=".$url);