firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

#370 bbs 폴더내 PHP_EOL 수정

Browse Source
This commit is contained in:
chicpro
2013-03-11 15:12:21 +09:00
parent e245dc8138
commit 8734364258
7 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
bbs/ckeditor/ckeditor.lib.php
View File

@ -1,16 +1,16 @@
<?php
if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
function editor_html($id, $content, $ckeditor=true, $class="")
function editor_html($id, $content, $ckeditor=true, $class="")
{
global $g4;
static $js = true;
$html = "";
if ($js) {
$html .= PHP_EOL.'<script src="'.G4_CKEDITOR_URL.'/ckeditor.js"></script>';
$html .= PHP_EOL.'<script>var g4_ckeditor_url = "'.G4_CKEDITOR_URL.'";</script>';
$html .= PHP_EOL.'<script src="'.G4_CKEDITOR_URL.'/config.js"></script>';
$html .= "\n".'<script src="'.G4_CKEDITOR_URL.'/ckeditor.js"></script>';
$html .= "\n".'<script>var g4_ckeditor_url = "'.G4_CKEDITOR_URL.'";</script>';
$html .= "\n".'<script src="'.G4_CKEDITOR_URL.'/config.js"></script>';
$js = false;
}
@ -21,7 +21,7 @@ function editor_html($id, $content, $ckeditor=true, $class="")
// textarea 로 값을 넘긴다. javascript 반드시 필요
function get_editor_js($id, $ckeditor=true)
function get_editor_js($id, $ckeditor=true)
{
if ( $ckeditor ) {
return "var {$id}_editor_data = CKEDITOR.instances.{$id}.getData();\n";

14
bbs/gcaptcha/gcaptcha.lib.php
View File

@ -1,7 +1,7 @@
<?php
include_once("./_common.php");
class gcaptcha
class gcaptcha
{
// 이미지크기 폭
var $width = 70;
@ -77,13 +77,13 @@ class gcaptcha
return mt_rand($from, $to);
}
function run()
function run()
{
global $g4;
// The text to draw
$captcha_key = $this->get_captcha_key();
set_session('ss_captcha_cnt', 0);
set_session('ss_captcha_key', $captcha_key);
@ -125,7 +125,7 @@ class gcaptcha
imagejpeg($im, G4_DATA_PATH.'/cache/'.$this->captcha_filename.'.jpg');
imagedestroy($im);
$this->make_wav($this->captcha_filename.'.wav');
$this->make_wav($this->captcha_filename.'.wav');
}
function get_captcha_filename()
@ -152,7 +152,7 @@ class gcaptcha
}
/*
사용법 :
사용법 :
$gcaptcha = new gcaptcha();
$gcaptcha->set_captcha_length(mt_rand(4, 6));
$gcaptcha->set_position(mt_rand(0, 10), mt_rand(15, 20));
@ -175,8 +175,8 @@ function captcha_html($class='captcha')
$jpg_file_url = G4_DATA_URL.'/cache/'.$obj->captcha_filename.'.jpg';
$wav_file_url = G4_DATA_URL.'/cache/'.$obj->captcha_filename.'.wav';
$html .= PHP_EOL.'<script>var g4_gcaptcha_url = "'.G4_GCAPTCHA_URL.'";</script>';
$html .= PHP_EOL.'<script src="'.G4_GCAPTCHA_URL.'/gcaptcha.js"></script>';
$html .= "\n".'<script>var g4_gcaptcha_url = "'.G4_GCAPTCHA_URL.'";</script>';
$html .= "\n".'<script src="'.G4_GCAPTCHA_URL.'/gcaptcha.js"></script>';
$html .= '<fieldset id="captcha" class="'.$class.'">';
$html .= '<legend class="sound_only">자동등록방지</legend>';
$html .= '<img src="'.$jpg_file_url.'?_='.rand().'" alt="자동등록방지 숫자">';

14
bbs/memo_form.php
View File

@ -5,16 +5,16 @@ include_once(G4_GCAPTCHA_PATH.'/gcaptcha.lib.php');
if ($is_guest)
alert_close('회원만 이용하실 수 있습니다.');
if (!$member['mb_open'] && $is_admin != 'super' && $member['mb_id'] != $mb_id)
if (!$member['mb_open'] && $is_admin != 'super' && $member['mb_id'] != $mb_id)
alert_close("자신의 정보를 공개하지 않으면 다른분에게 쪽지를 보낼 수 없습니다. 정보공개 설정은 회원정보수정에서 하실 수 있습니다.");
$content = "";
// 탈퇴한 회원에게 쪽지 보낼 수 없음
if ($me_recv_mb_id)
if ($me_recv_mb_id)
{
$mb = get_member($me_recv_mb_id);
if (!$mb['mb_id'])
alert_close('회원정보가 존재하지 않습니다.'.PHP_EOL.PHP_EOL.'탈퇴하였을 수 있습니다.');
alert_close('회원정보가 존재하지 않습니다.\\n\\n탈퇴하였을 수 있습니다.');
if (!$mb['mb_open'] && $is_admin != 'super')
alert_close('정보공개를 하지 않았습니다.');
@ -23,10 +23,10 @@ if ($me_recv_mb_id)
$row = sql_fetch(" select me_memo from {$g4['memo_table']} where me_id = '{$me_id}' and (me_recv_mb_id = '{$member['mb_id']}' or me_send_mb_id = '{$member['mb_id']}') ");
if ($row['me_memo'])
{
$content = PHP_EOL.PHP_EOL.PHP_EOL.' >'
.PHP_EOL.' >'
.PHP_EOL.' >'.preg_replace("/\n/", "\n> ", get_text($row[me_memo], 0))
.PHP_EOL.' >'
$content = "\n\n\n".' >'
."\n".' >'
."\n".' >'.preg_replace("/\n/", "\n> ", get_text($row['me_memo'], 0))
."\n".' >'
.' >';
}

2
bbs/move_update.php
View File

@ -43,7 +43,7 @@ while ($row = sql_fetch_array($result))
{
$nick = cut_str($member['mb_nick'], $config['cf_cut_name']);
if (!$row2['wr_is_comment'] && $config['cf_use_copy_log'])
$row2['wr_content'] .= PHP_EOL.'<div class="content_'.$sw.'">[이 게시물은 '.$nick.'님에 의해 '.G4_TIME_YMDHIS.' '.$board['bo_subject'].'에서 '.($sw == 'copy' ? '복사' : '이동').' 됨]</div>';
$row2['wr_content'] .= "\n".'<div class="content_'.$sw.'">[이 게시물은 '.$nick.'님에 의해 '.G4_TIME_YMDHIS.' '.$board['bo_subject'].'에서 '.($sw == 'copy' ? '복사' : '이동').' 됨]</div>';
$sql = " insert into $move_write_table
set wr_num = '$next_wr_num',

2
bbs/view_comment.php
View File

@ -114,7 +114,7 @@ else
include_once($board_skin_path.'/view_comment.skin.php');
if (!$member['mb_id']) // 비회원일 경우에만
echo '<script src="'.G4_JS_URL.'/md5.js"></script>'.PHP_EOL;
echo '<script src="'.G4_JS_URL.'/md5.js"></script>'."\n";
@include_once($board_skin_path.'/view_comment.tail.skin.php');
?>

2
bbs/write_comment_update.php
View File

@ -67,7 +67,7 @@ if ($w == 'c') // 댓글 입력
{
/*
if ($member[mb_point] + $board[bo_comment_point] < 0 && !$is_admin)
alert('보유하신 포인트('.number_format($member[mb_point]).')가 없거나 모자라서 댓글쓰기('.number_format($board[bo_comment_point]).')가 불가합니다.'.PHP_EOL.PHP_EOL.'포인트를 적립하신 후 다시 댓글를 써 주십시오.');
alert('보유하신 포인트('.number_format($member[mb_point]).')가 없거나 모자라서 댓글쓰기('.number_format($board[bo_comment_point]).')가 불가합니다.\\n\\n포인트를 적립하신 후 다시 댓글를 써 주십시오.');
*/
// 댓글쓰기 포인트설정시 회원의 포인트가 음수인 경우 댓글를 쓰지 못하던 버그를 수정 (곱슬최씨님)
$tmp_point = ($member['mb_point'] > 0) ? $member['mb_point'] : 0;

2
bbs/write_update.php
View File

@ -349,7 +349,7 @@ if ($w == '' || $w == 'r') {
// 쓰기 포인트 부여
if ($w == '') {
if ($notice) {
$bo_notice = $wr_id.PHP_EOL.$board['bo_notice'];
$bo_notice = $wr_id."\n".$board['bo_notice'];
sql_query(" update {$g4['board_table']} set bo_notice = '{$bo_notice}' where bo_table = '{$bo_table}' ");
}