diff --git a/adm/board_copy.php b/adm/board_copy.php index b1b0bce40..cbb479fd8 100644 --- a/adm/board_copy.php +++ b/adm/board_copy.php @@ -1,6 +1,6 @@ $content\n"; - //if (_EDITOR_) $str .= "\n"; + //if (G4_EDITOR) $str .= "\n"; } else { $str = "\n"; } diff --git a/bbs/formmail.php b/bbs/formmail.php index a60774823..a62a887fa 100644 --- a/bbs/formmail.php +++ b/bbs/formmail.php @@ -1,5 +1,5 @@ url = $g4['url']."/extend/ckeditor"; - $ckeditor->path = $g4['path']."/extend/ckeditor"; - $ckeditor->data = "data/editor"; - - include_once($ckeditor->path."/ckeditor.lib.php"); - - $g4['js_code'][] = "var g4_ckeditor_path = \"{$ckeditor->path}\";"; - $g4['js_file'][] = $ckeditor->url."/ckeditor.js"; - $g4['js_file'][] = $ckeditor->url."/config.js"; -} -*/ -?> \ No newline at end of file diff --git a/extend/g4s.extend.php b/extend/g4s.extend.php index def09b2d2..d16641485 100644 --- a/extend/g4s.extend.php +++ b/extend/g4s.extend.php @@ -22,8 +22,8 @@ $g4['cache_path'] = $g4['data_path'].'/'.$g4['cache_dir']; $g4['captcha_dir'] = 'captcha'; // g4s 기본 DHTML EDITOR -if (!defined('_EDITOR_')) define('_EDITOR_', 0); -if (_EDITOR_) { +if (!defined('G4_EDITOR')) define('G4_EDITOR', 0); +if (G4_EDITOR) { $g4['ckeditor_dir'] = 'ckeditor'; $g4['ckeditor_url'] = $g4['bbs_url'].'/'.$g4['ckeditor_dir']; $g4['ckeditor_path'] = $g4['bbs_path'].'/'.$g4['ckeditor_dir']; @@ -37,8 +37,8 @@ if (_EDITOR_) { } // g4s 기본 CAPTCHA -if (!defined('_CAPTCHA_')) define('_CAPTCHA_', 0); -if (_CAPTCHA_) { +if (!defined('G4_CAPTCHA')) define('G4_CAPTCHA', 0); +if (G4_CAPTCHA) { $g4['gcaptcha_dir'] = 'gcaptcha'; $g4['gcaptcha_url'] = $g4['bbs_url'].'/'.$g4['gcaptcha_dir']; $g4['gcaptcha_path'] = $g4['bbs_path'].'/'.$g4['gcaptcha_dir']; diff --git a/extend/gcaptcha.extend.php b/extend/gcaptcha.extend.php deleted file mode 100644 index 129ec511a..000000000 --- a/extend/gcaptcha.extend.php +++ /dev/null @@ -1,22 +0,0 @@ -url = $g4['url']."/extend/gcaptcha"; - $gcaptcha->path = $g4['path']."/extend/gcaptcha"; - $gcaptcha->fonts = $gcaptcha->path."/fonts"; - $gcaptcha->wavs = $gcaptcha->path."/wavs"; - - include_once($gcaptcha->path."/gcaptcha.lib.php"); - - $g4['js_code'][] = "var g4_gcaptcha_path = \"{$gcaptcha->path}\";"; - $g4['js_file'][] = $gcaptcha->url."/gcaptcha.js"; -} -*/ -?> \ No newline at end of file