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:
gnuboard
2013-01-28 14:11:19 +09:00
parent d8a0edcb57 224f7ba5e8
commit 96abf47f4e
10 changed files with 39 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bbs/login.php
View File

@ -5,7 +5,7 @@ $g4['title'] = '로그인';
include_once('./_head.sub.php');
$p = parse_url($url);
if ((isset($p['scheme']) && $p['scheme']) ||
if ((isset($p['scheme']) && $p['scheme']) ||
(isset($p['host']) && $p['host'])) {
alert('url에 도메인을 지정할 수 없습니다.');
}
@ -43,10 +43,10 @@ if ($g4['https_url']) {
$login_url = $urlencode;
}
if ($g4['https_url'])
$login_action_url = "{$g4['https_url']}/$g4[bbs]/login_check.php";
if (G4_HTTPS_URL)
$login_action_url = G4_HTTPS_URL."/$g4[bbs]/login_check.php";
else
$login_action_url = "{$g4['bbs_url']}/login_check.php";
$login_action_url = G4_BBS_URL."/login_check.php";
// 로그인 스킨이 없는 경우 관리자 페이지 접속이 안되는 것을 막기 위하여 기본 스킨으로 대체
$login_file = $member_skin_path.'/login.skin.php';

14
css/default.css
View File

@ -51,6 +51,8 @@ pre {overflow-x:scroll;font-size:1.1em}
#container {float:left;width:730px;zoom:1}
#container:after {display:block;visibility:hidden;clear:both;content:""}
.cbg {border-right:1px solid #ddd;border-bottom:1px solid #ddd;background:#fff}
/* 하단 레이아웃 */
#ft {background:#484848}
#ft h1 {width:0;height:0;overflow:hidden}
@ -146,7 +148,7 @@ table a {color:#000;text-decoration:none}
/* ///// 스킨별 스타일 ///// */
/* 아웃로그인 스킨 */
.ol {position:relative;margin-bottom:10px;padding:14px;border-right:1px solid #ddd;border-bottom:1px solid #ddd;background:#fff}
.ol {position:relative;margin-bottom:10px;padding:14px}
.ol h2 {width:0;height:0;overflow:hidden}
.ol ul {margin:0;padding:0;list-style:none}
.ol a {color:#000;text-decoration:none}
@ -179,19 +181,19 @@ table a {color:#000;text-decoration:none}
#ol_after_ft a {display:inline-block;margin-left:5px}
/* 설문조사 스킨 */
#poll {border-right:1px solid #ddd;border-bottom:1px solid #ddd;background:#fff}
#poll {}
#poll header {padding:14px 14px 0}
#poll ul {margin:0 0 10px;padding:5px 14px;background:#f7f7f2;list-style:none}
#poll li {padding:3px 0}
#poll footer {padding:0 14px 14px;text-align:right}
/* 최근게시물 스킨 (latest) */
.lt {float:left;margin-bottom:20px;padding:20px;width:314px;height:149px;border-right:1px solid #ddd;border-bottom:1px solid #ddd;background:#fff}
.lt {float:left;margin-bottom:20px;padding:20px;width:314px;height:149px}
.lt ul {margin:0;padding:0;list-style:none}
.lt li {padding:3px 0}
.lt a {color:#000;text-decoration:none}
.lt_title {display:block;margin-bottom:20px;text-align:center}
.lt_more {text-align:center}
.lt_more {text-align:right}
.lt_more a {display:block}
/* 최근게시물 스킨 (new) */
@ -258,9 +260,9 @@ table a {color:#000;text-decoration:none}
/* 게시판 읽기 */
#bo_v_title {}
#bo_v {position:relative;margin-bottom:30px;border-right:1px solid #ddd;border-bottom:1px solid #ddd;background:#fff}
#bo_v {position:relative;margin-bottom:30px}
#bo_v a {color:#000;text-decoration:none}
#bo_v_h1 {padding:20px 20px 10px;font-size:1.2em}
#bo_v_h1 {padding:30px 20px 10px;font-size:1.2em;line-height:1.4em}
#bo_v_info {padding:0 20px 15px}
#bo_v_info h2 {margin:0;padding:0;height:0;overflow:hidden}
#bo_v_info strong {display:inline-block;margin:0 10px 0 5px;font-weight:normal}

4
shop/list.sort.php
View File

@ -1,5 +1,5 @@
<?
if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
?>
<br>
@ -21,7 +21,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
</select>
</td>
</tr>
<tr><td colspan="2" background='<? echo "$g4[shop_img_path]/line_h.gif" ?>' height=1></td></tr>
<tr><td colspan="2" background='<? echo G4_SHOP_IMG_URL."/line_h.gif" ?>' height=1></td></tr>
</table>
<script language='JavaScript'>

24
shop/listcategory2.inc.php
View File

@ -22,8 +22,8 @@ if (!$exists) {
and length(ca_id) = $len4 ";
$row = sql_fetch($sql);
$cnt = $row['cnt'];
if (!$cnt)
$str .= "<tr><td width=11 background='$g4[shop_img_path]/ca_bg02.gif'></td><td>";
if (!$cnt)
$str .= "<tr><td width=11 background='".G4_SHOP_IMG_URL."/ca_bg02.gif'></td><td>";
$sql = " select ca_id, ca_name from $g4[yc4_category_table]
where ca_id like '$tmp_ca_id%'
@ -36,7 +36,7 @@ if (!$exists) {
$style = " class='accent' ";
if ($cnt) {
$str .= "<tr><td width=11 background='$g4[shop_img_path]/ca_bg02.gif'></td>";
$str .= "<tr><td width=11 background='".G4_SHOP_IMG_URL."/ca_bg02.gif'></td>";
$str .= "<td><table width=100% border=0><tr><td width=120><b>· <a href='./list.php?ca_id=$row[ca_id]'><span $style>$row[ca_name]</span></a></b></td>";
$sql2 = " select ca_id, ca_name from $g4[yc4_category_table]
where ca_id like '$row[ca_id]%'
@ -51,15 +51,15 @@ if (!$exists) {
$k++;
}
//if (!$k) $str .= "<td></td><td>";
$str .= "</td></tr></table></td><td width=11 background='$g4[shop_img_path]/ca_bg03.gif'></td>";
$str .= "</td></tr></table></td><td width=11 background='".G4_SHOP_IMG_URL."/ca_bg03.gif'></td>";
} else {
$str .= "<a href='./list.php?ca_id=$row[ca_id]'><span $style>$row[ca_name]</span></a> &nbsp; ";
}
$exists = true;
}
if (!$cnt)
$str .= "</td><td width=11 background='$g4[shop_img_path]/ca_bg03.gif'></td></tr>";
if (!$cnt)
$str .= "</td><td width=11 background='".G4_SHOP_IMG_URL."/ca_bg03.gif'></td></tr>";
}
@ -71,15 +71,15 @@ if ($exists) {
<colgroup width=''>
<colgroup width=11>
<tr>
<td width=11><img src='$g4[shop_img_path]/ca_box01.gif'></td>
<td background='$g4[shop_img_path]/ca_bg01.gif'></td>
<td width=11><img src='$g4[shop_img_path]/ca_box02.gif'></td>
<td width=11><img src='".G4_SHOP_IMG_URL."/ca_box01.gif'></td>
<td background='".G4_SHOP_IMG_URL."/ca_bg01.gif'></td>
<td width=11><img src='".G4_SHOP_IMG_URL."/ca_box02.gif'></td>
</tr>
$str
<tr>
<td width=11><img src='$g4[shop_img_path]/ca_box03.gif'></td>
<td background='$g4[shop_img_path]/ca_bg04.gif'></td>
<td width=11><img src='$g4[shop_img_path]/ca_box04.gif'></td>
<td width=11><img src='".G4_SHOP_IMG_URL."/ca_box03.gif'></td>
<td background='".G4_SHOP_IMG_URL."/ca_bg04.gif'></td>
<td width=11><img src='".G4_SHOP_IMG_URL."/ca_box04.gif'></td>
</tr>
</table><br>";
}

16
shop/listcategory3.inc.php
View File

@ -10,7 +10,7 @@ $sql = " select ca_id, ca_name from $g4[yc4_category_table]
and ca_use = '1'
order by ca_id ";
$result = sql_query($sql);
$str .= "<tr><td width=11 background='$g4[shop_img_path]/ca_bg02.gif'></td>";
$str .= "<tr><td width=11 background='".G4_SHOP_IMG_URL."/ca_bg02.gif'></td>";
$str .= "<td><table width=100% border=0><tr><td>";
while ($row=sql_fetch_array($result)) {
if (preg_match("/^$row[ca_id]/", $ca_id))
@ -20,7 +20,7 @@ while ($row=sql_fetch_array($result)) {
$str .= "<a href='./list.php?ca_id=$row[ca_id]'>{$span}$row[ca_name]</span></a> &nbsp; ";
$exists = true;
}
$str .= "</td></tr></table></td><td width=11 background='$g4[shop_img_path]/ca_bg03.gif'></td>";
$str .= "</td></tr></table></td><td width=11 background='".G4_SHOP_IMG_URL."/ca_bg03.gif'></td>";
if ($exists) {
echo "
@ -30,15 +30,15 @@ if ($exists) {
<colgroup width=''>
<colgroup width=11>
<tr>
<td width=11><img src='$g4[shop_img_path]/ca_box01.gif'></td>
<td background='$g4[shop_img_path]/ca_bg01.gif'></td>
<td width=11><img src='$g4[shop_img_path]/ca_box02.gif'></td>
<td width=11><img src='".G4_SHOP_IMG_URL."/ca_box01.gif'></td>
<td background='".G4_SHOP_IMG_URL."/ca_bg01.gif'></td>
<td width=11><img src='".G4_SHOP_IMG_URL."/ca_box02.gif'></td>
</tr>
$str
<tr>
<td width=11><img src='$g4[shop_img_path]/ca_box03.gif'></td>
<td background='$g4[shop_img_path]/ca_bg04.gif'></td>
<td width=11><img src='$g4[shop_img_path]/ca_box04.gif'></td>
<td width=11><img src='".G4_SHOP_IMG_URL."/ca_box03.gif'></td>
<td background='".G4_SHOP_IMG_URL."/ca_bg04.gif'></td>
<td width=11><img src='".G4_SHOP_IMG_URL."/ca_box04.gif'></td>
</tr>
</table><br>";
}

2
skin/board/neo/view.skin.php
View File

@ -4,7 +4,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<p id="bo_v_title"><strong><?=$board['bo_subject']?></strong></p>
<div id="bo_v">
<div id="bo_v" class="cbg">
<h1 id="bo_v_h1"><? if ($is_category) { ?> <?=($category_name ? "{$view['ca_name']} " : "");?><? } ?><?=cut_hangul_last(get_text($view['wr_subject']))?></h1>
<section id="bo_v_info">

2
skin/latest/neo/latest.skin.php
View File

@ -2,7 +2,7 @@
if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
?>
<div class="lt">
<div class="lt cbg">
<strong class="lt_title"><a href="<?=G4_BBS_URL?>/board.php?bo_table=<?=$bo_table?>"><?=$bo_subject?></a></strong>
<ul>
<? for ($i=0; $i<count($list); $i++) { ?>

2
skin/outlogin/neo/outlogin.skin.1.php
View File

@ -2,7 +2,7 @@
if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
?>
<section id="ol_before" class="ol">
<section id="ol_before" class="ol cbg">
<h2>멤버쉽</h2>
<!-- 로그인 전 외부로그인 시작 -->
<form name="foutlogin" method="post" action="<?=$outlogin_action_url?>" onsubmit="return fhead_submit(this);" autocomplete="off">

2
skin/outlogin/neo/outlogin.skin.2.php
View File

@ -3,7 +3,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
?>
<!-- 로그인 후 외부로그인 시작 -->
<section id="ol_after" class="ol">
<section id="ol_after" class="ol cbg">
<header id="ol_after_hd">
<h2>나의 이용정보</h2>
<strong><?=$nick?></strong>님

2
skin/poll/neo/poll.skin.php
View File

@ -16,7 +16,7 @@ $po = sql_fetch(" select * from {$g4['poll_table']} where po_id = '$po_id' ");
<form name="fpoll" method="post" action="<?=G4_BBS_URL?>/poll_update.php" onsubmit="return fpoll_submit(this);" target="win_poll">
<input type="hidden" name="po_id" value="<?=$po_id?>">
<input type="hidden" name="skin_dir" value="<?=$skin_dir?>">
<section id="poll">
<section id="poll" class="cbg">
<header>
<h2>설문조사</h2>
<? if ($is_admin == "super") { ?><a href="<?=G4_ADM_URL?>/poll_form.php?w=u&amp;po_id=<?=$po_id?>">설문조사 관리</a><? } ?>