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-28 14:17:26 +09:00
parent ddbb560548 96abf47f4e
commit a8a6b17787
6 changed files with 28 additions and 28 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'); include_once('./_head.sub.php');
$p = parse_url($url); $p = parse_url($url);
if ((isset($p['scheme']) && $p['scheme']) || if ((isset($p['scheme']) && $p['scheme']) ||
(isset($p['host']) && $p['host'])) { (isset($p['host']) && $p['host'])) {
alert('url에 도메인을 지정할 수 없습니다.'); alert('url에 도메인을 지정할 수 없습니다.');
} }
@ -43,10 +43,10 @@ if ($g4['https_url']) {
$login_url = $urlencode; $login_url = $urlencode;
} }
if ($g4['https_url']) if (G4_HTTPS_URL)
$login_action_url = "{$g4['https_url']}/$g4[bbs]/login_check.php"; $login_action_url = G4_HTTPS_URL."/$g4[bbs]/login_check.php";
else 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'; $login_file = $member_skin_path.'/login.skin.php';

2
bbs/search.php
View File

@ -187,7 +187,7 @@ if ($stx) {
if ($read_level[$idx] <= $member['mb_level']) if ($read_level[$idx] <= $member['mb_level'])
{ {
$content = cut_str(get_text($row['wr_content']),300,"…"); $content = cut_str(get_text(strip_tags($row['wr_content'])),300,"…");
if (strstr($sfl, 'wr_content')) if (strstr($sfl, 'wr_content'))
$content = search_font($stx, $content); $content = search_font($stx, $content);
} }

2
head.php
View File

@ -34,7 +34,7 @@ include_once(G4_LIB_PATH.'/popular.lib.php');
<fieldset id="schall"> <fieldset id="schall">
<legend>사이트 내 전체검색</legend> <legend>사이트 내 전체검색</legend>
<form name="fsearchbox" method="get" action="<?=G4_BBS_URL?>./search.php" onsubmit="return fsearchbox_submit(this);"> <form name="fsearchbox" method="get" action="<?=G4_BBS_URL?>/search.php" onsubmit="return fsearchbox_submit(this);">
<input type="hidden" name="sfl" value="wr_subject||wr_content"> <input type="hidden" name="sfl" value="wr_subject||wr_content">
<input type="hidden" name="sop" value="and"> <input type="hidden" name="sop" value="and">
<input type="text" id="schall_stx" name="stx" title="검색어" maxlength="20"> <input type="text" id="schall_stx" name="stx" title="검색어" maxlength="20">

4
shop/list.sort.php
View File

@ -1,5 +1,5 @@
<? <?
if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
?> ?>
<br> <br>
@ -21,7 +21,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
</select> </select>
</td> </td>
</tr> </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> </table>
<script language='JavaScript'> <script language='JavaScript'>

24
shop/listcategory2.inc.php
View File

@ -22,8 +22,8 @@ if (!$exists) {
and length(ca_id) = $len4 "; and length(ca_id) = $len4 ";
$row = sql_fetch($sql); $row = sql_fetch($sql);
$cnt = $row['cnt']; $cnt = $row['cnt'];
if (!$cnt) if (!$cnt)
$str .= "<tr><td width=11 background='$g4[shop_img_path]/ca_bg02.gif'></td><td>"; $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] $sql = " select ca_id, ca_name from $g4[yc4_category_table]
where ca_id like '$tmp_ca_id%' where ca_id like '$tmp_ca_id%'
@ -36,7 +36,7 @@ if (!$exists) {
$style = " class='accent' "; $style = " class='accent' ";
if ($cnt) { 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>"; $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] $sql2 = " select ca_id, ca_name from $g4[yc4_category_table]
where ca_id like '$row[ca_id]%' where ca_id like '$row[ca_id]%'
@ -51,15 +51,15 @@ if (!$exists) {
$k++; $k++;
} }
//if (!$k) $str .= "<td></td><td>"; //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 { } else {
$str .= "<a href='./list.php?ca_id=$row[ca_id]'><span $style>$row[ca_name]</span></a> &nbsp; "; $str .= "<a href='./list.php?ca_id=$row[ca_id]'><span $style>$row[ca_name]</span></a> &nbsp; ";
} }
$exists = true; $exists = true;
} }
if (!$cnt) if (!$cnt)
$str .= "</td><td width=11 background='$g4[shop_img_path]/ca_bg03.gif'></td></tr>"; $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=''>
<colgroup width=11> <colgroup width=11>
<tr> <tr>
<td width=11><img src='$g4[shop_img_path]/ca_box01.gif'></td> <td width=11><img src='".G4_SHOP_IMG_URL."/ca_box01.gif'></td>
<td background='$g4[shop_img_path]/ca_bg01.gif'></td> <td background='".G4_SHOP_IMG_URL."/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_box02.gif'></td>
</tr> </tr>
$str $str
<tr> <tr>
<td width=11><img src='$g4[shop_img_path]/ca_box03.gif'></td> <td width=11><img src='".G4_SHOP_IMG_URL."/ca_box03.gif'></td>
<td background='$g4[shop_img_path]/ca_bg04.gif'></td> <td background='".G4_SHOP_IMG_URL."/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_box04.gif'></td>
</tr> </tr>
</table><br>"; </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' and ca_use = '1'
order by ca_id "; order by ca_id ";
$result = sql_query($sql); $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>"; $str .= "<td><table width=100% border=0><tr><td>";
while ($row=sql_fetch_array($result)) { while ($row=sql_fetch_array($result)) {
if (preg_match("/^$row[ca_id]/", $ca_id)) 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; "; $str .= "<a href='./list.php?ca_id=$row[ca_id]'>{$span}$row[ca_name]</span></a> &nbsp; ";
$exists = true; $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) { if ($exists) {
echo " echo "
@ -30,15 +30,15 @@ if ($exists) {
<colgroup width=''> <colgroup width=''>
<colgroup width=11> <colgroup width=11>
<tr> <tr>
<td width=11><img src='$g4[shop_img_path]/ca_box01.gif'></td> <td width=11><img src='".G4_SHOP_IMG_URL."/ca_box01.gif'></td>
<td background='$g4[shop_img_path]/ca_bg01.gif'></td> <td background='".G4_SHOP_IMG_URL."/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_box02.gif'></td>
</tr> </tr>
$str $str
<tr> <tr>
<td width=11><img src='$g4[shop_img_path]/ca_box03.gif'></td> <td width=11><img src='".G4_SHOP_IMG_URL."/ca_box03.gif'></td>
<td background='$g4[shop_img_path]/ca_bg04.gif'></td> <td background='".G4_SHOP_IMG_URL."/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_box04.gif'></td>
</tr> </tr>
</table><br>"; </table><br>";
} }