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

This commit is contained in:
whitedot
2013-01-29 18:07:27 +09:00
3 changed files with 19 additions and 19 deletions

View File

@ -213,7 +213,7 @@ function order_select($fld, $sel='')
if (!$member['mb_id'])
{
//alert('로그인 하십시오.', '$g4['bbs_path']/login.php?url=' . urlencode('$_SERVER['PHP_SELF']?w=$w&mb_id=$mb_id'));
alert('로그인 하십시오.', $g4['bbs_path'].'/login.php?url=' . urlencode($_SERVER['PHP_SELF'].'?'.$_SERVER['QUERY_STRING']));
alert('로그인 하십시오.', G4_BBS_URL.'/login.php?url=' . urlencode($_SERVER['PHP_SELF'].'?'.$_SERVER['QUERY_STRING']));
}
else if ($is_admin != 'super')
{

View File

@ -371,7 +371,7 @@ function display_type($type, $skin_file, $list_mod, $list_row, $img_width, $img_
return false;
}
$file = "$g4[shop_path]/$skin_file";
$file = G4_SHOP_PATH."/$skin_file";
if (!file_exists($file)) {
echo "<span class=point>{$file} 파일을 찾을 수 없습니다.</span>";
} else {

View File

@ -1,28 +1,28 @@
<?
include_once("./_common.php");
include_once("$g4[path]/lib/latest.lib.php");
include_once(G4_LIB_PATH.'/latest.lib.php');
define("_INDEX_", TRUE);
$g4[title] = "";
include_once("$g4[path]/head.php");
$g4['title'] = "";
include_once(G4_PATH.'/shop.head.php');
?>
<script language="JavaScript" src="<?=$g4[path]?>/js/shop.js"></script>
<script src="<?=G4_JS_URL?>/shop.js"></script>
<table width=100% cellpadding=0 cellspacing=0>
<tr>
<td valign=top>
<img src='<?=$g4[path]?>/data/common/main_img' border=0><br><br>
<img src='<?=G4_DATA_URL?>/common/main_img' border=0><br><br>
<table width=100% cellpadding=0 cellspacing=0>
<tr>
<td colspan=2>
<?
// 히트상품
$type = 1;
if ($default["de_type{$type}_list_use"])
if ($default["de_type{$type}_list_use"])
{
echo "<a href='$g4[shop_path]/listtype.php?type={$type}'><img src='$g4[shop_img_path]/bar_type{$type}.gif' border=0></a><br>";
echo "<a href='".G4_SHOP_URL."/listtype.php?type={$type}'><img src='".G4_SHOP_IMG_URL."/bar_type{$type}.gif' border=0></a><br>";
display_type($type, $default["de_type{$type}_list_skin"], $default["de_type{$type}_list_mod"], $default["de_type{$type}_list_row"], $default["de_type{$type}_img_width"], $default["de_type{$type}_img_height"]);
}
?>
@ -34,9 +34,9 @@ include_once("$g4[path]/head.php");
<?
// 추천상품
$type = 2;
if ($default["de_type{$type}_list_use"])
if ($default["de_type{$type}_list_use"])
{
echo "<a href='$g4[shop_path]/listtype.php?type={$type}'><img src='$g4[shop_img_path]/bar_type{$type}.gif' border=0></a><br>";
echo "<a href='".G4_SHOP_URL."/listtype.php?type={$type}'><img src='".G4_SHOP_IMG_URL."/bar_type{$type}.gif' border=0></a><br>";
display_type($type, $default["de_type{$type}_list_skin"], $default["de_type{$type}_list_mod"], $default["de_type{$type}_list_row"], $default["de_type{$type}_img_width"], $default["de_type{$type}_img_height"]);
}
?>
@ -48,9 +48,9 @@ include_once("$g4[path]/head.php");
<?
// 인기상품
$type = 4;
if ($default["de_type{$type}_list_use"])
if ($default["de_type{$type}_list_use"])
{
echo "<a href='$g4[shop_path]/listtype.php?type={$type}'><img src='$g4[shop_img_path]/bar_type{$type}.gif' border=0></a><br>";
echo "<a href='".G4_SHOP_URL."/listtype.php?type={$type}'><img src='".G4_SHOP_IMG_URL."/bar_type{$type}.gif' border=0></a><br>";
display_type($type, $default["de_type{$type}_list_skin"], $default["de_type{$type}_list_mod"], $default["de_type{$type}_list_row"], $default["de_type{$type}_img_width"], $default["de_type{$type}_img_height"]);
}
?>
@ -62,9 +62,9 @@ include_once("$g4[path]/head.php");
<?
// 할인상품
$type = 5;
if ($default["de_type{$type}_list_use"])
if ($default["de_type{$type}_list_use"])
{
echo "<a href='$g4[shop_path]/listtype.php?type={$type}'><img src='$g4[shop_img_path]/bar_type{$type}.gif' border=0></a><br>";
echo "<a href='".G4_SHOP_URL."/listtype.php?type={$type}'><img src='".G4_SHOP_IMG_URL."/bar_type{$type}.gif' border=0></a><br>";
display_type($type, $default["de_type{$type}_list_skin"], $default["de_type{$type}_list_mod"], $default["de_type{$type}_list_row"], $default["de_type{$type}_img_width"], $default["de_type{$type}_img_height"]);
}
?>
@ -77,9 +77,9 @@ include_once("$g4[path]/head.php");
<?
// 최신상품
$type = 3;
if ($default["de_type{$type}_list_use"])
if ($default["de_type{$type}_list_use"])
{
echo "<a href='$g4[shop_path]/listtype.php?type={$type}'><img src='$g4[shop_img_path]/bar_type{$type}.gif' border=0></a><br>";
echo "<a href='".G4_SHOP_URL."/listtype.php?type={$type}'><img src='".G4_SHOP_IMG_URL."/bar_type{$type}.gif' border=0></a><br>";
display_type($type, $default["de_type{$type}_list_skin"], $default["de_type{$type}_list_mod"], $default["de_type{$type}_list_row"], $default["de_type{$type}_img_width"], $default["de_type{$type}_img_height"]);
}
?><br><br>
@ -98,7 +98,7 @@ include_once("$g4[path]/head.php");
<BR><BR>
<?
include "$g4[shop_path]/newwin.inc.php"; // 새창띄우기
include G4_SHOP_PATH.'/newwin.inc.php'; // 새창띄우기
include_once("$g4[path]/tail.php");
include_once(G4_PATH.'/shop.tail.php');
?>