mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-01-06 18:21:39 +09:00
merge 1.4.5.10
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9272 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
commit
105e3f4843
66 changed files with 4864 additions and 214 deletions
|
|
@ -1,3 +1,4 @@
|
|||
<<<<<<< .working
|
||||
<?php
|
||||
/**
|
||||
* @class communicationAdminModel
|
||||
|
|
@ -38,3 +39,49 @@
|
|||
|
||||
}
|
||||
?>
|
||||
=======
|
||||
<?php
|
||||
/**
|
||||
* @class communicationAdminModel
|
||||
* @author NHN (developers@xpressengine.com)
|
||||
* @brief communication module의 admin model class
|
||||
**/
|
||||
|
||||
class communicationAdminModel extends communication {
|
||||
|
||||
/**
|
||||
* @brief 초기화
|
||||
**/
|
||||
function init() {
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief 지정된 스킨의 컬러셋 선택을 위한 html을 return
|
||||
**/
|
||||
function getCommunicationAdminColorset() {
|
||||
$skin = Context::get('skin');
|
||||
if(!$skin) $tpl = "";
|
||||
else {
|
||||
$oModuleModel = &getModel('module');
|
||||
$skin_info = $oModuleModel->loadSkinInfo($this->module_path, $skin);
|
||||
Context::set('skin_info', $skin_info);
|
||||
|
||||
$oModuleModel = &getModel('module');
|
||||
$communication_config = $oModuleModel->getModuleConfig('communication');
|
||||
if(!$communication_config->colorset) $communication_config->colorset = "white";
|
||||
Context::set('communication_config', $communication_config);
|
||||
|
||||
$security = new Security();
|
||||
$security->encodeHTML('skin_info.colorset..title','skin_info.colorset..name');
|
||||
$security->encodeHTML('skin_info.colorset..name');
|
||||
|
||||
$oTemplate = &TemplateHandler::getInstance();
|
||||
$tpl = $oTemplate->compile($this->module_path.'tpl', 'colorset_list');
|
||||
}
|
||||
|
||||
$this->add('tpl', $tpl);
|
||||
}
|
||||
|
||||
}
|
||||
?>
|
||||
>>>>>>> .merge-right.r9269
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue