fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-20 19:59:54 +09:00
Code Issues Projects Releases Packages Wiki Activity

merge from branch luminous (version 1.5.4.2, ~r12561)

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@12611 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2013-01-30 05:53:14 +00:00
parent 2263200ce4
commit cc47d2b247
196 changed files with 3655 additions and 2033 deletions
Download patch file Download diff file Expand all files Collapse all files

9
modules/rss/rss.class.php
View file

@ -41,6 +41,9 @@
if($oModuleModel->getTrigger('display', 'rss', 'controller', 'triggerRssUrlInsert', 'before')) return true;
// 2012. 08. 29 Add a trigger to copy additional setting when the module is copied
if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'rss', 'controller', 'triggerCopyModule', 'after')) return true;
return false;
}
@ -64,6 +67,12 @@
if($oModuleModel->getTrigger('display', 'rss', 'controller', 'triggerRssUrlInsert', 'before'))
$oModuleController->deleteTrigger('display', 'rss', 'controller', 'triggerRssUrlInsert', 'before');
// 2012. 08. 29 Add a trigger to copy additional setting when the module is copied
if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'rss', 'controller', 'triggerCopyModule', 'after'))
{
$oModuleController->insertTrigger('module.procModuleAdminCopyModule', 'rss', 'controller', 'triggerCopyModule', 'after');
}
return new Object(0, 'success_updated');
}

15
modules/rss/rss.controller.php
View file

@ -58,5 +58,20 @@
return new Object();
}
function triggerCopyModule(&$obj)
{
$oModuleModel = &getModel('module');
$rssConfig = $oModuleModel->getModulePartConfig('rss', $obj->originModuleSrl);
$oModuleController = &getController('module');
if(is_array($obj->moduleSrlList))
{
foreach($obj->moduleSrlList AS $key=>$moduleSrl)
{
$oModuleController->insertModulePartConfig('rss', $moduleSrl, $rssConfig);
}
}
}
}
?>

54
modules/rss/tpl/rss_admin_index.html
View file

@ -47,29 +47,29 @@
<span class="btn small"><input type="submit" value="{$lang->cmd_save}" /></span>
</div>
</form>
<form action="" class="form">
<h2 class="h2">{$lang->feed} {$lang->cmd_management}</h2>
<div class="table">
<table width="100%" border="1" cellspacing="0">
<thead>
<tr>
<th scope="col">{$lang->mid}</th>
<th scope="col" class="title">{$lang->description}</th>
<th scope="col">{$lang->open_rss}</th>
<th scope="col">
<label for="feed_integration">{$lang->open_feed_to_total}</label>
</th>
<th scope="col">{$lang->cmd_save}</th>
</tr>
</thead>
<tbody>
<!--@foreach($feed_config AS $key=>$value)-->
<h2 class="h2">{$lang->feed} {$lang->cmd_management}</h2>
<div class="table form">
<table width="100%" border="1" cellspacing="0">
<thead>
<tr>
<th scope="col">{$lang->mid}</th>
<th scope="col" class="title">{$lang->description}</th>
<th scope="col">{$lang->open_rss}</th>
<th scope="col">
<label for="feed_integration">{$lang->open_feed_to_total}</label>
</th>
<th scope="col">{$lang->cmd_save}</th>
</tr>
</thead>
<tbody>
<tr loop="$feed_config => $key,$value">
<form ruleset="insertRssModuleConfig" action="./" method="post">
<input type="hidden" name="act" value="procRssAdminInsertModuleConfig" />
<input type="hidden" name="success_return_url" value="{getUrl('', 'module', $module, 'act', 'dispRssAdminIndex')}" />
<input type="hidden" name="target_module_srl" value="{$key}" />
<tr>
<th scope="row" class="nowr"><!--@if($value['url'])--><a href="{$value['url']}" target="_blank"><!--@endif-->{$value['mid']}<!--@if($value['url'])--></a><!--@endif--></th>
<input type="hidden" name="act" value="procRssAdminInsertModuleConfig" />
<input type="hidden" name="success_return_url" value="{getUrl('', 'module', $module, 'act', 'dispRssAdminIndex')}" />
<input type="hidden" name="target_module_srl" value="{$key}" />
<th scope="row" class="nowr">
<!--@if($value['url'])--><a href="{$value['url']}" target="_blank"><!--@endif-->{$value['mid']}<!--@if($value['url'])--></a><!--@endif-->
</th>
<td class="title">{$value['feed_description']}</td>
<td class="nowr">
<!--@foreach($lang->open_rss_types as $key2=>$value2)-->
@ -83,10 +83,8 @@
<label for="open_total_feed_T_N">{$lang->notuse}</label>
</td>
<td class="nowr"><input type="submit" value="{$lang->cmd_save}" class="text" /></td>
</tr>
</form>
<!--@end-->
</tbody>
</table>
</div>
</form>
</tr>
</tbody>
</table>
</div>

10
modules/rss/tpl/rss_module_config.html
View file

@ -1,9 +1,9 @@
<form ruleset="insertRssModuleConfig" action="./" method="post" class="form">
<input type="hidden" name="module" value="rss" />
<input type="hidden" name="act" value="procRssAdminInsertModuleConfig" />
<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />
<input type="hidden" name="target_module_srl" value="{$rss_config->module_srl?$rss_config->module_srl:$module_srls}" />
<input type="hidden" name="module" value="rss" />
<input type="hidden" name="act" value="procRssAdminInsertModuleConfig" />
<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />
<input type="hidden" name="target_module_srl" value="{$rss_config->module_srl?$rss_config->module_srl:$module_srls}" />
<h3 class="h3">{$lang->open_rss}</h3>
<p>{$lang->about_open_rss}</p>
<div class="table">