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

g5 merge 충돌 수정

Browse Source
This commit is contained in:
chicpro
2013-09-13 15:22:15 +09:00
parent 0f78b67eb7 5d332663d6
commit 8c0d61e772
55 changed files with 818 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugin/editor/ckeditor4/config.js
View File

@ -108,7 +108,7 @@ CKEDITOR.editorConfig = function( config ) {
config.fontSize_sizes = "7pt/9px;8pt/11px;9pt/12px;10pt/13px;11pt/15px;14pt/19px;18pt/24px;24pt/32px;36/48px;";
config.enterMode = CKEDITOR.ENTER_DIV;
config.shiftEnterMode = CKEDITOR.ENTER_DIV;
config.filebrowserUploadUrl = g4_editor_url+"/upload.php?type=Images";
config.filebrowserUploadUrl = g5_editor_url+"/upload.php?type=Images";
config.keystrokes=[
// Formatting
[ CKEDITOR.CTRL + 81 /*Q*/, 'blockquote' ],

2
plugin/editor/ckeditor4/editor.lib.php
View File

@ -15,7 +15,7 @@ function editor_html($id, $content, $is_dhtml_editor=true)
if ($js) {
$html .= "\n".'<script src="'.$editor_url.'/ckeditor.js"></script>';
$html .= "\n".'<script>var g4_editor_url = "'.$editor_url.'";</script>';
$html .= "\n".'<script>var g5_editor_url = "'.$editor_url.'";</script>';
$html .= "\n".'<script src="'.$editor_url.'/config.js"></script>';
$html .= "\n<script>";
$html .= '

2
plugin/gcaptcha/example.php
View File

@ -13,7 +13,7 @@ include_once("./_common.php");
<script>
function change_captcha()
{
document.getElementById('captcha').setAttribute('src', g4_path+'/plugin/captcha/run.php?t='+(new Date).getTime());
document.getElementById('captcha').setAttribute('src', g5_path+'/plugin/captcha/run.php?t='+(new Date).getTime());
}
function form_submit(f)

4
plugin/gcaptcha/gcaptcha.js
View File

@ -6,7 +6,7 @@ function chk_captcha()
var captcha_result = false;
$.ajax({
type: "POST",
url: g4_gcaptcha_url+"/get.php",
url: g5_gcaptcha_url+"/get.php",
data: {
"captcha_key": captcha_key.value
},
@ -26,7 +26,7 @@ function chk_captcha()
$(function() {
$("#captcha").click(function(e) {
this.setAttribute("src", g4_url+"/plugin/gcaptcha/run.php?t="+(new Date).getTime());
this.setAttribute("src", g5_url+"/plugin/gcaptcha/run.php?t="+(new Date).getTime());
var keycode = (e.keyCode ? e.keyCode : e.which);
// 첫 실행에서는 포커스를 주지 않음
if (typeof(keycode) != "undefined") {

2
plugin/gcaptcha/gcaptcha.lib.php
View File

@ -179,7 +179,7 @@ function captcha_html($class='captcha')
$jpg_file_url = G5_DATA_URL.'/cache/'.$obj->captcha_filename.'.jpg';
$mp3_file_url = G5_DATA_URL.'/cache/'.$obj->captcha_filename.'.mp3';
$html .= "\n".'<script>var g4_gcaptcha_url = "'.G5_GCAPTCHA_URL.'";</script>';
$html .= "\n".'<script>var g5_gcaptcha_url = "'.G5_GCAPTCHA_URL.'";</script>';
$html .= "\n".'<script src="'.G5_GCAPTCHA_URL.'/gcaptcha.js"></script>';
$html .= '<fieldset id="captcha" class="'.$class.'">';
$html .= '<legend class="sound_only">자동등록방지</legend>';

0
plugin/kcpcert/bin/ct_cli Executable file → Normal file
View File

0
plugin/okname/bin/okname Executable file → Normal file
View File

0
plugin/okname/bin/okname_x64 Executable file → Normal file
View File

4
plugin/syndi/func/site.func.php
View File

@ -1,8 +1,8 @@
<?php
/**
* @file syndi.config.gnuboard4_utf8.php
* @file plugin/syndi/func/site.func.php
* @author sol (ngleader@gmail.com)
* @brief syndication client functions for gnuboard4 utf-8
* @brief syndication client functions for gnuboard5
*
* Syndi_getSiteInfo : 사이트 정보
* Syndi_getChannelList : 사이트의 게시판

2
plugin/syndi/include/include.adm.board_delete.inc.php
View File

@ -3,7 +3,7 @@
* @file include.adm.board_delete.inc.php
* @author sol (ngleader@gmail.com)
* @brief 게시판 삭제시 Syndication Ping
* gnuboard4/adm/board_delete.inc.php 파일에 추가
* gnuboard5/adm/board_delete.inc.php 파일에 추가
* include '../syndi/include/include.adm.board_delete.inc.php';
*/
if(!defined('_GNUBOARD_')) return;

2
plugin/syndi/include/include.adm.board_form_update.php
View File

@ -3,7 +3,7 @@
* @file include.adm.board_form_update.php
* @author sol (ngleader@gmail.com)
* @brief 게시판 삭제시 Syndication Ping
* gnuboard4/adm/board_form_update.php 파일에 추가
* gnuboard5/adm/board_form_update.php 파일에 추가
* include '../syndi/include/include.adm.board_form_update.php';
*/
if(!defined('_GNUBOARD_')) return;

4
plugin/syndi/include/include.adm.boardgroup_form_update.php
View File

@ -3,8 +3,8 @@
* @file include.adm.boardgroup_form_update.php
* @author sol (ngleader@gmail.com)
* @brief 게시판 삭제시 Syndication Ping
* gnuboard4/adm/board_delete.inc.php 파일에 추가
* include '../syndi/include/gnuboard4_euckr/include.adm.boardgroup_form_update.php';
* gnuboard5/adm/board_delete.inc.php 파일에 추가
* include '../syndi/include/gnuboard5_euckr/include.adm.boardgroup_form_update.php';
*/
if(!defined('_GNUBOARD_')) return;

2
plugin/syndi/include/include.bbs.delete.php
View File

@ -3,7 +3,7 @@
* @file include.bbs.delete.php
* @author sol (ngleader@gmail.com)
* @brief 글 삭제시 Syndication Ping
* gnuboard4/bbs/bbs.delete.php 파일에 추가
* gnuboard5/bbs/bbs.delete.php 파일에 추가
* include '../syndi/include/include.bbs.delete.php';
*/
if(!defined('_GNUBOARD_')) return;

2
plugin/syndi/include/include.bbs.delete_all.php
View File

@ -3,7 +3,7 @@
* @file include.bbs.delete_all.php
* @author sol (ngleader@gmail.com)
* @brief 글 삭제시 Syndication Ping
* gnuboard4/bbs/bbs.delete_all.php 파일에 추가
* gnuboard5/bbs/bbs.delete_all.php 파일에 추가
* include '../syndi/include/include.bbs.delete_all.php';
*/
if(!defined('_GNUBOARD_')) return;

2
plugin/syndi/include/include.bbs.move_update.php
View File

@ -3,7 +3,7 @@
* @file include.bbs.move_update.php
* @author sol (ngleader@gmail.com)
* @brief 글 등록/수정시 Syndication Ping
* gnuboard4/bbs/move_update.php 파일에 추가
* gnuboard5/bbs/move_update.php 파일에 추가
* include '../syndi/include/include.bbs.move_update.php';
*/
if(!defined('_GNUBOARD_')) return;

2
plugin/syndi/include/include.bbs.write_update.php
View File

@ -3,7 +3,7 @@
* @file include.bbs.write_update.php
* @author sol (ngleader@gmail.com)
* @brief 글 등록/수정시 Syndication Ping
* gnuboard4/bbs/write_update.php 파일에 추가
* gnuboard5/bbs/write_update.php 파일에 추가
* include '../syndi/include/include.bbs.write_update.php';
*/
if(!defined('_GNUBOARD_')) return;