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-16 16:05:23 +09:00
parent d6359b8114 fa59ebd18a
commit 62f0395e14
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bbs/scrap_delete.php
View File

@ -1,10 +1,10 @@
<? <?
include_once('./_common.php'); include_once('./_common.php');
if (!$member[mb_id]) if (!$is_member)
alert('회원만 이용하실 수 있습니다.'); alert('회원만 이용하실 수 있습니다.');
$sql = " delete from {$g4[scrap_table]} where mb_id = '{$member[mb_id]}' and ms_id = '{$ms_id}' "; $sql = " delete from {$g4['scrap_table']} where mb_id = '{$member['mb_id']}' and ms_id = '$ms_id' ";
sql_query($sql); sql_query($sql);
goto_url('./scrap.php?page='.$page); goto_url('./scrap.php?page='.$page);

2
bbs/scrap_popin_update.php
View File

@ -91,7 +91,7 @@ sql_query($sql);
echo <<<HEREDOC echo <<<HEREDOC
<script> <script>
if (confirm('이 글을 스크랩 하였습니다.'."\n\n".'지금 스크랩을 확인하시겠습니까?')) if (confirm('이 글을 스크랩 하였습니다.\\n\\n지금 스크랩을 확인하시겠습니까?'))
document.location.href = './scrap.php'; document.location.href = './scrap.php';
else else
window.close(); window.close();

10
lib/common.lib.php
View File

@ -104,9 +104,9 @@ function set_cookie($cookie_name, $value, $expire)
function get_cookie($cookie_name) function get_cookie($cookie_name)
{ {
$cookie = md5($cookie_name); $cookie = md5($cookie_name);
if (array_key_exists($cookie, $_COOKIE)) if (array_key_exists($cookie, $_COOKIE))
return base64_decode($_COOKIE[md5($cookie_name)]); return base64_decode($_COOKIE[md5($cookie_name)]);
else else
return ""; return "";
} }
@ -803,7 +803,7 @@ function get_skin_select($skin_gubun, $id, $name, $selected='', $event='')
function option_selected($value, $selected, $text='') function option_selected($value, $selected, $text='')
{ {
if (!$text) $text = $value; if (!$text) $text = $value;
if ($value == $selected) if ($value == $selected)
return "<option value=\"$value\" selected=\"selected\">$text</option>\n"; return "<option value=\"$value\" selected=\"selected\">$text</option>\n";
else else
return "<option value=\"$value\">$text</option>\n"; return "<option value=\"$value\">$text</option>\n";
@ -1589,7 +1589,7 @@ function convert_charset($from_charset, $to_charset, $str)
// mysql_real_escape_string 의 alias 기능을 한다. // mysql_real_escape_string 의 alias 기능을 한다.
function escape_trim($field) function escape_trim($field)
{ {
return mysql_real_escape_string(htmlentities(trim($field))); return mysql_real_escape_string(trim($field));
} }
@ -1620,7 +1620,7 @@ function abs_ip2long($ip='')
} }
function get_selected($field, $value, $first=false) function get_selected($field, $value, $first=false)
{ {
$selected = ($field==$value) ? ' selected="selected"' : ''; $selected = ($field==$value) ? ' selected="selected"' : '';
if ($first && !$selected) if ($first && !$selected)