diff --git a/common/css/default.css b/common/css/default.css index 9e2afb194..9caf2fa7c 100644 --- a/common/css/default.css +++ b/common/css/default.css @@ -32,10 +32,10 @@ form { margin:0; padding:0; } .iePngFix { behavior:url(./common/js/iePngFix.htc); } /* Input Style Definition */ -.inputTypeText { border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; padding:3px; height:1.2em; line-height:1em; background:#ffffff; font-size:1em;} +.inputTypeText { border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; height:1.4em; padding:.2em 0 0 .3em; background:#ffffff; font-size:1em; _position:relative; _top:2px;} .inputTypeText:hover, .inputTypeText:focus { background:#f4f4f4; } -.inputTypeTextArea { border:1px solid !important; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6 !important; padding:3px; background:#ffffff; font-size:1em;} +.inputTypeTextArea { border:1px solid !important; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6 !important; background:#ffffff; font-size:1em;} .w40 { width:40px; } .w60 { width:60px; } diff --git a/layouts/zb5_site/layout.html b/layouts/zb5_site/layout.html index 911d12a1c..eb439f9c1 100644 --- a/layouts/zb5_site/layout.html +++ b/layouts/zb5_site/layout.html @@ -74,6 +74,11 @@ + +
+
+
+
diff --git a/modules/board/board.admin.controller.php b/modules/board/board.admin.controller.php index e9879576a..24c7d46d6 100644 --- a/modules/board/board.admin.controller.php +++ b/modules/board/board.admin.controller.php @@ -102,7 +102,7 @@ $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl); $skin = $module_info->skin; - // 스킨의 정보르 구해옴 (extra_vars를 체크하기 위해서) + // 스킨의 정보를 구해옴 (extra_vars를 체크하기 위해서) $skin_info = $oModuleModel->loadSkinInfo($this->module_path, $skin); // 입력받은 변수들을 체크 (mo, act, module_srl, page등 기본적인 변수들 없앰) diff --git a/modules/document/document.item.php b/modules/document/document.item.php index 4e1f19de4..59e43a1d1 100644 --- a/modules/document/document.item.php +++ b/modules/document/document.item.php @@ -240,12 +240,16 @@ if(count($attached_file_list)) { $src = preg_replace("!^(\"|')!is","",$attached_file_list[0]); - copy("./".$src, $tmp_file); + @copy("./".$src, $tmp_file); // 첨부된 파일이 없으면 http로 시작하는 경로를 찾음 } else { - preg_match('!src=("|\'){0,1}([^"|^\'|^\ ]*)("|\'| ){0,1}!is', $content, $matches); - $src = $matches[2]; + preg_match_all("!http:\/\/([^ ^\"^']*?)\.(jpg|png|gif|jpeg)!is", $content, $matches, PREG_SET_ORDER); + for($i=0;$i + + 통합검색 + + 제로 + + 선택한 모듈들을 대상으로 통합검색을 지원합니다. + 선택된 모듈의 글중 비밀글만 검색을 하지 않고 나머지는 모두 검색을 하기에 공개되지 않은 모듈은 대상에 포함하지 않도록 하셔야 합니다. + + + diff --git a/modules/integration_search/conf/module.xml b/modules/integration_search/conf/module.xml new file mode 100644 index 000000000..b5f3c924b --- /dev/null +++ b/modules/integration_search/conf/module.xml @@ -0,0 +1,24 @@ + + + + + 목록 + リスト + list + + + 관리 + 管理 + manager + + + + + + + + + + + + diff --git a/modules/integration_search/integration_search.admin.controller.php b/modules/integration_search/integration_search.admin.controller.php new file mode 100644 index 000000000..c7f074abd --- /dev/null +++ b/modules/integration_search/integration_search.admin.controller.php @@ -0,0 +1,113 @@ +getModuleConfig('integration_search'); + + $args->skin = Context::get('skin'); + $args->target_mid = explode('|@|',Context::get('target_mid')); + $args->skin_vars = $config->skin_vars; + + $oModuleController = &getController('module'); + return $oModuleController->insertModuleConfig('integration_search',$args); + } + + /** + * @brief 스킨 정보 저장 + **/ + function procIntegration_searchAdminInsertSkin() { + // 설정 정보를 받아옴 (module model 객체를 이용) + $oModuleModel = &getModel('module'); + $config = $oModuleModel->getModuleConfig('integration_search'); + + $args->skin = $config->skin; + $args->target_mid = $config->target_mid; + + // 스킨의 정보를 구해옴 (extra_vars를 체크하기 위해서) + $skin_info = $oModuleModel->loadSkinInfo($this->module_path, $config->skin); + + // 입력받은 변수들을 체크 (mo, act, module_srl, page등 기본적인 변수들 없앰) + $obj = Context::getRequestVars(); + unset($obj->act); + unset($obj->module_srl); + unset($obj->page); + + // 원 skin_info에서 extra_vars의 type이 image일 경우 별도 처리를 해줌 + if($skin_info->extra_vars) { + foreach($skin_info->extra_vars as $vars) { + if($vars->type!='image') continue; + + $image_obj = $obj->{$vars->name}; + + // 삭제 요청에 대한 변수를 구함 + $del_var = $obj->{"del_".$vars->name}; + unset($obj->{"del_".$vars->name}); + if($del_var == 'Y') { + @unlink($module_info->{$vars->name}); + continue; + } + + // 업로드 되지 않았다면 이전 데이터를 그대로 사용 + if(!$image_obj['tmp_name']) { + $obj->{$vars->name} = $module_info->{$vars->name}; + continue; + } + + // 정상적으로 업로드된 파일이 아니면 무시 + if(!is_uploaded_file($image_obj['tmp_name'])) { + unset($obj->{$vars->name}); + continue; + } + + // 이미지 파일이 아니어도 무시 + if(!eregi("\.(jpg|jpeg|gif|png)$", $image_obj['name'])) { + unset($obj->{$vars->name}); + continue; + } + + // 경로를 정해서 업로드 + $path = sprintf("./files/attach/images/%s/", $module_srl); + + // 디렉토리 생성 + if(!FileHandler::makeDir($path)) return false; + + $filename = $path.$image_obj['name']; + + // 파일 이동 + if(!move_uploaded_file($image_obj['tmp_name'], $filename)) { + unset($obj->{$vars->name}); + continue; + } + + // 변수를 바꿈 + unset($obj->{$vars->name}); + $obj->{$vars->name} = $filename; + } + } + + // serialize하여 저장 + $args->skin_vars = serialize($obj); + + $oModuleController = &getController('module'); + return $oModuleController->insertModuleConfig('integration_search',$args); + } + } +?> diff --git a/modules/integration_search/integration_search.admin.view.php b/modules/integration_search/integration_search.admin.view.php new file mode 100644 index 000000000..29d284de8 --- /dev/null +++ b/modules/integration_search/integration_search.admin.view.php @@ -0,0 +1,71 @@ +config = $oModuleModel->getModuleConfig('integration_search'); + if(!$this->config->target_mid) $this->config->target_mid = array(); + Context::set('config',$this->config); + + $this->setTemplatePath($this->module_path."/tpl/"); + } + + /** + * @brief 모듈 선정 및 스킨 설정 + **/ + function dispIntegration_searchAdminContent() { + // 스킨 목록을 구해옴 + $oModuleModel = &getModel('module'); + $skin_list = $oModuleModel->getSkins($this->module_path); + Context::set('skin_list',$skin_list); + + // 생성된 mid목록을 구함 + $mid_list = $oModuleModel->getMidList(); + Context::set('mid_list',$mid_list); + + // 샘플코드 + Context::set('sample_code', htmlspecialchars('
') ); + + $this->setTemplateFile("index"); + } + + /** + * @brief 스킨 설정 + **/ + function dispIntegration_searchAdminSkinInfo() { + $oModuleModel = &getModel('module'); + $skin_info = $oModuleModel->loadSkinInfo($this->module_path, $this->config->skin); + $skin_vars = unserialize($this->config->skin_vars); + + // skin_info에 extra_vars 값을 지정 + if(count($skin_info->extra_vars)) { + foreach($skin_info->extra_vars as $key => $val) { + $name = $val->name; + $type = $val->type; + $value = $skin_vars->{$name}; + if($type=="checkbox"&&!$value) $value = array(); + $skin_info->extra_vars[$key]->value= $value; + } + } + Context::set('skin_info', $skin_info); + Context::set('skin_vars', $skin_vars); + + $this->setTemplateFile("skin_info"); + } + } +?> diff --git a/modules/integration_search/integration_search.class.php b/modules/integration_search/integration_search.class.php new file mode 100644 index 000000000..8356e4e50 --- /dev/null +++ b/modules/integration_search/integration_search.class.php @@ -0,0 +1,47 @@ +insertActionForward('integration_search', 'view', 'IS'); + $oModuleController->insertActionForward('integration_search', 'view', 'dispIntegration_searchAdminContent'); + $oModuleController->insertActionForward('integration_search', 'view', 'dispIntegration_searchAdminSkinInfo'); + + return new Object(); + } + + /** + * @brief 설치가 이상이 없는지 체크하는 method + **/ + function checkUpdate() { + // IS act의 여부 체크 (2007. 7. 24 추가) + $oModuleModel = &getModel('module'); + $act = $oModuleModel->getActionForward('dispIntegration_searchAdminSkinInfo'); + if(!$act) return true; + + return false; + } + + /** + * @brief 업데이트 실행 + **/ + function moduleUpdate() { + $oModuleController = &getController('module'); + $oModuleController->insertActionForward('integration_search', 'view', 'IS'); + $oModuleController->insertActionForward('integration_search', 'view', 'dispIntegration_searchAdminContent'); + $oModuleController->insertActionForward('integration_search', 'view', 'dispIntegration_searchAdminSkinInfo'); + return new Object(0, 'success_updated'); + } + + } +?> diff --git a/modules/integration_search/integration_search.view.php b/modules/integration_search/integration_search.view.php new file mode 100644 index 000000000..61ef69bdc --- /dev/null +++ b/modules/integration_search/integration_search.view.php @@ -0,0 +1,80 @@ +getModuleConfig('integration_search'); + + $this->target_mid = $config->target_mid; + if(!$this->target_mid) $this->target_mid = array(); + + $this->skin = $config->skin; + $this->module_info = unserialize($config->skin_vars); + Context::set('module_info', $this->module_info); + + $this->setTemplatePath($this->module_path."/skins/".$this->skin."/"); + } + + /** + * @brief 통합 검색 출력 + **/ + function IS() { + $oModuleModel = &getModel('module'); + $module_list = $oModuleModel->getMidList($args); + + // 대상 모듈을 정리함 + $module_srl_list = array(); + foreach($module_list as $mid => $val) { + if(in_array($mid, $this->target_mid)) { + $module_srl_list[] = $val->module_srl; + $mid_list[$val->module_srl] = $val; + } + } + + // 변수 설정 + $page = (int)Context::get('page'); + if(!$page) $page = 1; + + $list_count = (int)Context::get('list_count'); + if(!$list_count|| $list_count>20) $list_count = 20; + + // 출력할 컨텐츠 추출을 위한 인자 정리 + $args->module_srl = implode(',',$module_srl_list); + $args->page = $page; + $args->list_count = $list_count; + $args->page_count = 10; + $args->search_target = 'title_content'; + $args->search_keyword = Context::get('is_keyword'); + $args->sort_index = 'list_order'; + $args->order_type = 'asc'; + + // 대상 문서들을 가져옴 + $oDocumentModel = &getModel('document'); + $output = $oDocumentModel->getDocumentList($args); + Context::set('total_count', $output->total_count); + Context::set('total_page', $output->total_page); + Context::set('page', $output->page); + Context::set('document_list', $output->data); + Context::set('page_navigation', $output->page_navigation); + + // 템플릿 파일 지정 + $this->setTemplateFile('index'); + } + } +?> diff --git a/modules/integration_search/lang/ko.lang.php b/modules/integration_search/lang/ko.lang.php new file mode 100644 index 000000000..cd254c281 --- /dev/null +++ b/modules/integration_search/lang/ko.lang.php @@ -0,0 +1,13 @@ + + * @brief 한국어 언어팩 (기본적인 내용만 수록) + **/ + + $lang->integration_search = "통합검색"; + + $lang->sample_code = "샘플코드"; + $lang->about_target_module = "선택된 모듈만 검색 대상으로 정합니다. 권한설정에 대한 주의를 바랍니다"; + $lang->about_sample_code = "위 코드를 레이아웃등에 추가하시면 통합검색이 가능합니다"; +?> diff --git a/modules/integration_search/skins/default/css/white.css b/modules/integration_search/skins/default/css/white.css new file mode 100644 index 000000000..957134df3 --- /dev/null +++ b/modules/integration_search/skins/default/css/white.css @@ -0,0 +1,36 @@ +@charset "utf-8"; + +/* boardInformation */ +.boardInformation { clear:both; margin:1em 0 .5em 0; overflow:hidden; color:#666666;} +.search strong { color:#ff6600;} +.articleNum strong { font:bold 11px Tahoma; color:#ff6600;} + +.no_result { text-align:center; padding:3em; border-top:1px solid #EEEEEE; border-bottom:1px solid #EEEEEE;} + +/* search_result */ +.search_result { margin:1em 0 3em 0; list-style:none; clear:both;} +.search_result .thumbnail { float:left; padding:10px; } +.search_result .thumbnail img { width:100px; height:100px; border:1px solid #555555; } +.search_result .title { margin-bottom:.5em; border-top:1px solid #EEEEEE; padding-top:.5em; } +.search_result .title a { color:#4831F6; font-size:1.2em; font-weight:bold; text-decoration:none; } +.search_result .title a:visited { color:#A59AFD;} +.search_result .replyAndTrackback { font:.8em Tahoma; color:#ff6600; position:relative; top:-.2em;} +.search_result .replyAndTrackback img.trackback { margin-bottom:-.1em;} +.search_result .summary { margin-bottom:.5em; padding-left:2em; } +.search_result .summary a { color:#888888; font-size:1em; text-decoration:none; } +.search_result .summary a:visited { color:#BBBBBB;} +.search_result .summary a:hover { color:#BBBBBB; text-decoration:none;} +.search_result .author { padding-left:2em; float:left; color:#000000; font-size:.9em;} +.search_result .date { padding-left:2em; float:left; color:#888888; font-size:.9em;} + +/* pageNavigation */ +.pageNavigation { display:block; padding:1.5em 0 2em 0; text-align:center; font:bold .8em Tahoma; border-top:1px solid #EEEEEE; padding-top:.5em; } +.pageNavigation a { position:relative; margin-left:-4px; font:bold 1em Tahoma; color:#666666; display:inline-block; padding:1px 7px 2px 6px; border-left:1px solid #dedfde; border-right:1px solid #CCCCCC; text-decoration:none; line-height:1em; } +.pageNavigation a:hover { background:#F7F7F7; text-decoration:none; } +.pageNavigation a:visited { color:#999999;} +.pageNavigation a.goToFirst, +.pageNavigation a.goToLast { border:none; border-right:1px solid #ffffff; border-left:1px solid #ffffff; z-index:99; vertical-align:top; padding:0px 7px 4px 6px;} +.pageNavigation a.goToFirst img, +.pageNavigation a.goToLast img { display:inline-block; padding:2px 0; position:relative; top:2px; _top:1px;} +.pageNavigation .current { position:relative; margin-left:-4px; font:bold 1em Tahoma; color:#ff6600; display:inline-block; padding:1px 7px 1px 6px; border-left:1px solid #dedfde; border-right:1px solid #CCCCCC; text-decoration:none; line-height:1em; } + diff --git a/modules/integration_search/skins/default/images/white/bottomGotoFirst.gif b/modules/integration_search/skins/default/images/white/bottomGotoFirst.gif new file mode 100644 index 000000000..e0297fecb Binary files /dev/null and b/modules/integration_search/skins/default/images/white/bottomGotoFirst.gif differ diff --git a/modules/integration_search/skins/default/images/white/bottomGotoLast.gif b/modules/integration_search/skins/default/images/white/bottomGotoLast.gif new file mode 100644 index 000000000..0a7141d0d Binary files /dev/null and b/modules/integration_search/skins/default/images/white/bottomGotoLast.gif differ diff --git a/modules/integration_search/skins/default/images/white/iconArticle.gif b/modules/integration_search/skins/default/images/white/iconArticle.gif new file mode 100644 index 000000000..59c1c8019 Binary files /dev/null and b/modules/integration_search/skins/default/images/white/iconArticle.gif differ diff --git a/modules/integration_search/skins/default/images/white/iconReply.gif b/modules/integration_search/skins/default/images/white/iconReply.gif new file mode 100644 index 000000000..a6d4ea112 Binary files /dev/null and b/modules/integration_search/skins/default/images/white/iconReply.gif differ diff --git a/modules/integration_search/skins/default/images/white/iconTrackback.gif b/modules/integration_search/skins/default/images/white/iconTrackback.gif new file mode 100644 index 000000000..1c83bcadd Binary files /dev/null and b/modules/integration_search/skins/default/images/white/iconTrackback.gif differ diff --git a/modules/integration_search/skins/default/images/white/lineBoardListTh.gif b/modules/integration_search/skins/default/images/white/lineBoardListTh.gif new file mode 100644 index 000000000..6d891d82c Binary files /dev/null and b/modules/integration_search/skins/default/images/white/lineBoardListTh.gif differ diff --git a/modules/integration_search/skins/default/images/white/line_1x10_e0e0e0.gif b/modules/integration_search/skins/default/images/white/line_1x10_e0e0e0.gif new file mode 100644 index 000000000..6a848dd58 Binary files /dev/null and b/modules/integration_search/skins/default/images/white/line_1x10_e0e0e0.gif differ diff --git a/modules/integration_search/skins/default/index.html b/modules/integration_search/skins/default/index.html new file mode 100644 index 000000000..db2970289 --- /dev/null +++ b/modules/integration_search/skins/default/index.html @@ -0,0 +1,63 @@ + + + {@$module_info->colorset = "white"} + + + + + + + +
+
+ {$lang->search_keyword} : {$is_keyword} +
+
+ {$lang->document_count} : {number_format($total_count)} +
+
+ + + +
+ {$lang->no_documents} +
+ + + +
+ + + + +
+ + {$lang->first_page} + + + {$page_no} + + {$page_no} + + + {$lang->last_page} +
+ diff --git a/modules/integration_search/skins/default/skin.xml b/modules/integration_search/skins/default/skin.xml new file mode 100644 index 000000000..f730e87b9 --- /dev/null +++ b/modules/integration_search/skins/default/skin.xml @@ -0,0 +1,19 @@ + + + 통합 검색 기본 스킨 + + 제로 + 통합검색 모듈의 기본 스킨 + + + + 기본 + + + + + 설명 + 검색결과 상단에 결과가 출력됩니다. + + + diff --git a/modules/integration_search/tpl/filter/insert_config.xml b/modules/integration_search/tpl/filter/insert_config.xml new file mode 100644 index 000000000..e3caf4cb0 --- /dev/null +++ b/modules/integration_search/tpl/filter/insert_config.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/modules/integration_search/tpl/header.html b/modules/integration_search/tpl/header.html new file mode 100644 index 000000000..d870b6f10 --- /dev/null +++ b/modules/integration_search/tpl/header.html @@ -0,0 +1,14 @@ + + +

{$lang->integration_search} {$lang->cmd_management}

+ +
+ +
+ diff --git a/modules/integration_search/tpl/index.html b/modules/integration_search/tpl/index.html new file mode 100644 index 000000000..dd7aeaf80 --- /dev/null +++ b/modules/integration_search/tpl/index.html @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + +
{$lang->sample_code} + +

{$lang->about_sample_code}

+
{$lang->skin} + +

{$lang->about_skin}

+
{$lang->module} +

{$lang->about_target_module}

+ +

target_mid))-->checked="checked" />

+ +
+ +
+ +
+
diff --git a/modules/integration_search/tpl/js/integration_search_admin.js b/modules/integration_search/tpl/js/integration_search_admin.js new file mode 100644 index 000000000..b2bf3b494 --- /dev/null +++ b/modules/integration_search/tpl/js/integration_search_admin.js @@ -0,0 +1,31 @@ +/** + * @file modules/board/js/board_admin.js + * @author zero (zero@nzeo.com) + * @brief integration_search 모듈의 관리자용 javascript + **/ + +/* 권한 관련 */ +function doSelectAll(obj, key) { + var fo_obj = obj.parentNode; + while(fo_obj.nodeName != 'FORM') { + fo_obj = fo_obj.parentNode; + } + + for(var i=0;i + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{$lang->skin_default_info}
{$lang->skin}{$skin_info->title}
{$lang->skin_maker}{$skin_info->maker->name} ({$skin_info->maker->email_address})
{$lang->skin_maker_homepage}{$skin_info->maker->homepage}
{$lang->date}{$skin_info->maker->date}
{$lang->description}{nl2br($skin_info->maker->description)}
+ + + + + + + + + + + + + + + + + + +
{$lang->extra_vars}
{$lang->colorset} + +
+ + {$val->title} + + + colorset==$val->name)-->checked="checked"/> + +
+ +
{$val->title} + + + + + + + + + + + + + value))-->checked="checked" class="checkbox" /> + + + + + + + + value)-->checked="checked"/> + + + + + + + +
+
+ + +
+ + + + + + +

{nl2br($val->description)}

+ +
+ +
+ +
+
+ +