fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-26 06:39:56 +09:00
Code Issues Projects Releases Packages Wiki Activity

merge sandbox to trunk for 1.4.4.2

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@7944 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2010-11-30 07:01:36 +00:00
parent 9139515e57
commit f59deeb270
131 changed files with 11605 additions and 4218 deletions
Download patch file Download diff file Expand all files Collapse all files

15
modules/integration_search/integration_search.model.php
View file

@ -16,10 +16,16 @@
* @brief 게시글 검색
**/
function getDocuments($target, $module_srls_list, $search_target, $search_keyword, $page=1, $list_count = 20) {
if(is_array($module_srls_list)) $module_srls = implode(',',$module_srls_list);
else $module_srls = $module_srls_list;
if($target == 'exclude') $args->exclude_module_srl = $module_srls;
else $args->module_srl = $module_srls;
if(is_array($module_srls_list)) $module_srls_list = implode(',',$module_srls_list);
if($target == 'exclude') {
$module_srls_list .= ',0'; // exclude 'trash'
if ($module_srls_list{0} == ',') $module_srls_list = substr($module_srls_list, 1);
$args->exclude_module_srl = $module_srls_list;
} else {
$args->module_srl = $module_srls_list;
$args->exclude_module_srl = '0'; // exclude 'trash'
}
$args->page = $page;
$args->list_count = $list_count;
@ -32,6 +38,7 @@
// 대상 문서들을 가져옴
$oDocumentModel = &getModel('document');
return $oDocumentModel->getDocumentList($args);
}

1
modules/integration_search/skins/default/header.html
View file

@ -18,6 +18,7 @@
<input type="hidden" name="mid" value="{$mid}" />
<input type="hidden" name="act" value="IS" />
<input type="hidden" name="where" value="{$where}" />
<input type="hidden" name="search_target" value="title_content" />
<input name="is_keyword" type="text" class="inputText" value="{htmlspecialchars($is_keyword)}"/>
<span class="button large strong black"><input type="submit" value="{$lang->cmd_search}" /></span>
</form>

1
modules/integration_search/skins/default/index.html
View file

@ -1,7 +1,6 @@
<!--#include("header.html")-->
{@ $output = $search_result['document'] }
{@ $search_target = 'title'; }
<!--#include("document.html")-->
<!--@if(count($output->data))-->
<div class="isMore"><a href="{getUrl('where','document','page',1)}">more</a></div>