diff --git a/adm/board_form.php b/adm/board_form.php index dd0115ef9..8c57f589f 100644 --- a/adm/board_form.php +++ b/adm/board_form.php @@ -558,7 +558,7 @@ if (!preg_match("/([m|M])$/", $upload_max_filesize)) { - + @@ -568,7 +568,7 @@ if (!preg_match("/([m|M])$/", $upload_max_filesize)) { - + diff --git a/bbs/board.php b/bbs/board.php index 938e1ec04..88469ff61 100644 --- a/bbs/board.php +++ b/bbs/board.php @@ -1,5 +1,4 @@ = $board['bo_html_level']) $is_secret = $board['bo_use_secret']; +$is_dhtml_editor = false; if ($board['bo_use_dhtml_editor'] && $member['mb_level'] >= $board['bo_html_level']) { - define('_EDITOR_', true); $is_dhtml_editor = true; -} else { - $is_dhtml_editor = false; -} - -$captcha_html = ""; -if ($is_guest) { - $captcha_html = captcha_html('wr_key'); } $is_mail = false; @@ -369,4 +361,4 @@ include_once('./board_tail.php'); include_once($g4['path'].'/tail.sub.php'); @include_once ($board_skin_path.'/write.tail.skin.php'); -?> +?> \ No newline at end of file diff --git a/bbs/write_update.php b/bbs/write_update.php index b010365f7..a66b8b5a1 100644 --- a/bbs/write_update.php +++ b/bbs/write_update.php @@ -1,11 +1,8 @@ lib)) include_once($captcha->lib); - $msg = array(); $wr_subject = ''; @@ -151,8 +148,10 @@ if ($w == '' || $w == 'u') { alert('w 값이 제대로 넘어오지 않았습니다.'); } -if (!chk_captcha('wr_key')) { - alert('자동등록방지의 답변으로 입력한 숫자가 틀렸습니다.'); +if (defined('_CAPTCHA_')) { + if ($is_guest && !chk_captcha()) { + alert('스팸방지의 답변으로 입력한 숫자가 틀렸습니다.'); + } } if ($w == '' || $w == 'r') { @@ -283,8 +282,8 @@ if ($w == '' || $w == 'r') { } else { $mb_id = ''; // 비회원의 경우 이름이 누락되는 경우가 있음 - $wr_name = strip_tags(mysql_escape_string($_POST['wr_name'])); - if (!trim($wr_name)) + $wr_name = escape_trim($_POST['wr_name']); + if (!$wr_name) alert('이름은 필히 입력하셔야 합니다.'); $wr_password = sql_password($wr_password); } diff --git a/extend/captcha.extend.php b/extend/captcha.extend.php deleted file mode 100644 index c09359805..000000000 --- a/extend/captcha.extend.php +++ /dev/null @@ -1,19 +0,0 @@ - $g4['path']."/plugin/captcha/captcha.lib.php", - 'js' => $g4['path']."/plugin/captcha/captcha.js", - 'fonts' => $g4['path']."/plugin/captcha/fonts" - ); - - include_once($captcha->lib); - $g4['js_file'][] = $captcha->js; - - $captcha_obj = new captcha(); - $captcha_obj->run(); -} else { - unset($_SESSION['ss_captcha_use']); -} -?> \ No newline at end of file diff --git a/extend/ckeditor.extend.php b/extend/ckeditor.extend.php index cad9fa117..8f1badf62 100644 --- a/extend/ckeditor.extend.php +++ b/extend/ckeditor.extend.php @@ -1,12 +1,20 @@ $g4['path']."/plugin/ckeditor/ckeditor.lib.php", - 'js' => $g4['path']."/plugin/ckeditor/ckeditor.js", - 'config_js' => $g4['path']."/plugin/ckeditor/config.js", - 'data' => "data/editor" -); +// _EDITOR_ 의 값에 상관없이 선언 되었는지의 여부만 따짐 +// if (defined('_EDITOR_')) true; +define('_EDITOR_', 1); -include_once($editor->lib); +if (defined('_EDITOR_')) { + $ckeditor = new stdClass; + $ckeditor->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/plugin/ckeditor/CHANGES.md b/extend/ckeditor/CHANGES.md similarity index 100% rename from plugin/ckeditor/CHANGES.md rename to extend/ckeditor/CHANGES.md diff --git a/plugin/ckeditor/LICENSE.md b/extend/ckeditor/LICENSE.md similarity index 100% rename from plugin/ckeditor/LICENSE.md rename to extend/ckeditor/LICENSE.md diff --git a/plugin/ckeditor/README.md b/extend/ckeditor/README.md similarity index 100% rename from plugin/ckeditor/README.md rename to extend/ckeditor/README.md diff --git a/plugin/ckeditor/build-config.js b/extend/ckeditor/build-config.js similarity index 100% rename from plugin/ckeditor/build-config.js rename to extend/ckeditor/build-config.js diff --git a/plugin/ckeditor/ckeditor.js b/extend/ckeditor/ckeditor.js similarity index 100% rename from plugin/ckeditor/ckeditor.js rename to extend/ckeditor/ckeditor.js diff --git a/extend/ckeditor/ckeditor.lib.php b/extend/ckeditor/ckeditor.lib.php new file mode 100644 index 000000000..cb7ee0718 --- /dev/null +++ b/extend/ckeditor/ckeditor.lib.php @@ -0,0 +1,23 @@ +$content\n"; + //if (_EDITOR_) $str .= "\n"; + return $str; +} + +// textarea 로 값을 넘김 +function editor_getdata($id) +{ + return "var {$id}_data = CKEDITOR.instances.{$id}.getData();\n"; +} + +// textarea 의 값이 비어 있는지 검사 +function editor_empty($id, $textarea_name="내용을") +{ + return "if (!{$id}_data) { alert(\"$textarea_name 입력해 주십시오.\"); CKEDITOR.instances.{$id}.focus(); return false; }\n"; +} +?> \ No newline at end of file diff --git a/plugin/ckeditor/config.js b/extend/ckeditor/config.js similarity index 94% rename from plugin/ckeditor/config.js rename to extend/ckeditor/config.js index 169f51b82..b72c56448 100644 --- a/plugin/ckeditor/config.js +++ b/extend/ckeditor/config.js @@ -26,5 +26,5 @@ 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_BR; config.shiftEnterMode = CKEDITOR.ENTER_P; - config.filebrowserUploadUrl = g4_path+"/plugin/ckeditor/upload.php?type=Images"; + config.filebrowserUploadUrl = g4_ckeditor_path+"/upload.php?type=Images"; }; diff --git a/plugin/ckeditor/contents.css b/extend/ckeditor/contents.css similarity index 100% rename from plugin/ckeditor/contents.css rename to extend/ckeditor/contents.css diff --git a/plugin/ckeditor/lang/af.js b/extend/ckeditor/lang/af.js similarity index 100% rename from plugin/ckeditor/lang/af.js rename to extend/ckeditor/lang/af.js diff --git a/plugin/ckeditor/lang/ar.js b/extend/ckeditor/lang/ar.js similarity index 100% rename from plugin/ckeditor/lang/ar.js rename to extend/ckeditor/lang/ar.js diff --git a/plugin/ckeditor/lang/bg.js b/extend/ckeditor/lang/bg.js similarity index 100% rename from plugin/ckeditor/lang/bg.js rename to extend/ckeditor/lang/bg.js diff --git a/plugin/ckeditor/lang/bn.js b/extend/ckeditor/lang/bn.js similarity index 100% rename from plugin/ckeditor/lang/bn.js rename to extend/ckeditor/lang/bn.js diff --git a/plugin/ckeditor/lang/bs.js b/extend/ckeditor/lang/bs.js similarity index 100% rename from plugin/ckeditor/lang/bs.js rename to extend/ckeditor/lang/bs.js diff --git a/plugin/ckeditor/lang/ca.js b/extend/ckeditor/lang/ca.js similarity index 100% rename from plugin/ckeditor/lang/ca.js rename to extend/ckeditor/lang/ca.js diff --git a/plugin/ckeditor/lang/cs.js b/extend/ckeditor/lang/cs.js similarity index 100% rename from plugin/ckeditor/lang/cs.js rename to extend/ckeditor/lang/cs.js diff --git a/plugin/ckeditor/lang/cy.js b/extend/ckeditor/lang/cy.js similarity index 100% rename from plugin/ckeditor/lang/cy.js rename to extend/ckeditor/lang/cy.js diff --git a/plugin/ckeditor/lang/da.js b/extend/ckeditor/lang/da.js similarity index 100% rename from plugin/ckeditor/lang/da.js rename to extend/ckeditor/lang/da.js diff --git a/plugin/ckeditor/lang/de.js b/extend/ckeditor/lang/de.js similarity index 100% rename from plugin/ckeditor/lang/de.js rename to extend/ckeditor/lang/de.js diff --git a/plugin/ckeditor/lang/el.js b/extend/ckeditor/lang/el.js similarity index 100% rename from plugin/ckeditor/lang/el.js rename to extend/ckeditor/lang/el.js diff --git a/plugin/ckeditor/lang/en-au.js b/extend/ckeditor/lang/en-au.js similarity index 100% rename from plugin/ckeditor/lang/en-au.js rename to extend/ckeditor/lang/en-au.js diff --git a/plugin/ckeditor/lang/en-ca.js b/extend/ckeditor/lang/en-ca.js similarity index 100% rename from plugin/ckeditor/lang/en-ca.js rename to extend/ckeditor/lang/en-ca.js diff --git a/plugin/ckeditor/lang/en-gb.js b/extend/ckeditor/lang/en-gb.js similarity index 100% rename from plugin/ckeditor/lang/en-gb.js rename to extend/ckeditor/lang/en-gb.js diff --git a/plugin/ckeditor/lang/en.js b/extend/ckeditor/lang/en.js similarity index 100% rename from plugin/ckeditor/lang/en.js rename to extend/ckeditor/lang/en.js diff --git a/plugin/ckeditor/lang/eo.js b/extend/ckeditor/lang/eo.js similarity index 100% rename from plugin/ckeditor/lang/eo.js rename to extend/ckeditor/lang/eo.js diff --git a/plugin/ckeditor/lang/es.js b/extend/ckeditor/lang/es.js similarity index 100% rename from plugin/ckeditor/lang/es.js rename to extend/ckeditor/lang/es.js diff --git a/plugin/ckeditor/lang/et.js b/extend/ckeditor/lang/et.js similarity index 100% rename from plugin/ckeditor/lang/et.js rename to extend/ckeditor/lang/et.js diff --git a/plugin/ckeditor/lang/eu.js b/extend/ckeditor/lang/eu.js similarity index 100% rename from plugin/ckeditor/lang/eu.js rename to extend/ckeditor/lang/eu.js diff --git a/plugin/ckeditor/lang/fa.js b/extend/ckeditor/lang/fa.js similarity index 100% rename from plugin/ckeditor/lang/fa.js rename to extend/ckeditor/lang/fa.js diff --git a/plugin/ckeditor/lang/fi.js b/extend/ckeditor/lang/fi.js similarity index 100% rename from plugin/ckeditor/lang/fi.js rename to extend/ckeditor/lang/fi.js diff --git a/plugin/ckeditor/lang/fo.js b/extend/ckeditor/lang/fo.js similarity index 100% rename from plugin/ckeditor/lang/fo.js rename to extend/ckeditor/lang/fo.js diff --git a/plugin/ckeditor/lang/fr-ca.js b/extend/ckeditor/lang/fr-ca.js similarity index 100% rename from plugin/ckeditor/lang/fr-ca.js rename to extend/ckeditor/lang/fr-ca.js diff --git a/plugin/ckeditor/lang/fr.js b/extend/ckeditor/lang/fr.js similarity index 100% rename from plugin/ckeditor/lang/fr.js rename to extend/ckeditor/lang/fr.js diff --git a/plugin/ckeditor/lang/gl.js b/extend/ckeditor/lang/gl.js similarity index 100% rename from plugin/ckeditor/lang/gl.js rename to extend/ckeditor/lang/gl.js diff --git a/plugin/ckeditor/lang/gu.js b/extend/ckeditor/lang/gu.js similarity index 100% rename from plugin/ckeditor/lang/gu.js rename to extend/ckeditor/lang/gu.js diff --git a/plugin/ckeditor/lang/he.js b/extend/ckeditor/lang/he.js similarity index 100% rename from plugin/ckeditor/lang/he.js rename to extend/ckeditor/lang/he.js diff --git a/plugin/ckeditor/lang/hi.js b/extend/ckeditor/lang/hi.js similarity index 100% rename from plugin/ckeditor/lang/hi.js rename to extend/ckeditor/lang/hi.js diff --git a/plugin/ckeditor/lang/hr.js b/extend/ckeditor/lang/hr.js similarity index 100% rename from plugin/ckeditor/lang/hr.js rename to extend/ckeditor/lang/hr.js diff --git a/plugin/ckeditor/lang/hu.js b/extend/ckeditor/lang/hu.js similarity index 100% rename from plugin/ckeditor/lang/hu.js rename to extend/ckeditor/lang/hu.js diff --git a/plugin/ckeditor/lang/is.js b/extend/ckeditor/lang/is.js similarity index 100% rename from plugin/ckeditor/lang/is.js rename to extend/ckeditor/lang/is.js diff --git a/plugin/ckeditor/lang/it.js b/extend/ckeditor/lang/it.js similarity index 100% rename from plugin/ckeditor/lang/it.js rename to extend/ckeditor/lang/it.js diff --git a/plugin/ckeditor/lang/ja.js b/extend/ckeditor/lang/ja.js similarity index 100% rename from plugin/ckeditor/lang/ja.js rename to extend/ckeditor/lang/ja.js diff --git a/plugin/ckeditor/lang/ka.js b/extend/ckeditor/lang/ka.js similarity index 100% rename from plugin/ckeditor/lang/ka.js rename to extend/ckeditor/lang/ka.js diff --git a/plugin/ckeditor/lang/km.js b/extend/ckeditor/lang/km.js similarity index 100% rename from plugin/ckeditor/lang/km.js rename to extend/ckeditor/lang/km.js diff --git a/plugin/ckeditor/lang/ko.js b/extend/ckeditor/lang/ko.js similarity index 100% rename from plugin/ckeditor/lang/ko.js rename to extend/ckeditor/lang/ko.js diff --git a/plugin/ckeditor/lang/ku.js b/extend/ckeditor/lang/ku.js similarity index 100% rename from plugin/ckeditor/lang/ku.js rename to extend/ckeditor/lang/ku.js diff --git a/plugin/ckeditor/lang/lt.js b/extend/ckeditor/lang/lt.js similarity index 100% rename from plugin/ckeditor/lang/lt.js rename to extend/ckeditor/lang/lt.js diff --git a/plugin/ckeditor/lang/lv.js b/extend/ckeditor/lang/lv.js similarity index 100% rename from plugin/ckeditor/lang/lv.js rename to extend/ckeditor/lang/lv.js diff --git a/plugin/ckeditor/lang/mk.js b/extend/ckeditor/lang/mk.js similarity index 100% rename from plugin/ckeditor/lang/mk.js rename to extend/ckeditor/lang/mk.js diff --git a/plugin/ckeditor/lang/mn.js b/extend/ckeditor/lang/mn.js similarity index 100% rename from plugin/ckeditor/lang/mn.js rename to extend/ckeditor/lang/mn.js diff --git a/plugin/ckeditor/lang/ms.js b/extend/ckeditor/lang/ms.js similarity index 100% rename from plugin/ckeditor/lang/ms.js rename to extend/ckeditor/lang/ms.js diff --git a/plugin/ckeditor/lang/nb.js b/extend/ckeditor/lang/nb.js similarity index 100% rename from plugin/ckeditor/lang/nb.js rename to extend/ckeditor/lang/nb.js diff --git a/plugin/ckeditor/lang/nl.js b/extend/ckeditor/lang/nl.js similarity index 100% rename from plugin/ckeditor/lang/nl.js rename to extend/ckeditor/lang/nl.js diff --git a/plugin/ckeditor/lang/no.js b/extend/ckeditor/lang/no.js similarity index 100% rename from plugin/ckeditor/lang/no.js rename to extend/ckeditor/lang/no.js diff --git a/plugin/ckeditor/lang/pl.js b/extend/ckeditor/lang/pl.js similarity index 100% rename from plugin/ckeditor/lang/pl.js rename to extend/ckeditor/lang/pl.js diff --git a/plugin/ckeditor/lang/pt-br.js b/extend/ckeditor/lang/pt-br.js similarity index 100% rename from plugin/ckeditor/lang/pt-br.js rename to extend/ckeditor/lang/pt-br.js diff --git a/plugin/ckeditor/lang/pt.js b/extend/ckeditor/lang/pt.js similarity index 100% rename from plugin/ckeditor/lang/pt.js rename to extend/ckeditor/lang/pt.js diff --git a/plugin/ckeditor/lang/ro.js b/extend/ckeditor/lang/ro.js similarity index 100% rename from plugin/ckeditor/lang/ro.js rename to extend/ckeditor/lang/ro.js diff --git a/plugin/ckeditor/lang/ru.js b/extend/ckeditor/lang/ru.js similarity index 100% rename from plugin/ckeditor/lang/ru.js rename to extend/ckeditor/lang/ru.js diff --git a/plugin/ckeditor/lang/sk.js b/extend/ckeditor/lang/sk.js similarity index 100% rename from plugin/ckeditor/lang/sk.js rename to extend/ckeditor/lang/sk.js diff --git a/plugin/ckeditor/lang/sl.js b/extend/ckeditor/lang/sl.js similarity index 100% rename from plugin/ckeditor/lang/sl.js rename to extend/ckeditor/lang/sl.js diff --git a/plugin/ckeditor/lang/sr-latn.js b/extend/ckeditor/lang/sr-latn.js similarity index 100% rename from plugin/ckeditor/lang/sr-latn.js rename to extend/ckeditor/lang/sr-latn.js diff --git a/plugin/ckeditor/lang/sr.js b/extend/ckeditor/lang/sr.js similarity index 100% rename from plugin/ckeditor/lang/sr.js rename to extend/ckeditor/lang/sr.js diff --git a/plugin/ckeditor/lang/sv.js b/extend/ckeditor/lang/sv.js similarity index 100% rename from plugin/ckeditor/lang/sv.js rename to extend/ckeditor/lang/sv.js diff --git a/plugin/ckeditor/lang/th.js b/extend/ckeditor/lang/th.js similarity index 100% rename from plugin/ckeditor/lang/th.js rename to extend/ckeditor/lang/th.js diff --git a/plugin/ckeditor/lang/tr.js b/extend/ckeditor/lang/tr.js similarity index 100% rename from plugin/ckeditor/lang/tr.js rename to extend/ckeditor/lang/tr.js diff --git a/plugin/ckeditor/lang/ug.js b/extend/ckeditor/lang/ug.js similarity index 100% rename from plugin/ckeditor/lang/ug.js rename to extend/ckeditor/lang/ug.js diff --git a/plugin/ckeditor/lang/uk.js b/extend/ckeditor/lang/uk.js similarity index 100% rename from plugin/ckeditor/lang/uk.js rename to extend/ckeditor/lang/uk.js diff --git a/plugin/ckeditor/lang/vi.js b/extend/ckeditor/lang/vi.js similarity index 100% rename from plugin/ckeditor/lang/vi.js rename to extend/ckeditor/lang/vi.js diff --git a/plugin/ckeditor/lang/zh-cn.js b/extend/ckeditor/lang/zh-cn.js similarity index 100% rename from plugin/ckeditor/lang/zh-cn.js rename to extend/ckeditor/lang/zh-cn.js diff --git a/plugin/ckeditor/lang/zh.js b/extend/ckeditor/lang/zh.js similarity index 100% rename from plugin/ckeditor/lang/zh.js rename to extend/ckeditor/lang/zh.js diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js b/extend/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js similarity index 100% rename from plugin/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js rename to extend/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/_translationstatus.txt b/extend/ckeditor/plugins/a11yhelp/dialogs/lang/_translationstatus.txt similarity index 100% rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/_translationstatus.txt rename to extend/ckeditor/plugins/a11yhelp/dialogs/lang/_translationstatus.txt diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/ar.js b/extend/ckeditor/plugins/a11yhelp/dialogs/lang/ar.js similarity index 100% rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/ar.js rename to extend/ckeditor/plugins/a11yhelp/dialogs/lang/ar.js diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/bg.js b/extend/ckeditor/plugins/a11yhelp/dialogs/lang/bg.js similarity index 100% rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/bg.js rename to extend/ckeditor/plugins/a11yhelp/dialogs/lang/bg.js diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/ca.js b/extend/ckeditor/plugins/a11yhelp/dialogs/lang/ca.js similarity index 100% rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/ca.js rename to extend/ckeditor/plugins/a11yhelp/dialogs/lang/ca.js diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/cs.js b/extend/ckeditor/plugins/a11yhelp/dialogs/lang/cs.js similarity index 100% rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/cs.js rename to extend/ckeditor/plugins/a11yhelp/dialogs/lang/cs.js diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/cy.js b/extend/ckeditor/plugins/a11yhelp/dialogs/lang/cy.js similarity index 100% rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/cy.js rename to extend/ckeditor/plugins/a11yhelp/dialogs/lang/cy.js diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/da.js b/extend/ckeditor/plugins/a11yhelp/dialogs/lang/da.js similarity index 100% rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/da.js rename to extend/ckeditor/plugins/a11yhelp/dialogs/lang/da.js diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/de.js b/extend/ckeditor/plugins/a11yhelp/dialogs/lang/de.js similarity index 100% rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/de.js rename to extend/ckeditor/plugins/a11yhelp/dialogs/lang/de.js diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/el.js b/extend/ckeditor/plugins/a11yhelp/dialogs/lang/el.js similarity index 100% rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/el.js rename to extend/ckeditor/plugins/a11yhelp/dialogs/lang/el.js diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/en.js b/extend/ckeditor/plugins/a11yhelp/dialogs/lang/en.js similarity index 100% rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/en.js rename to extend/ckeditor/plugins/a11yhelp/dialogs/lang/en.js diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/eo.js b/extend/ckeditor/plugins/a11yhelp/dialogs/lang/eo.js similarity index 100% rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/eo.js rename to extend/ckeditor/plugins/a11yhelp/dialogs/lang/eo.js diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/et.js b/extend/ckeditor/plugins/a11yhelp/dialogs/lang/et.js similarity index 100% rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/et.js rename to extend/ckeditor/plugins/a11yhelp/dialogs/lang/et.js diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/fa.js b/extend/ckeditor/plugins/a11yhelp/dialogs/lang/fa.js similarity index 100% rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/fa.js rename to extend/ckeditor/plugins/a11yhelp/dialogs/lang/fa.js diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/fi.js b/extend/ckeditor/plugins/a11yhelp/dialogs/lang/fi.js similarity index 100% rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/fi.js rename to extend/ckeditor/plugins/a11yhelp/dialogs/lang/fi.js diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/fr.js b/extend/ckeditor/plugins/a11yhelp/dialogs/lang/fr.js similarity index 100% rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/fr.js rename to extend/ckeditor/plugins/a11yhelp/dialogs/lang/fr.js diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/gu.js b/extend/ckeditor/plugins/a11yhelp/dialogs/lang/gu.js similarity index 100% rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/gu.js rename to extend/ckeditor/plugins/a11yhelp/dialogs/lang/gu.js diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/he.js b/extend/ckeditor/plugins/a11yhelp/dialogs/lang/he.js similarity index 100% rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/he.js rename to extend/ckeditor/plugins/a11yhelp/dialogs/lang/he.js diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/hi.js b/extend/ckeditor/plugins/a11yhelp/dialogs/lang/hi.js similarity index 100% rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/hi.js rename to extend/ckeditor/plugins/a11yhelp/dialogs/lang/hi.js diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/hr.js b/extend/ckeditor/plugins/a11yhelp/dialogs/lang/hr.js similarity index 100% rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/hr.js rename to extend/ckeditor/plugins/a11yhelp/dialogs/lang/hr.js diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/hu.js b/extend/ckeditor/plugins/a11yhelp/dialogs/lang/hu.js similarity index 100% rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/hu.js rename to extend/ckeditor/plugins/a11yhelp/dialogs/lang/hu.js diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/it.js b/extend/ckeditor/plugins/a11yhelp/dialogs/lang/it.js similarity index 100% rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/it.js rename to extend/ckeditor/plugins/a11yhelp/dialogs/lang/it.js diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/ku.js b/extend/ckeditor/plugins/a11yhelp/dialogs/lang/ku.js similarity index 100% rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/ku.js rename to extend/ckeditor/plugins/a11yhelp/dialogs/lang/ku.js diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/lt.js b/extend/ckeditor/plugins/a11yhelp/dialogs/lang/lt.js similarity index 100% rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/lt.js rename to extend/ckeditor/plugins/a11yhelp/dialogs/lang/lt.js diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/lv.js b/extend/ckeditor/plugins/a11yhelp/dialogs/lang/lv.js similarity index 100% rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/lv.js rename to extend/ckeditor/plugins/a11yhelp/dialogs/lang/lv.js diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/mk.js b/extend/ckeditor/plugins/a11yhelp/dialogs/lang/mk.js similarity index 100% rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/mk.js rename to extend/ckeditor/plugins/a11yhelp/dialogs/lang/mk.js diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/mn.js b/extend/ckeditor/plugins/a11yhelp/dialogs/lang/mn.js similarity index 100% rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/mn.js rename to extend/ckeditor/plugins/a11yhelp/dialogs/lang/mn.js diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/nb.js b/extend/ckeditor/plugins/a11yhelp/dialogs/lang/nb.js similarity index 100% rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/nb.js rename to extend/ckeditor/plugins/a11yhelp/dialogs/lang/nb.js diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/nl.js b/extend/ckeditor/plugins/a11yhelp/dialogs/lang/nl.js similarity index 100% rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/nl.js rename to extend/ckeditor/plugins/a11yhelp/dialogs/lang/nl.js diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/no.js b/extend/ckeditor/plugins/a11yhelp/dialogs/lang/no.js similarity index 100% rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/no.js rename to extend/ckeditor/plugins/a11yhelp/dialogs/lang/no.js diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/pl.js b/extend/ckeditor/plugins/a11yhelp/dialogs/lang/pl.js similarity index 100% rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/pl.js rename to extend/ckeditor/plugins/a11yhelp/dialogs/lang/pl.js diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/pt-br.js b/extend/ckeditor/plugins/a11yhelp/dialogs/lang/pt-br.js similarity index 100% rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/pt-br.js rename to extend/ckeditor/plugins/a11yhelp/dialogs/lang/pt-br.js diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/pt.js b/extend/ckeditor/plugins/a11yhelp/dialogs/lang/pt.js similarity index 100% rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/pt.js rename to extend/ckeditor/plugins/a11yhelp/dialogs/lang/pt.js diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/ro.js b/extend/ckeditor/plugins/a11yhelp/dialogs/lang/ro.js similarity index 100% rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/ro.js rename to extend/ckeditor/plugins/a11yhelp/dialogs/lang/ro.js diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/ru.js b/extend/ckeditor/plugins/a11yhelp/dialogs/lang/ru.js similarity index 100% rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/ru.js rename to extend/ckeditor/plugins/a11yhelp/dialogs/lang/ru.js diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/sk.js b/extend/ckeditor/plugins/a11yhelp/dialogs/lang/sk.js similarity index 100% rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/sk.js rename to extend/ckeditor/plugins/a11yhelp/dialogs/lang/sk.js diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/sl.js b/extend/ckeditor/plugins/a11yhelp/dialogs/lang/sl.js similarity index 100% rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/sl.js rename to extend/ckeditor/plugins/a11yhelp/dialogs/lang/sl.js diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/tr.js b/extend/ckeditor/plugins/a11yhelp/dialogs/lang/tr.js similarity index 100% rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/tr.js rename to extend/ckeditor/plugins/a11yhelp/dialogs/lang/tr.js diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/ug.js b/extend/ckeditor/plugins/a11yhelp/dialogs/lang/ug.js similarity index 100% rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/ug.js rename to extend/ckeditor/plugins/a11yhelp/dialogs/lang/ug.js diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/uk.js b/extend/ckeditor/plugins/a11yhelp/dialogs/lang/uk.js similarity index 100% rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/uk.js rename to extend/ckeditor/plugins/a11yhelp/dialogs/lang/uk.js diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/vi.js b/extend/ckeditor/plugins/a11yhelp/dialogs/lang/vi.js similarity index 100% rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/vi.js rename to extend/ckeditor/plugins/a11yhelp/dialogs/lang/vi.js diff --git a/plugin/ckeditor/plugins/a11yhelp/dialogs/lang/zh-cn.js b/extend/ckeditor/plugins/a11yhelp/dialogs/lang/zh-cn.js similarity index 100% rename from plugin/ckeditor/plugins/a11yhelp/dialogs/lang/zh-cn.js rename to extend/ckeditor/plugins/a11yhelp/dialogs/lang/zh-cn.js diff --git a/plugin/ckeditor/plugins/about/dialogs/about.js b/extend/ckeditor/plugins/about/dialogs/about.js similarity index 100% rename from plugin/ckeditor/plugins/about/dialogs/about.js rename to extend/ckeditor/plugins/about/dialogs/about.js diff --git a/plugin/ckeditor/plugins/about/dialogs/logo_ckeditor.png b/extend/ckeditor/plugins/about/dialogs/logo_ckeditor.png similarity index 100% rename from plugin/ckeditor/plugins/about/dialogs/logo_ckeditor.png rename to extend/ckeditor/plugins/about/dialogs/logo_ckeditor.png diff --git a/plugin/ckeditor/plugins/clipboard/dialogs/paste.js b/extend/ckeditor/plugins/clipboard/dialogs/paste.js similarity index 100% rename from plugin/ckeditor/plugins/clipboard/dialogs/paste.js rename to extend/ckeditor/plugins/clipboard/dialogs/paste.js diff --git a/plugin/ckeditor/plugins/colordialog/dialogs/colordialog.js b/extend/ckeditor/plugins/colordialog/dialogs/colordialog.js similarity index 100% rename from plugin/ckeditor/plugins/colordialog/dialogs/colordialog.js rename to extend/ckeditor/plugins/colordialog/dialogs/colordialog.js diff --git a/plugin/ckeditor/plugins/dialog/dialogDefinition.js b/extend/ckeditor/plugins/dialog/dialogDefinition.js similarity index 100% rename from plugin/ckeditor/plugins/dialog/dialogDefinition.js rename to extend/ckeditor/plugins/dialog/dialogDefinition.js diff --git a/plugin/ckeditor/plugins/div/dialogs/div.js b/extend/ckeditor/plugins/div/dialogs/div.js similarity index 100% rename from plugin/ckeditor/plugins/div/dialogs/div.js rename to extend/ckeditor/plugins/div/dialogs/div.js diff --git a/plugin/ckeditor/plugins/fakeobjects/images/spacer.gif b/extend/ckeditor/plugins/fakeobjects/images/spacer.gif similarity index 100% rename from plugin/ckeditor/plugins/fakeobjects/images/spacer.gif rename to extend/ckeditor/plugins/fakeobjects/images/spacer.gif diff --git a/plugin/ckeditor/plugins/find/dialogs/find.js b/extend/ckeditor/plugins/find/dialogs/find.js similarity index 100% rename from plugin/ckeditor/plugins/find/dialogs/find.js rename to extend/ckeditor/plugins/find/dialogs/find.js diff --git a/plugin/ckeditor/plugins/flash/dialogs/flash.js b/extend/ckeditor/plugins/flash/dialogs/flash.js similarity index 100% rename from plugin/ckeditor/plugins/flash/dialogs/flash.js rename to extend/ckeditor/plugins/flash/dialogs/flash.js diff --git a/plugin/ckeditor/plugins/flash/images/placeholder.png b/extend/ckeditor/plugins/flash/images/placeholder.png similarity index 100% rename from plugin/ckeditor/plugins/flash/images/placeholder.png rename to extend/ckeditor/plugins/flash/images/placeholder.png diff --git a/plugin/ckeditor/plugins/forms/dialogs/button.js b/extend/ckeditor/plugins/forms/dialogs/button.js similarity index 100% rename from plugin/ckeditor/plugins/forms/dialogs/button.js rename to extend/ckeditor/plugins/forms/dialogs/button.js diff --git a/plugin/ckeditor/plugins/forms/dialogs/checkbox.js b/extend/ckeditor/plugins/forms/dialogs/checkbox.js similarity index 100% rename from plugin/ckeditor/plugins/forms/dialogs/checkbox.js rename to extend/ckeditor/plugins/forms/dialogs/checkbox.js diff --git a/plugin/ckeditor/plugins/forms/dialogs/form.js b/extend/ckeditor/plugins/forms/dialogs/form.js similarity index 100% rename from plugin/ckeditor/plugins/forms/dialogs/form.js rename to extend/ckeditor/plugins/forms/dialogs/form.js diff --git a/plugin/ckeditor/plugins/forms/dialogs/hiddenfield.js b/extend/ckeditor/plugins/forms/dialogs/hiddenfield.js similarity index 100% rename from plugin/ckeditor/plugins/forms/dialogs/hiddenfield.js rename to extend/ckeditor/plugins/forms/dialogs/hiddenfield.js diff --git a/plugin/ckeditor/plugins/forms/dialogs/radio.js b/extend/ckeditor/plugins/forms/dialogs/radio.js similarity index 100% rename from plugin/ckeditor/plugins/forms/dialogs/radio.js rename to extend/ckeditor/plugins/forms/dialogs/radio.js diff --git a/plugin/ckeditor/plugins/forms/dialogs/select.js b/extend/ckeditor/plugins/forms/dialogs/select.js similarity index 100% rename from plugin/ckeditor/plugins/forms/dialogs/select.js rename to extend/ckeditor/plugins/forms/dialogs/select.js diff --git a/plugin/ckeditor/plugins/forms/dialogs/textarea.js b/extend/ckeditor/plugins/forms/dialogs/textarea.js similarity index 100% rename from plugin/ckeditor/plugins/forms/dialogs/textarea.js rename to extend/ckeditor/plugins/forms/dialogs/textarea.js diff --git a/plugin/ckeditor/plugins/forms/dialogs/textfield.js b/extend/ckeditor/plugins/forms/dialogs/textfield.js similarity index 100% rename from plugin/ckeditor/plugins/forms/dialogs/textfield.js rename to extend/ckeditor/plugins/forms/dialogs/textfield.js diff --git a/plugin/ckeditor/plugins/forms/images/hiddenfield.gif b/extend/ckeditor/plugins/forms/images/hiddenfield.gif similarity index 100% rename from plugin/ckeditor/plugins/forms/images/hiddenfield.gif rename to extend/ckeditor/plugins/forms/images/hiddenfield.gif diff --git a/plugin/ckeditor/plugins/icons.png b/extend/ckeditor/plugins/icons.png similarity index 100% rename from plugin/ckeditor/plugins/icons.png rename to extend/ckeditor/plugins/icons.png diff --git a/plugin/ckeditor/plugins/iframe/dialogs/iframe.js b/extend/ckeditor/plugins/iframe/dialogs/iframe.js similarity index 100% rename from plugin/ckeditor/plugins/iframe/dialogs/iframe.js rename to extend/ckeditor/plugins/iframe/dialogs/iframe.js diff --git a/plugin/ckeditor/plugins/iframe/images/placeholder.png b/extend/ckeditor/plugins/iframe/images/placeholder.png similarity index 100% rename from plugin/ckeditor/plugins/iframe/images/placeholder.png rename to extend/ckeditor/plugins/iframe/images/placeholder.png diff --git a/plugin/ckeditor/plugins/image/dialogs/image.js b/extend/ckeditor/plugins/image/dialogs/image.js similarity index 100% rename from plugin/ckeditor/plugins/image/dialogs/image.js rename to extend/ckeditor/plugins/image/dialogs/image.js diff --git a/plugin/ckeditor/plugins/image/images/noimage.png b/extend/ckeditor/plugins/image/images/noimage.png similarity index 100% rename from plugin/ckeditor/plugins/image/images/noimage.png rename to extend/ckeditor/plugins/image/images/noimage.png diff --git a/plugin/ckeditor/plugins/link/dialogs/anchor.js b/extend/ckeditor/plugins/link/dialogs/anchor.js similarity index 100% rename from plugin/ckeditor/plugins/link/dialogs/anchor.js rename to extend/ckeditor/plugins/link/dialogs/anchor.js diff --git a/plugin/ckeditor/plugins/link/dialogs/link.js b/extend/ckeditor/plugins/link/dialogs/link.js similarity index 100% rename from plugin/ckeditor/plugins/link/dialogs/link.js rename to extend/ckeditor/plugins/link/dialogs/link.js diff --git a/plugin/ckeditor/plugins/link/images/anchor.png b/extend/ckeditor/plugins/link/images/anchor.png similarity index 100% rename from plugin/ckeditor/plugins/link/images/anchor.png rename to extend/ckeditor/plugins/link/images/anchor.png diff --git a/plugin/ckeditor/plugins/liststyle/dialogs/liststyle.js b/extend/ckeditor/plugins/liststyle/dialogs/liststyle.js similarity index 100% rename from plugin/ckeditor/plugins/liststyle/dialogs/liststyle.js rename to extend/ckeditor/plugins/liststyle/dialogs/liststyle.js diff --git a/plugin/ckeditor/plugins/magicline/images/icon.png b/extend/ckeditor/plugins/magicline/images/icon.png similarity index 100% rename from plugin/ckeditor/plugins/magicline/images/icon.png rename to extend/ckeditor/plugins/magicline/images/icon.png diff --git a/plugin/ckeditor/plugins/pagebreak/images/pagebreak.gif b/extend/ckeditor/plugins/pagebreak/images/pagebreak.gif similarity index 100% rename from plugin/ckeditor/plugins/pagebreak/images/pagebreak.gif rename to extend/ckeditor/plugins/pagebreak/images/pagebreak.gif diff --git a/plugin/ckeditor/plugins/pastefromword/filter/default.js b/extend/ckeditor/plugins/pastefromword/filter/default.js similarity index 100% rename from plugin/ckeditor/plugins/pastefromword/filter/default.js rename to extend/ckeditor/plugins/pastefromword/filter/default.js diff --git a/plugin/ckeditor/plugins/preview/preview.html b/extend/ckeditor/plugins/preview/preview.html similarity index 100% rename from plugin/ckeditor/plugins/preview/preview.html rename to extend/ckeditor/plugins/preview/preview.html diff --git a/plugin/ckeditor/plugins/showblocks/images/block_address.png b/extend/ckeditor/plugins/showblocks/images/block_address.png similarity index 100% rename from plugin/ckeditor/plugins/showblocks/images/block_address.png rename to extend/ckeditor/plugins/showblocks/images/block_address.png diff --git a/plugin/ckeditor/plugins/showblocks/images/block_blockquote.png b/extend/ckeditor/plugins/showblocks/images/block_blockquote.png similarity index 100% rename from plugin/ckeditor/plugins/showblocks/images/block_blockquote.png rename to extend/ckeditor/plugins/showblocks/images/block_blockquote.png diff --git a/plugin/ckeditor/plugins/showblocks/images/block_div.png b/extend/ckeditor/plugins/showblocks/images/block_div.png similarity index 100% rename from plugin/ckeditor/plugins/showblocks/images/block_div.png rename to extend/ckeditor/plugins/showblocks/images/block_div.png diff --git a/plugin/ckeditor/plugins/showblocks/images/block_h1.png b/extend/ckeditor/plugins/showblocks/images/block_h1.png similarity index 100% rename from plugin/ckeditor/plugins/showblocks/images/block_h1.png rename to extend/ckeditor/plugins/showblocks/images/block_h1.png diff --git a/plugin/ckeditor/plugins/showblocks/images/block_h2.png b/extend/ckeditor/plugins/showblocks/images/block_h2.png similarity index 100% rename from plugin/ckeditor/plugins/showblocks/images/block_h2.png rename to extend/ckeditor/plugins/showblocks/images/block_h2.png diff --git a/plugin/ckeditor/plugins/showblocks/images/block_h3.png b/extend/ckeditor/plugins/showblocks/images/block_h3.png similarity index 100% rename from plugin/ckeditor/plugins/showblocks/images/block_h3.png rename to extend/ckeditor/plugins/showblocks/images/block_h3.png diff --git a/plugin/ckeditor/plugins/showblocks/images/block_h4.png b/extend/ckeditor/plugins/showblocks/images/block_h4.png similarity index 100% rename from plugin/ckeditor/plugins/showblocks/images/block_h4.png rename to extend/ckeditor/plugins/showblocks/images/block_h4.png diff --git a/plugin/ckeditor/plugins/showblocks/images/block_h5.png b/extend/ckeditor/plugins/showblocks/images/block_h5.png similarity index 100% rename from plugin/ckeditor/plugins/showblocks/images/block_h5.png rename to extend/ckeditor/plugins/showblocks/images/block_h5.png diff --git a/plugin/ckeditor/plugins/showblocks/images/block_h6.png b/extend/ckeditor/plugins/showblocks/images/block_h6.png similarity index 100% rename from plugin/ckeditor/plugins/showblocks/images/block_h6.png rename to extend/ckeditor/plugins/showblocks/images/block_h6.png diff --git a/plugin/ckeditor/plugins/showblocks/images/block_p.png b/extend/ckeditor/plugins/showblocks/images/block_p.png similarity index 100% rename from plugin/ckeditor/plugins/showblocks/images/block_p.png rename to extend/ckeditor/plugins/showblocks/images/block_p.png diff --git a/plugin/ckeditor/plugins/showblocks/images/block_pre.png b/extend/ckeditor/plugins/showblocks/images/block_pre.png similarity index 100% rename from plugin/ckeditor/plugins/showblocks/images/block_pre.png rename to extend/ckeditor/plugins/showblocks/images/block_pre.png diff --git a/plugin/ckeditor/plugins/smiley/dialogs/smiley.js b/extend/ckeditor/plugins/smiley/dialogs/smiley.js similarity index 100% rename from plugin/ckeditor/plugins/smiley/dialogs/smiley.js rename to extend/ckeditor/plugins/smiley/dialogs/smiley.js diff --git a/plugin/ckeditor/plugins/smiley/images/angel_smile.gif b/extend/ckeditor/plugins/smiley/images/angel_smile.gif similarity index 100% rename from plugin/ckeditor/plugins/smiley/images/angel_smile.gif rename to extend/ckeditor/plugins/smiley/images/angel_smile.gif diff --git a/plugin/ckeditor/plugins/smiley/images/angry_smile.gif b/extend/ckeditor/plugins/smiley/images/angry_smile.gif similarity index 100% rename from plugin/ckeditor/plugins/smiley/images/angry_smile.gif rename to extend/ckeditor/plugins/smiley/images/angry_smile.gif diff --git a/plugin/ckeditor/plugins/smiley/images/broken_heart.gif b/extend/ckeditor/plugins/smiley/images/broken_heart.gif similarity index 100% rename from plugin/ckeditor/plugins/smiley/images/broken_heart.gif rename to extend/ckeditor/plugins/smiley/images/broken_heart.gif diff --git a/plugin/ckeditor/plugins/smiley/images/confused_smile.gif b/extend/ckeditor/plugins/smiley/images/confused_smile.gif similarity index 100% rename from plugin/ckeditor/plugins/smiley/images/confused_smile.gif rename to extend/ckeditor/plugins/smiley/images/confused_smile.gif diff --git a/plugin/ckeditor/plugins/smiley/images/cry_smile.gif b/extend/ckeditor/plugins/smiley/images/cry_smile.gif similarity index 100% rename from plugin/ckeditor/plugins/smiley/images/cry_smile.gif rename to extend/ckeditor/plugins/smiley/images/cry_smile.gif diff --git a/plugin/ckeditor/plugins/smiley/images/devil_smile.gif b/extend/ckeditor/plugins/smiley/images/devil_smile.gif similarity index 100% rename from plugin/ckeditor/plugins/smiley/images/devil_smile.gif rename to extend/ckeditor/plugins/smiley/images/devil_smile.gif diff --git a/plugin/ckeditor/plugins/smiley/images/embaressed_smile.gif b/extend/ckeditor/plugins/smiley/images/embaressed_smile.gif similarity index 100% rename from plugin/ckeditor/plugins/smiley/images/embaressed_smile.gif rename to extend/ckeditor/plugins/smiley/images/embaressed_smile.gif diff --git a/plugin/ckeditor/plugins/smiley/images/embarrassed_smile.gif b/extend/ckeditor/plugins/smiley/images/embarrassed_smile.gif similarity index 100% rename from plugin/ckeditor/plugins/smiley/images/embarrassed_smile.gif rename to extend/ckeditor/plugins/smiley/images/embarrassed_smile.gif diff --git a/plugin/ckeditor/plugins/smiley/images/envelope.gif b/extend/ckeditor/plugins/smiley/images/envelope.gif similarity index 100% rename from plugin/ckeditor/plugins/smiley/images/envelope.gif rename to extend/ckeditor/plugins/smiley/images/envelope.gif diff --git a/plugin/ckeditor/plugins/smiley/images/heart.gif b/extend/ckeditor/plugins/smiley/images/heart.gif similarity index 100% rename from plugin/ckeditor/plugins/smiley/images/heart.gif rename to extend/ckeditor/plugins/smiley/images/heart.gif diff --git a/plugin/ckeditor/plugins/smiley/images/kiss.gif b/extend/ckeditor/plugins/smiley/images/kiss.gif similarity index 100% rename from plugin/ckeditor/plugins/smiley/images/kiss.gif rename to extend/ckeditor/plugins/smiley/images/kiss.gif diff --git a/plugin/ckeditor/plugins/smiley/images/lightbulb.gif b/extend/ckeditor/plugins/smiley/images/lightbulb.gif similarity index 100% rename from plugin/ckeditor/plugins/smiley/images/lightbulb.gif rename to extend/ckeditor/plugins/smiley/images/lightbulb.gif diff --git a/plugin/ckeditor/plugins/smiley/images/omg_smile.gif b/extend/ckeditor/plugins/smiley/images/omg_smile.gif similarity index 100% rename from plugin/ckeditor/plugins/smiley/images/omg_smile.gif rename to extend/ckeditor/plugins/smiley/images/omg_smile.gif diff --git a/plugin/ckeditor/plugins/smiley/images/regular_smile.gif b/extend/ckeditor/plugins/smiley/images/regular_smile.gif similarity index 100% rename from plugin/ckeditor/plugins/smiley/images/regular_smile.gif rename to extend/ckeditor/plugins/smiley/images/regular_smile.gif diff --git a/plugin/ckeditor/plugins/smiley/images/sad_smile.gif b/extend/ckeditor/plugins/smiley/images/sad_smile.gif similarity index 100% rename from plugin/ckeditor/plugins/smiley/images/sad_smile.gif rename to extend/ckeditor/plugins/smiley/images/sad_smile.gif diff --git a/plugin/ckeditor/plugins/smiley/images/shades_smile.gif b/extend/ckeditor/plugins/smiley/images/shades_smile.gif similarity index 100% rename from plugin/ckeditor/plugins/smiley/images/shades_smile.gif rename to extend/ckeditor/plugins/smiley/images/shades_smile.gif diff --git a/plugin/ckeditor/plugins/smiley/images/teeth_smile.gif b/extend/ckeditor/plugins/smiley/images/teeth_smile.gif similarity index 100% rename from plugin/ckeditor/plugins/smiley/images/teeth_smile.gif rename to extend/ckeditor/plugins/smiley/images/teeth_smile.gif diff --git a/plugin/ckeditor/plugins/smiley/images/thumbs_down.gif b/extend/ckeditor/plugins/smiley/images/thumbs_down.gif similarity index 100% rename from plugin/ckeditor/plugins/smiley/images/thumbs_down.gif rename to extend/ckeditor/plugins/smiley/images/thumbs_down.gif diff --git a/plugin/ckeditor/plugins/smiley/images/thumbs_up.gif b/extend/ckeditor/plugins/smiley/images/thumbs_up.gif similarity index 100% rename from plugin/ckeditor/plugins/smiley/images/thumbs_up.gif rename to extend/ckeditor/plugins/smiley/images/thumbs_up.gif diff --git a/plugin/ckeditor/plugins/smiley/images/tongue_smile.gif b/extend/ckeditor/plugins/smiley/images/tongue_smile.gif similarity index 100% rename from plugin/ckeditor/plugins/smiley/images/tongue_smile.gif rename to extend/ckeditor/plugins/smiley/images/tongue_smile.gif diff --git a/plugin/ckeditor/plugins/smiley/images/tounge_smile.gif b/extend/ckeditor/plugins/smiley/images/tounge_smile.gif similarity index 100% rename from plugin/ckeditor/plugins/smiley/images/tounge_smile.gif rename to extend/ckeditor/plugins/smiley/images/tounge_smile.gif diff --git a/plugin/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.gif b/extend/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.gif similarity index 100% rename from plugin/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.gif rename to extend/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.gif diff --git a/plugin/ckeditor/plugins/smiley/images/wink_smile.gif b/extend/ckeditor/plugins/smiley/images/wink_smile.gif similarity index 100% rename from plugin/ckeditor/plugins/smiley/images/wink_smile.gif rename to extend/ckeditor/plugins/smiley/images/wink_smile.gif diff --git a/plugin/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt b/extend/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt similarity index 100% rename from plugin/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt rename to extend/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt diff --git a/plugin/ckeditor/plugins/specialchar/dialogs/lang/ca.js b/extend/ckeditor/plugins/specialchar/dialogs/lang/ca.js similarity index 100% rename from plugin/ckeditor/plugins/specialchar/dialogs/lang/ca.js rename to extend/ckeditor/plugins/specialchar/dialogs/lang/ca.js diff --git a/plugin/ckeditor/plugins/specialchar/dialogs/lang/cs.js b/extend/ckeditor/plugins/specialchar/dialogs/lang/cs.js similarity index 100% rename from plugin/ckeditor/plugins/specialchar/dialogs/lang/cs.js rename to extend/ckeditor/plugins/specialchar/dialogs/lang/cs.js diff --git a/plugin/ckeditor/plugins/specialchar/dialogs/lang/cy.js b/extend/ckeditor/plugins/specialchar/dialogs/lang/cy.js similarity index 100% rename from plugin/ckeditor/plugins/specialchar/dialogs/lang/cy.js rename to extend/ckeditor/plugins/specialchar/dialogs/lang/cy.js diff --git a/plugin/ckeditor/plugins/specialchar/dialogs/lang/de.js b/extend/ckeditor/plugins/specialchar/dialogs/lang/de.js similarity index 100% rename from plugin/ckeditor/plugins/specialchar/dialogs/lang/de.js rename to extend/ckeditor/plugins/specialchar/dialogs/lang/de.js diff --git a/plugin/ckeditor/plugins/specialchar/dialogs/lang/el.js b/extend/ckeditor/plugins/specialchar/dialogs/lang/el.js similarity index 100% rename from plugin/ckeditor/plugins/specialchar/dialogs/lang/el.js rename to extend/ckeditor/plugins/specialchar/dialogs/lang/el.js diff --git a/plugin/ckeditor/plugins/specialchar/dialogs/lang/en.js b/extend/ckeditor/plugins/specialchar/dialogs/lang/en.js similarity index 100% rename from plugin/ckeditor/plugins/specialchar/dialogs/lang/en.js rename to extend/ckeditor/plugins/specialchar/dialogs/lang/en.js diff --git a/plugin/ckeditor/plugins/specialchar/dialogs/lang/eo.js b/extend/ckeditor/plugins/specialchar/dialogs/lang/eo.js similarity index 100% rename from plugin/ckeditor/plugins/specialchar/dialogs/lang/eo.js rename to extend/ckeditor/plugins/specialchar/dialogs/lang/eo.js diff --git a/plugin/ckeditor/plugins/specialchar/dialogs/lang/et.js b/extend/ckeditor/plugins/specialchar/dialogs/lang/et.js similarity index 100% rename from plugin/ckeditor/plugins/specialchar/dialogs/lang/et.js rename to extend/ckeditor/plugins/specialchar/dialogs/lang/et.js diff --git a/plugin/ckeditor/plugins/specialchar/dialogs/lang/fa.js b/extend/ckeditor/plugins/specialchar/dialogs/lang/fa.js similarity index 100% rename from plugin/ckeditor/plugins/specialchar/dialogs/lang/fa.js rename to extend/ckeditor/plugins/specialchar/dialogs/lang/fa.js diff --git a/plugin/ckeditor/plugins/specialchar/dialogs/lang/fi.js b/extend/ckeditor/plugins/specialchar/dialogs/lang/fi.js similarity index 100% rename from plugin/ckeditor/plugins/specialchar/dialogs/lang/fi.js rename to extend/ckeditor/plugins/specialchar/dialogs/lang/fi.js diff --git a/plugin/ckeditor/plugins/specialchar/dialogs/lang/fr.js b/extend/ckeditor/plugins/specialchar/dialogs/lang/fr.js similarity index 100% rename from plugin/ckeditor/plugins/specialchar/dialogs/lang/fr.js rename to extend/ckeditor/plugins/specialchar/dialogs/lang/fr.js diff --git a/plugin/ckeditor/plugins/specialchar/dialogs/lang/he.js b/extend/ckeditor/plugins/specialchar/dialogs/lang/he.js similarity index 100% rename from plugin/ckeditor/plugins/specialchar/dialogs/lang/he.js rename to extend/ckeditor/plugins/specialchar/dialogs/lang/he.js diff --git a/plugin/ckeditor/plugins/specialchar/dialogs/lang/hr.js b/extend/ckeditor/plugins/specialchar/dialogs/lang/hr.js similarity index 100% rename from plugin/ckeditor/plugins/specialchar/dialogs/lang/hr.js rename to extend/ckeditor/plugins/specialchar/dialogs/lang/hr.js diff --git a/plugin/ckeditor/plugins/specialchar/dialogs/lang/it.js b/extend/ckeditor/plugins/specialchar/dialogs/lang/it.js similarity index 100% rename from plugin/ckeditor/plugins/specialchar/dialogs/lang/it.js rename to extend/ckeditor/plugins/specialchar/dialogs/lang/it.js diff --git a/plugin/ckeditor/plugins/specialchar/dialogs/lang/ku.js b/extend/ckeditor/plugins/specialchar/dialogs/lang/ku.js similarity index 100% rename from plugin/ckeditor/plugins/specialchar/dialogs/lang/ku.js rename to extend/ckeditor/plugins/specialchar/dialogs/lang/ku.js diff --git a/plugin/ckeditor/plugins/specialchar/dialogs/lang/lv.js b/extend/ckeditor/plugins/specialchar/dialogs/lang/lv.js similarity index 100% rename from plugin/ckeditor/plugins/specialchar/dialogs/lang/lv.js rename to extend/ckeditor/plugins/specialchar/dialogs/lang/lv.js diff --git a/plugin/ckeditor/plugins/specialchar/dialogs/lang/nb.js b/extend/ckeditor/plugins/specialchar/dialogs/lang/nb.js similarity index 100% rename from plugin/ckeditor/plugins/specialchar/dialogs/lang/nb.js rename to extend/ckeditor/plugins/specialchar/dialogs/lang/nb.js diff --git a/plugin/ckeditor/plugins/specialchar/dialogs/lang/nl.js b/extend/ckeditor/plugins/specialchar/dialogs/lang/nl.js similarity index 100% rename from plugin/ckeditor/plugins/specialchar/dialogs/lang/nl.js rename to extend/ckeditor/plugins/specialchar/dialogs/lang/nl.js diff --git a/plugin/ckeditor/plugins/specialchar/dialogs/lang/no.js b/extend/ckeditor/plugins/specialchar/dialogs/lang/no.js similarity index 100% rename from plugin/ckeditor/plugins/specialchar/dialogs/lang/no.js rename to extend/ckeditor/plugins/specialchar/dialogs/lang/no.js diff --git a/plugin/ckeditor/plugins/specialchar/dialogs/lang/pt-br.js b/extend/ckeditor/plugins/specialchar/dialogs/lang/pt-br.js similarity index 100% rename from plugin/ckeditor/plugins/specialchar/dialogs/lang/pt-br.js rename to extend/ckeditor/plugins/specialchar/dialogs/lang/pt-br.js diff --git a/plugin/ckeditor/plugins/specialchar/dialogs/lang/sk.js b/extend/ckeditor/plugins/specialchar/dialogs/lang/sk.js similarity index 100% rename from plugin/ckeditor/plugins/specialchar/dialogs/lang/sk.js rename to extend/ckeditor/plugins/specialchar/dialogs/lang/sk.js diff --git a/plugin/ckeditor/plugins/specialchar/dialogs/lang/tr.js b/extend/ckeditor/plugins/specialchar/dialogs/lang/tr.js similarity index 100% rename from plugin/ckeditor/plugins/specialchar/dialogs/lang/tr.js rename to extend/ckeditor/plugins/specialchar/dialogs/lang/tr.js diff --git a/plugin/ckeditor/plugins/specialchar/dialogs/lang/ug.js b/extend/ckeditor/plugins/specialchar/dialogs/lang/ug.js similarity index 100% rename from plugin/ckeditor/plugins/specialchar/dialogs/lang/ug.js rename to extend/ckeditor/plugins/specialchar/dialogs/lang/ug.js diff --git a/plugin/ckeditor/plugins/specialchar/dialogs/lang/zh-cn.js b/extend/ckeditor/plugins/specialchar/dialogs/lang/zh-cn.js similarity index 100% rename from plugin/ckeditor/plugins/specialchar/dialogs/lang/zh-cn.js rename to extend/ckeditor/plugins/specialchar/dialogs/lang/zh-cn.js diff --git a/plugin/ckeditor/plugins/specialchar/dialogs/specialchar.js b/extend/ckeditor/plugins/specialchar/dialogs/specialchar.js similarity index 100% rename from plugin/ckeditor/plugins/specialchar/dialogs/specialchar.js rename to extend/ckeditor/plugins/specialchar/dialogs/specialchar.js diff --git a/plugin/ckeditor/plugins/table/dialogs/table.js b/extend/ckeditor/plugins/table/dialogs/table.js similarity index 100% rename from plugin/ckeditor/plugins/table/dialogs/table.js rename to extend/ckeditor/plugins/table/dialogs/table.js diff --git a/plugin/ckeditor/plugins/tabletools/dialogs/tableCell.js b/extend/ckeditor/plugins/tabletools/dialogs/tableCell.js similarity index 100% rename from plugin/ckeditor/plugins/tabletools/dialogs/tableCell.js rename to extend/ckeditor/plugins/tabletools/dialogs/tableCell.js diff --git a/plugin/ckeditor/plugins/templates/dialogs/templates.css b/extend/ckeditor/plugins/templates/dialogs/templates.css similarity index 100% rename from plugin/ckeditor/plugins/templates/dialogs/templates.css rename to extend/ckeditor/plugins/templates/dialogs/templates.css diff --git a/plugin/ckeditor/plugins/templates/dialogs/templates.js b/extend/ckeditor/plugins/templates/dialogs/templates.js similarity index 100% rename from plugin/ckeditor/plugins/templates/dialogs/templates.js rename to extend/ckeditor/plugins/templates/dialogs/templates.js diff --git a/plugin/ckeditor/plugins/templates/templates/default.js b/extend/ckeditor/plugins/templates/templates/default.js similarity index 100% rename from plugin/ckeditor/plugins/templates/templates/default.js rename to extend/ckeditor/plugins/templates/templates/default.js diff --git a/plugin/ckeditor/plugins/templates/templates/images/template1.gif b/extend/ckeditor/plugins/templates/templates/images/template1.gif similarity index 100% rename from plugin/ckeditor/plugins/templates/templates/images/template1.gif rename to extend/ckeditor/plugins/templates/templates/images/template1.gif diff --git a/plugin/ckeditor/plugins/templates/templates/images/template2.gif b/extend/ckeditor/plugins/templates/templates/images/template2.gif similarity index 100% rename from plugin/ckeditor/plugins/templates/templates/images/template2.gif rename to extend/ckeditor/plugins/templates/templates/images/template2.gif diff --git a/plugin/ckeditor/plugins/templates/templates/images/template3.gif b/extend/ckeditor/plugins/templates/templates/images/template3.gif similarity index 100% rename from plugin/ckeditor/plugins/templates/templates/images/template3.gif rename to extend/ckeditor/plugins/templates/templates/images/template3.gif diff --git a/plugin/ckeditor/samples/ajax.html b/extend/ckeditor/samples/ajax.html similarity index 100% rename from plugin/ckeditor/samples/ajax.html rename to extend/ckeditor/samples/ajax.html diff --git a/plugin/ckeditor/samples/api.html b/extend/ckeditor/samples/api.html similarity index 100% rename from plugin/ckeditor/samples/api.html rename to extend/ckeditor/samples/api.html diff --git a/plugin/ckeditor/samples/appendto.html b/extend/ckeditor/samples/appendto.html similarity index 100% rename from plugin/ckeditor/samples/appendto.html rename to extend/ckeditor/samples/appendto.html diff --git a/plugin/ckeditor/samples/assets/inlineall/logo.png b/extend/ckeditor/samples/assets/inlineall/logo.png similarity index 100% rename from plugin/ckeditor/samples/assets/inlineall/logo.png rename to extend/ckeditor/samples/assets/inlineall/logo.png diff --git a/plugin/ckeditor/samples/assets/outputxhtml/outputxhtml.css b/extend/ckeditor/samples/assets/outputxhtml/outputxhtml.css similarity index 100% rename from plugin/ckeditor/samples/assets/outputxhtml/outputxhtml.css rename to extend/ckeditor/samples/assets/outputxhtml/outputxhtml.css diff --git a/plugin/ckeditor/samples/assets/posteddata.php b/extend/ckeditor/samples/assets/posteddata.php similarity index 100% rename from plugin/ckeditor/samples/assets/posteddata.php rename to extend/ckeditor/samples/assets/posteddata.php diff --git a/plugin/ckeditor/samples/assets/sample.css b/extend/ckeditor/samples/assets/sample.css similarity index 100% rename from plugin/ckeditor/samples/assets/sample.css rename to extend/ckeditor/samples/assets/sample.css diff --git a/plugin/ckeditor/samples/assets/sample.jpg b/extend/ckeditor/samples/assets/sample.jpg similarity index 100% rename from plugin/ckeditor/samples/assets/sample.jpg rename to extend/ckeditor/samples/assets/sample.jpg diff --git a/plugin/ckeditor/samples/assets/uilanguages/languages.js b/extend/ckeditor/samples/assets/uilanguages/languages.js similarity index 100% rename from plugin/ckeditor/samples/assets/uilanguages/languages.js rename to extend/ckeditor/samples/assets/uilanguages/languages.js diff --git a/plugin/ckeditor/samples/divreplace.html b/extend/ckeditor/samples/divreplace.html similarity index 100% rename from plugin/ckeditor/samples/divreplace.html rename to extend/ckeditor/samples/divreplace.html diff --git a/plugin/ckeditor/samples/index.html b/extend/ckeditor/samples/index.html similarity index 100% rename from plugin/ckeditor/samples/index.html rename to extend/ckeditor/samples/index.html diff --git a/plugin/ckeditor/samples/inlineall.html b/extend/ckeditor/samples/inlineall.html similarity index 100% rename from plugin/ckeditor/samples/inlineall.html rename to extend/ckeditor/samples/inlineall.html diff --git a/plugin/ckeditor/samples/inlinebycode.html b/extend/ckeditor/samples/inlinebycode.html similarity index 100% rename from plugin/ckeditor/samples/inlinebycode.html rename to extend/ckeditor/samples/inlinebycode.html diff --git a/plugin/ckeditor/samples/plugins/dialog/assets/my_dialog.js b/extend/ckeditor/samples/plugins/dialog/assets/my_dialog.js similarity index 100% rename from plugin/ckeditor/samples/plugins/dialog/assets/my_dialog.js rename to extend/ckeditor/samples/plugins/dialog/assets/my_dialog.js diff --git a/plugin/ckeditor/samples/plugins/dialog/dialog.html b/extend/ckeditor/samples/plugins/dialog/dialog.html similarity index 100% rename from plugin/ckeditor/samples/plugins/dialog/dialog.html rename to extend/ckeditor/samples/plugins/dialog/dialog.html diff --git a/plugin/ckeditor/samples/plugins/enterkey/enterkey.html b/extend/ckeditor/samples/plugins/enterkey/enterkey.html similarity index 100% rename from plugin/ckeditor/samples/plugins/enterkey/enterkey.html rename to extend/ckeditor/samples/plugins/enterkey/enterkey.html diff --git a/plugin/ckeditor/samples/plugins/htmlwriter/assets/outputforflash/outputforflash.fla b/extend/ckeditor/samples/plugins/htmlwriter/assets/outputforflash/outputforflash.fla similarity index 100% rename from plugin/ckeditor/samples/plugins/htmlwriter/assets/outputforflash/outputforflash.fla rename to extend/ckeditor/samples/plugins/htmlwriter/assets/outputforflash/outputforflash.fla diff --git a/plugin/ckeditor/samples/plugins/htmlwriter/assets/outputforflash/outputforflash.swf b/extend/ckeditor/samples/plugins/htmlwriter/assets/outputforflash/outputforflash.swf similarity index 100% rename from plugin/ckeditor/samples/plugins/htmlwriter/assets/outputforflash/outputforflash.swf rename to extend/ckeditor/samples/plugins/htmlwriter/assets/outputforflash/outputforflash.swf diff --git a/plugin/ckeditor/samples/plugins/htmlwriter/assets/outputforflash/swfobject.js b/extend/ckeditor/samples/plugins/htmlwriter/assets/outputforflash/swfobject.js similarity index 100% rename from plugin/ckeditor/samples/plugins/htmlwriter/assets/outputforflash/swfobject.js rename to extend/ckeditor/samples/plugins/htmlwriter/assets/outputforflash/swfobject.js diff --git a/plugin/ckeditor/samples/plugins/htmlwriter/outputforflash.html b/extend/ckeditor/samples/plugins/htmlwriter/outputforflash.html similarity index 100% rename from plugin/ckeditor/samples/plugins/htmlwriter/outputforflash.html rename to extend/ckeditor/samples/plugins/htmlwriter/outputforflash.html diff --git a/plugin/ckeditor/samples/plugins/htmlwriter/outputhtml.html b/extend/ckeditor/samples/plugins/htmlwriter/outputhtml.html similarity index 100% rename from plugin/ckeditor/samples/plugins/htmlwriter/outputhtml.html rename to extend/ckeditor/samples/plugins/htmlwriter/outputhtml.html diff --git a/plugin/ckeditor/samples/plugins/magicline/magicline.html b/extend/ckeditor/samples/plugins/magicline/magicline.html similarity index 100% rename from plugin/ckeditor/samples/plugins/magicline/magicline.html rename to extend/ckeditor/samples/plugins/magicline/magicline.html diff --git a/plugin/ckeditor/samples/plugins/toolbar/toolbar.html b/extend/ckeditor/samples/plugins/toolbar/toolbar.html similarity index 100% rename from plugin/ckeditor/samples/plugins/toolbar/toolbar.html rename to extend/ckeditor/samples/plugins/toolbar/toolbar.html diff --git a/plugin/ckeditor/samples/plugins/wysiwygarea/fullpage.html b/extend/ckeditor/samples/plugins/wysiwygarea/fullpage.html similarity index 100% rename from plugin/ckeditor/samples/plugins/wysiwygarea/fullpage.html rename to extend/ckeditor/samples/plugins/wysiwygarea/fullpage.html diff --git a/plugin/ckeditor/samples/readonly.html b/extend/ckeditor/samples/readonly.html similarity index 100% rename from plugin/ckeditor/samples/readonly.html rename to extend/ckeditor/samples/readonly.html diff --git a/plugin/ckeditor/samples/replacebyclass.html b/extend/ckeditor/samples/replacebyclass.html similarity index 100% rename from plugin/ckeditor/samples/replacebyclass.html rename to extend/ckeditor/samples/replacebyclass.html diff --git a/plugin/ckeditor/samples/replacebycode.html b/extend/ckeditor/samples/replacebycode.html similarity index 100% rename from plugin/ckeditor/samples/replacebycode.html rename to extend/ckeditor/samples/replacebycode.html diff --git a/plugin/ckeditor/samples/sample.css b/extend/ckeditor/samples/sample.css similarity index 100% rename from plugin/ckeditor/samples/sample.css rename to extend/ckeditor/samples/sample.css diff --git a/plugin/ckeditor/samples/sample.js b/extend/ckeditor/samples/sample.js similarity index 100% rename from plugin/ckeditor/samples/sample.js rename to extend/ckeditor/samples/sample.js diff --git a/plugin/ckeditor/samples/sample_posteddata.php b/extend/ckeditor/samples/sample_posteddata.php similarity index 100% rename from plugin/ckeditor/samples/sample_posteddata.php rename to extend/ckeditor/samples/sample_posteddata.php diff --git a/plugin/ckeditor/samples/tabindex.html b/extend/ckeditor/samples/tabindex.html similarity index 100% rename from plugin/ckeditor/samples/tabindex.html rename to extend/ckeditor/samples/tabindex.html diff --git a/plugin/ckeditor/samples/uicolor.html b/extend/ckeditor/samples/uicolor.html similarity index 100% rename from plugin/ckeditor/samples/uicolor.html rename to extend/ckeditor/samples/uicolor.html diff --git a/plugin/ckeditor/samples/uilanguages.html b/extend/ckeditor/samples/uilanguages.html similarity index 100% rename from plugin/ckeditor/samples/uilanguages.html rename to extend/ckeditor/samples/uilanguages.html diff --git a/plugin/ckeditor/samples/xhtmlstyle.html b/extend/ckeditor/samples/xhtmlstyle.html similarity index 100% rename from plugin/ckeditor/samples/xhtmlstyle.html rename to extend/ckeditor/samples/xhtmlstyle.html diff --git a/plugin/ckeditor/skins/moono/dialog.css b/extend/ckeditor/skins/moono/dialog.css similarity index 100% rename from plugin/ckeditor/skins/moono/dialog.css rename to extend/ckeditor/skins/moono/dialog.css diff --git a/plugin/ckeditor/skins/moono/dialog_ie.css b/extend/ckeditor/skins/moono/dialog_ie.css similarity index 100% rename from plugin/ckeditor/skins/moono/dialog_ie.css rename to extend/ckeditor/skins/moono/dialog_ie.css diff --git a/plugin/ckeditor/skins/moono/dialog_ie7.css b/extend/ckeditor/skins/moono/dialog_ie7.css similarity index 100% rename from plugin/ckeditor/skins/moono/dialog_ie7.css rename to extend/ckeditor/skins/moono/dialog_ie7.css diff --git a/plugin/ckeditor/skins/moono/dialog_ie8.css b/extend/ckeditor/skins/moono/dialog_ie8.css similarity index 100% rename from plugin/ckeditor/skins/moono/dialog_ie8.css rename to extend/ckeditor/skins/moono/dialog_ie8.css diff --git a/plugin/ckeditor/skins/moono/dialog_opera.css b/extend/ckeditor/skins/moono/dialog_opera.css similarity index 100% rename from plugin/ckeditor/skins/moono/dialog_opera.css rename to extend/ckeditor/skins/moono/dialog_opera.css diff --git a/plugin/ckeditor/skins/moono/editor.css b/extend/ckeditor/skins/moono/editor.css similarity index 100% rename from plugin/ckeditor/skins/moono/editor.css rename to extend/ckeditor/skins/moono/editor.css diff --git a/plugin/ckeditor/skins/moono/editor_gecko.css b/extend/ckeditor/skins/moono/editor_gecko.css similarity index 100% rename from plugin/ckeditor/skins/moono/editor_gecko.css rename to extend/ckeditor/skins/moono/editor_gecko.css diff --git a/plugin/ckeditor/skins/moono/editor_ie.css b/extend/ckeditor/skins/moono/editor_ie.css similarity index 100% rename from plugin/ckeditor/skins/moono/editor_ie.css rename to extend/ckeditor/skins/moono/editor_ie.css diff --git a/plugin/ckeditor/skins/moono/editor_ie7.css b/extend/ckeditor/skins/moono/editor_ie7.css similarity index 100% rename from plugin/ckeditor/skins/moono/editor_ie7.css rename to extend/ckeditor/skins/moono/editor_ie7.css diff --git a/plugin/ckeditor/skins/moono/editor_ie8.css b/extend/ckeditor/skins/moono/editor_ie8.css similarity index 100% rename from plugin/ckeditor/skins/moono/editor_ie8.css rename to extend/ckeditor/skins/moono/editor_ie8.css diff --git a/plugin/ckeditor/skins/moono/icons.png b/extend/ckeditor/skins/moono/icons.png similarity index 100% rename from plugin/ckeditor/skins/moono/icons.png rename to extend/ckeditor/skins/moono/icons.png diff --git a/plugin/ckeditor/skins/moono/images/arrow.png b/extend/ckeditor/skins/moono/images/arrow.png similarity index 100% rename from plugin/ckeditor/skins/moono/images/arrow.png rename to extend/ckeditor/skins/moono/images/arrow.png diff --git a/plugin/ckeditor/skins/moono/images/close.png b/extend/ckeditor/skins/moono/images/close.png similarity index 100% rename from plugin/ckeditor/skins/moono/images/close.png rename to extend/ckeditor/skins/moono/images/close.png diff --git a/plugin/ckeditor/skins/moono/images/mini.png b/extend/ckeditor/skins/moono/images/mini.png similarity index 100% rename from plugin/ckeditor/skins/moono/images/mini.png rename to extend/ckeditor/skins/moono/images/mini.png diff --git a/plugin/ckeditor/skins/moono/readme.md b/extend/ckeditor/skins/moono/readme.md similarity index 100% rename from plugin/ckeditor/skins/moono/readme.md rename to extend/ckeditor/skins/moono/readme.md diff --git a/plugin/ckeditor/styles.js b/extend/ckeditor/styles.js similarity index 100% rename from plugin/ckeditor/styles.js rename to extend/ckeditor/styles.js diff --git a/plugin/ckeditor/upload.php b/extend/ckeditor/upload.php similarity index 82% rename from plugin/ckeditor/upload.php rename to extend/ckeditor/upload.php index 7ac439b0b..c209a5eeb 100644 --- a/plugin/ckeditor/upload.php +++ b/extend/ckeditor/upload.php @@ -2,14 +2,14 @@ $g4_path = "../.."; // common.php 의 상대 경로 include_once("$g4_path/common.php"); -$up_dir = $g4['path'].'/'.$editor->data;; // 기본 업로드 폴더 +$up_dir = $g4['path'].'/'.$ckeditor->data;; // 기본 업로드 폴더 @mkdir($up_dir, 0707); @chmod($up_dir, 0707); $ym = date('ym', $g4['server_time']); -$data_dir = $g4['path'].'/'.$editor->data.'/'.$ym; -$data_url = $g4['url'] .'/'.$editor->data.'/'.$ym; +$data_dir = $g4['path'].'/'.$ckeditor->data.'/'.$ym; +$data_url = $g4['url'] .'/'.$ckeditor->data.'/'.$ym; @mkdir($data_dir, 0707); @chmod($data_dir, 0707); diff --git a/extend/gcaptcha.extend.php b/extend/gcaptcha.extend.php new file mode 100644 index 000000000..e12abd387 --- /dev/null +++ b/extend/gcaptcha.extend.php @@ -0,0 +1,20 @@ +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 diff --git a/plugin/captcha/_common.php b/extend/gcaptcha/_common.php similarity index 100% rename from plugin/captcha/_common.php rename to extend/gcaptcha/_common.php diff --git a/plugin/captcha/example.php b/extend/gcaptcha/example.php similarity index 100% rename from plugin/captcha/example.php rename to extend/gcaptcha/example.php diff --git a/plugin/captcha/fonts/.htaccess b/extend/gcaptcha/fonts/.htaccess similarity index 100% rename from plugin/captcha/fonts/.htaccess rename to extend/gcaptcha/fonts/.htaccess diff --git a/plugin/captcha/fonts/DAUM_FONTS_LICENSE.txt b/extend/gcaptcha/fonts/DAUM_FONTS_LICENSE.txt similarity index 100% rename from plugin/captcha/fonts/DAUM_FONTS_LICENSE.txt rename to extend/gcaptcha/fonts/DAUM_FONTS_LICENSE.txt diff --git a/plugin/captcha/fonts/NAVER_FONTS_LICENSE.txt b/extend/gcaptcha/fonts/NAVER_FONTS_LICENSE.txt similarity index 100% rename from plugin/captcha/fonts/NAVER_FONTS_LICENSE.txt rename to extend/gcaptcha/fonts/NAVER_FONTS_LICENSE.txt diff --git a/plugin/captcha/fonts/NanumGothic.ttf b/extend/gcaptcha/fonts/NanumGothic.ttf similarity index 100% rename from plugin/captcha/fonts/NanumGothic.ttf rename to extend/gcaptcha/fonts/NanumGothic.ttf diff --git a/plugin/captcha/fonts/NanumMyeongjo.ttf b/extend/gcaptcha/fonts/NanumMyeongjo.ttf similarity index 100% rename from plugin/captcha/fonts/NanumMyeongjo.ttf rename to extend/gcaptcha/fonts/NanumMyeongjo.ttf diff --git a/plugin/captcha/captcha.js b/extend/gcaptcha/gcaptcha.js similarity index 74% rename from plugin/captcha/captcha.js rename to extend/gcaptcha/gcaptcha.js index 244995d5d..10ffd978c 100644 --- a/plugin/captcha/captcha.js +++ b/extend/gcaptcha/gcaptcha.js @@ -1,22 +1,25 @@ -function check_captcha(input_key) +function chk_captcha() { - if (typeof(input_key) != "undefined") { - var captcha_result = false; - $.ajax({ - type: "POST", - url: g4_path+"/plugin/captcha/get.php", - data: { "captcha_key": input_key.value }, - cache: false, - async: false, - success: function(result) { - captcha_result = result; - } - }); - if (!captcha_result) { - alert("숫자가 틀렸거나 입력 횟수가 넘었습니다.\n\n이미지를 클릭하여 다시 입력해 주십시오."); - input_key.select(); - return false; + var captcha_key = document.getElementById("captcha_key"); + if (typeof(captcha_key) == "undefined") return true; + + var captcha_result = false; + $.ajax({ + type: "POST", + url: g4_gcaptcha_path+"/get.php", + data: { + "captcha_key": captcha_key.value + }, + cache: false, + async: false, + success: function(result) { + captcha_result = result; } + }); + if (!captcha_result) { + alert("스팸방지 숫자가 틀렸습니다."); + captcha_key.select(); + return false; } return true; } diff --git a/plugin/captcha/captcha.lib.php b/extend/gcaptcha/gcaptcha.lib.php similarity index 63% rename from plugin/captcha/captcha.lib.php rename to extend/gcaptcha/gcaptcha.lib.php index aa33fb500..5233340b3 100644 --- a/plugin/captcha/captcha.lib.php +++ b/extend/gcaptcha/gcaptcha.lib.php @@ -1,20 +1,20 @@ 255, 'g'=>255, 'b'=>255); // 글자색상 rgb @@ -22,7 +22,7 @@ class captcha // 그림자 글자색상 rgb var $shadow = array('r'=>128, 'g'=>128, 'b'=>128); - var $captcha_length = 5; + var $captcha_length = 6; // 이미지 크기 function set_box_size($width, $height) { @@ -78,13 +78,13 @@ class captcha function run() { - global $captcha; + global $gcaptcha; // The text to draw $captcha_key = $this->get_captcha_key(); - set_session('ss_captcha_key', $captcha_key); set_session('ss_captcha_cnt', 0); + set_session('ss_captcha_key', $captcha_key); // Set the content-type //header('Content-Type: image/png'); @@ -99,7 +99,7 @@ class captcha // Replace path by your own font path $fonts = Array(); - foreach (glob($captcha->fonts.'/*.ttf') as $filename) { + foreach (glob($gcaptcha->fonts.'/*.ttf') as $filename) { $fonts[] = $filename; } $font = $fonts[mt_rand(0, count($fonts)-1)]; @@ -119,7 +119,7 @@ class captcha imagettftext($im, $size, $angle, $x-2, $y-2, $grey, $font, $captcha_key); } - imagepng($im, captcha_file_path('.png'), 0, NULL); + imagepng($im, captcha_file('.png'), 0, NULL); imagedestroy($im); make_wav(); @@ -128,76 +128,69 @@ class captcha /* 사용법 : -$captcha = new captcha(); -$captcha->set_captcha_length(mt_rand(4, 6)); -$captcha->set_position(mt_rand(0, 10), mt_rand(15, 20)); -$captcha->set_angle(mt_rand(-3, 3)); -$captcha->set_size(mt_rand(15, 16)); -$captcha->set_back_color(mt_rand(200,255), mt_rand(200,255), mt_rand(200,255)); -$captcha->set_text_color(mt_rand(0,100), mt_rand(0,100), mt_rand(0,100)); -$captcha->set_shadow_color(mt_rand(100,200), mt_rand(100,200), mt_rand(100,200)); -$captcha->run(); +$gcaptcha = new gcaptcha(); +$gcaptcha->set_captcha_length(mt_rand(4, 6)); +$gcaptcha->set_position(mt_rand(0, 10), mt_rand(15, 20)); +$gcaptcha->set_angle(mt_rand(-3, 3)); +$gcaptcha->set_size(mt_rand(15, 16)); +$gcaptcha->set_back_color(mt_rand(200,255), mt_rand(200,255), mt_rand(200,255)); +$gcaptcha->set_text_color(mt_rand(0,100), mt_rand(0,100), mt_rand(0,100)); +$gcaptcha->set_shadow_color(mt_rand(100,200), mt_rand(100,200), mt_rand(100,200)); +$gcaptcha->run(); */ // 캡챠이미지는 한개만 사용 가능함. -function captcha_html($input_name, $captcha_id_suffix='') +function captcha_html($class="captcha") { - global $g4; + global $g4, $gcaptcha; - // 세션생성을 한후 다음페이지에서 해당 세션이 있을때만 올바른 캡챠코드인지 비교합니다. - set_session('ss_captcha_use', true); + $gcaptcha->obj = new gcaptcha(); + $gcaptcha->obj->run(); - $html = '
'; - $html .= '자동등록방지'; - //$html .= '자동등록방지 이미지'; - $html .= ''; - //$html .= '새로고침'; - $html .= '음성듣기'; - $html .= ''; - $html .= ''; - $html .= '

이미지의 숫자를 순서대로 입력하세요. 새로고침을 클릭하시면 새로운 숫자가 나타납니다.

'; + $html = '
'; + $html .= '스팸방지'; + $html .= ''; + $html .= '음성듣기'; + $html .= ''; + $html .= ''; + $html .= '

스팸방지 숫자를 순서대로 입력하세요.

'; $html .= '
'; return $html; } -function chk_captcha($input_name) +function chk_captcha() { - if (get_session('ss_captcha_use')) { - $key = get_session('ss_captcha_key'); - if (!($key && $key == $_POST[$input_name])) { - set_session('ss_captcha_key', ''); - return false; - } + $captcha_cnt = (int)$_SESSION['ss_captcha_cnt']; + if ($captcha_cnt > 5) return false; + + if (!isset($_POST['captcha_key'])) return false; + if ($_POST['captcha_key'] != $_SESSION['ss_captcha_key']) { + $_SESSION['ss_captcha_cnt'] = $captcha_cnt + 1; + return false; } return true; } -// captcha javascript code -function captcha_js($element) -{ - return "if (!check_captcha({$element})) { return false; }"; -} - function make_wav() { - global $g4; - $wavs_dir = $g4['path'].'/plugin/captcha/wavs/'; + global $g4, $gcaptcha; + $number = (string)$_SESSION['ss_captcha_key']; $wavs = array(); for($i=0;$iwavs.'/'.$number[$i].'.wav'; $wavs[] = $file; } - $wav_filepath = captcha_file_path('.wav'); + $wav_filepath = captcha_file('.wav'); $fp = fopen($wav_filepath, 'w+'); - fwrite($fp, joinwavs($wavs)); + fwrite($fp, join_wavs($wavs)); fclose($fp); } -function joinwavs($wavs) +function join_wavs($wavs) { $fields = join('/',array( 'H8ChunkID', 'VChunkSize', 'H8Format', 'H8Subchunk1ID', 'VSubchunk1Size', @@ -242,4 +235,14 @@ function joinwavs($wavs) .pack('V', strlen($data)) .$data; } + + +// 캡챠 파일의 상대 경로를 반환 +function captcha_file($extension='.png') +{ + global $g4; + mk_subdir($g4['cache_dir']); + $captcha_path = mk_subdir($g4['cache_dir'].'/'.$g4['captcha_dir']); + return $captcha_path.'/'.abs_ip2long().'_'.$_COOKIE['PHPSESSID'].$extension; +} ?> diff --git a/extend/gcaptcha/get.php b/extend/gcaptcha/get.php new file mode 100644 index 000000000..09898e9d3 --- /dev/null +++ b/extend/gcaptcha/get.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/plugin/captcha/img/dot.gif b/extend/gcaptcha/img/dot.gif similarity index 100% rename from plugin/captcha/img/dot.gif rename to extend/gcaptcha/img/dot.gif diff --git a/plugin/captcha/info.php b/extend/gcaptcha/info.php similarity index 100% rename from plugin/captcha/info.php rename to extend/gcaptcha/info.php diff --git a/plugin/captcha/run.php b/extend/gcaptcha/run.php similarity index 100% rename from plugin/captcha/run.php rename to extend/gcaptcha/run.php diff --git a/plugin/captcha/wav.php b/extend/gcaptcha/wav.php similarity index 100% rename from plugin/captcha/wav.php rename to extend/gcaptcha/wav.php diff --git a/plugin/captcha/wavs/0.wav b/extend/gcaptcha/wavs/0.wav similarity index 100% rename from plugin/captcha/wavs/0.wav rename to extend/gcaptcha/wavs/0.wav diff --git a/plugin/captcha/wavs/1.wav b/extend/gcaptcha/wavs/1.wav similarity index 100% rename from plugin/captcha/wavs/1.wav rename to extend/gcaptcha/wavs/1.wav diff --git a/plugin/captcha/wavs/2.wav b/extend/gcaptcha/wavs/2.wav similarity index 100% rename from plugin/captcha/wavs/2.wav rename to extend/gcaptcha/wavs/2.wav diff --git a/plugin/captcha/wavs/3.wav b/extend/gcaptcha/wavs/3.wav similarity index 100% rename from plugin/captcha/wavs/3.wav rename to extend/gcaptcha/wavs/3.wav diff --git a/plugin/captcha/wavs/4.wav b/extend/gcaptcha/wavs/4.wav similarity index 100% rename from plugin/captcha/wavs/4.wav rename to extend/gcaptcha/wavs/4.wav diff --git a/plugin/captcha/wavs/5.wav b/extend/gcaptcha/wavs/5.wav similarity index 100% rename from plugin/captcha/wavs/5.wav rename to extend/gcaptcha/wavs/5.wav diff --git a/plugin/captcha/wavs/6.wav b/extend/gcaptcha/wavs/6.wav similarity index 100% rename from plugin/captcha/wavs/6.wav rename to extend/gcaptcha/wavs/6.wav diff --git a/plugin/captcha/wavs/7.wav b/extend/gcaptcha/wavs/7.wav similarity index 100% rename from plugin/captcha/wavs/7.wav rename to extend/gcaptcha/wavs/7.wav diff --git a/plugin/captcha/wavs/8.wav b/extend/gcaptcha/wavs/8.wav similarity index 100% rename from plugin/captcha/wavs/8.wav rename to extend/gcaptcha/wavs/8.wav diff --git a/plugin/captcha/wavs/9.wav b/extend/gcaptcha/wavs/9.wav similarity index 100% rename from plugin/captcha/wavs/9.wav rename to extend/gcaptcha/wavs/9.wav diff --git a/head.sub.php b/head.sub.php index 997f9c794..380996e3a 100644 --- a/head.sub.php +++ b/head.sub.php @@ -50,10 +50,13 @@ header("Pragma: no-cache"); // HTTP/1.0 <?=$g4['title']?> -"> +"> -"> +"> + - - - js; - $g4['js_file'][] = $editor->config_js; +if (!empty($g4['js_code'])) { + foreach ($g4['js_code'] as $key=>$value) { + echo $value."\n"; + } } ?> - + + + + $value) { echo "\n"; } } - -if (!empty($g4['js_code'])) { - foreach ($g4['js_code'] as $key=>$value) { - echo "\n"; - } -} ?> diff --git a/js/wrest.js b/js/wrest.js index 32e38169f..c909a6932 100644 --- a/js/wrest.js +++ b/js/wrest.js @@ -63,7 +63,8 @@ function wrestHangul(fld) { if (!wrestTrim(fld)) return; - var pattern = /([^가-힣\x20])/i; + //var pattern = /([^가-힣\x20])/i; + var pattern = /([^가-힣\x20])/; if (pattern.test(fld.value)) { if (wrestFld == null) { @@ -79,6 +80,7 @@ function wrestHangul2(fld) if (!wrestTrim(fld)) return; var pattern = /([^가-힣ㄱ-ㅎㅏ-ㅣ\x20])/i; + //var pattern = /([^가-힣ㄱ-ㅎㅏ-ㅣ\x20])/; if (pattern.test(fld.value)) { if (wrestFld == null) { diff --git a/lib/common.lib.php b/lib/common.lib.php index c24fb7423..69d4299c0 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -565,8 +565,10 @@ function get_sql_search($search_ca_name, $search_field, $search_text, $search_op // 검색필드를 구분자로 나눈다. 여기서는 + $tmp = array(); $tmp = explode(",", trim($search_field)); - $field = explode("||", $tmp['0']); - $not_comment = $tmp['1']; + $field = explode("||", $tmp[0]); + $not_comment = ""; + if (!empty($tmp[1])) + $not_comment = $tmp[1]; $str .= "("; for ($i=0; $i= MAX_CAPTCHA_COUNT) { - $_SESSION['ss_captcha_key'] = ''; - echo false; -} else { - if ($_POST['captcha_key'] == $_SESSION['ss_captcha_key']) { - echo true; - } else { - $_SESSION['ss_captcha_cnt'] = $captcha_cnt + 1; - echo false; - } -} -?> \ No newline at end of file diff --git a/plugin/ckeditor/ckeditor.lib.php b/plugin/ckeditor/ckeditor.lib.php deleted file mode 100644 index 5b00643e4..000000000 --- a/plugin/ckeditor/ckeditor.lib.php +++ /dev/null @@ -1,30 +0,0 @@ -$content\n"; - //$str .= "\n"; - return $str; -} - -// textarea 로 값을 넘김 -function editor_getdata($id) -{ - if (defined('_EDITOR_')) - return "var {$id}_data = CKEDITOR.instances.{$id}.getData();\n"; - else - return ""; -} - -// textarea 의 값이 비어 있는지 검사 -function editor_empty($id, $textarea_name="내용을") -{ - if (defined('_EDITOR_')) - return "if (!{$id}_data) { alert(\"$textarea_name 입력해 주십시오.\"); CKEDITOR.instances.{$id}.focus(); return false; }\n"; - else - return ""; -} -?> \ No newline at end of file diff --git a/skin/board/neo/list.skin.php b/skin/board/neo/list.skin.php index 65da70bf1..0c5fc2671 100644 --- a/skin/board/neo/list.skin.php +++ b/skin/board/neo/list.skin.php @@ -160,18 +160,8 @@ for ($i=0; $i diff --git a/skin/board/neo/write.skin.php b/skin/board/neo/write.skin.php index 0360f8e5b..004412cfa 100644 --- a/skin/board/neo/write.skin.php +++ b/skin/board/neo/write.skin.php @@ -2,12 +2,6 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 ?> - -

@@ -59,7 +53,7 @@ echo $option_hidden; - + @@ -111,9 +105,13 @@ echo $option_hidden; - - 글자 - + '.$content.""; + } + ?> @@ -139,7 +137,7 @@ echo $option_hidden; - +
@@ -147,7 +145,6 @@ echo $option_hidden;
- - - - diff --git a/skin/member/neo/register_form.skin.php b/skin/member/neo/register_form.skin.php index 1429b4fbd..9d04ddc68 100644 --- a/skin/member/neo/register_form.skin.php +++ b/skin/member/neo/register_form.skin.php @@ -41,7 +41,7 @@ var member_skin_path = ""; - title="이름"> + title="이름"> 공백없이 한글만 입력하세요."; } ?> @@ -50,7 +50,7 @@ var member_skin_path = ""; - + 공백없이 한글,영문,숫자만 입력 가능 (한글2자, 영문4자 이상)
diff --git a/test.php b/test.php index 456361658..07a8925a1 100644 --- a/test.php +++ b/test.php @@ -1,4 +1,6 @@ \ No newline at end of file