mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-01-15 01:09:57 +09:00
merge from 1.5.3.2 (~r11225)
git-svn-id: http://xe-core.googlecode.com/svn/trunk@11226 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
parent
54e3a72065
commit
77f5aa2671
313 changed files with 8058 additions and 14251 deletions
|
|
@ -106,6 +106,7 @@
|
|||
$security = new Security();
|
||||
$security->encodeHTML('group_list..title');
|
||||
$security->encodeHTML('group_list..description');
|
||||
$security->encodeHTML('admin_member..nick_name');
|
||||
|
||||
// Get information of module_grants
|
||||
$oTemplate = &TemplateHandler::getInstance();
|
||||
|
|
@ -116,16 +117,57 @@
|
|||
* @brief Common:: skin setting page for the module
|
||||
**/
|
||||
function getModuleSkinHTML($module_srl) {
|
||||
return $this->_getModuleSkinHTML($module_srl, 'P');
|
||||
}
|
||||
|
||||
/**
|
||||
* Common:: skin setting page for the module (mobile)
|
||||
*
|
||||
* @param $module_srl sequence of module
|
||||
* @return string The html code
|
||||
*/
|
||||
function getModuleMobileSkinHTML($module_srl)
|
||||
{
|
||||
return $this->_getModuleSkinHtml($module_srl, 'M');
|
||||
}
|
||||
|
||||
/**
|
||||
* Skin setting page for the module
|
||||
*
|
||||
* @param $module_srl sequence of module
|
||||
* @param $mode P or M
|
||||
* @return string The HTML code
|
||||
*/
|
||||
function _getModuleSkinHTML($module_srl, $mode)
|
||||
{
|
||||
$mode = $mode === 'P' ? 'P' : 'M';
|
||||
|
||||
$oModuleModel = &getModel('module');
|
||||
$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
|
||||
if(!$module_info) return;
|
||||
|
||||
$skin = $module_info->skin;
|
||||
if($mode === 'P')
|
||||
{
|
||||
$skin = $module_info->skin;
|
||||
}
|
||||
else
|
||||
{
|
||||
$skin = $module_info->mskin;
|
||||
}
|
||||
|
||||
$module_path = './modules/'.$module_info->module;
|
||||
// Get XML information of the skin
|
||||
$skin_info = $oModuleModel->loadSkinInfo($module_path, $skin);
|
||||
// Get skin information set in DB
|
||||
$skin_vars = $oModuleModel->getModuleSkinVars($module_srl);
|
||||
|
||||
// Get XML information of the skin and skin sinformation set in DB
|
||||
if($mode === 'P')
|
||||
{
|
||||
$skin_info = $oModuleModel->loadSkinInfo($module_path, $skin);
|
||||
$skin_vars = $oModuleModel->getModuleSkinVars($module_srl);
|
||||
}
|
||||
else
|
||||
{
|
||||
$skin_info = $oModuleModel->loadSkinInfo($module_path, $skin, 'm.skins');
|
||||
$skin_vars = $oModuleModel->getModuleMobileSkinVars($module_srl);
|
||||
}
|
||||
|
||||
if(count($skin_info->extra_vars)) {
|
||||
foreach($skin_info->extra_vars as $key => $val) {
|
||||
|
|
@ -143,7 +185,8 @@
|
|||
Context::set('module_info', $module_info);
|
||||
Context::set('mid', $module_info->mid);
|
||||
Context::set('skin_info', $skin_info);
|
||||
Context::set('skin_vars', $skin_vars);
|
||||
Context::set('skin_vars', $skin_vars);
|
||||
Context::set('mode', $mode);
|
||||
|
||||
//Security
|
||||
$security = new Security();
|
||||
|
|
@ -153,7 +196,7 @@
|
|||
|
||||
$oTemplate = &TemplateHandler::getInstance();
|
||||
return $oTemplate->compile($this->module_path.'tpl', 'skin_config');
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Get values for a particular language code
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue