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

merge 1.4.5.10

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9272 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2011-09-22 08:23:36 +00:00
commit 105e3f4843
66 changed files with 4864 additions and 214 deletions
Download patch file Download diff file Expand all files Collapse all files

29
modules/layout/layout.admin.view.php
View file

@ -23,6 +23,10 @@
$layout_list = $oLayoutModel->getDownloadedLayoutList('P', true);
$layout_list[] = $oLayoutModel->getLayoutInfo('faceoff', null, 'P');
Context::set('type', 'P');
//Security
$security = new Security();
$security->encodeHTML('layout_list..layout','layout_list..title');
$pcLayoutCount = $oLayoutModel->getInstalledLayoutCount('P');
$mobileLayoutCount = $oLayoutModel->getInstalledLayoutCount('M');
@ -32,7 +36,11 @@
$security = new Security($layout_list);
$layout_list = $security->encodeHTML('..', '..author..');
//Security
$security = new Security();
$security->encodeHTML('layout_list..layout','layout_list..title');
foreach($layout_list as $no => $layout_info)
{
$layout_list[$no]->description = nl2br(trim($layout_info->description));
@ -100,6 +108,10 @@
$oModel = &getModel('layout');
$type = Context::get('type');
if (!in_array($type, array('P', 'M'))) $type = 'P';
//Security
$security = new Security();
$security->encodeHTML('layout_list..layout','layout_list..title');
// Get layout info
$layout = Context::get('layout');
@ -247,7 +259,12 @@
$security = new Security($layout_info);
$layout_info = $security->encodeHTML('.', '.author..');
Context::set('selected_layout', $layout_info);
//Security
$security = new Security();
$security->encodeHTML('layout_list..');
$security->encodeHTML('layout_list..author..');
$security = new Security();
$security->encodeHTML('layout_code_css', 'layout_code', 'widget_list..title');
}
@ -315,7 +332,13 @@
$layout_info = $oLayoutModel->getLayoutInfo(Context::get('selected_layout'));
Context::set('layout_info', $layout_info);
// Set the layout to be pop-up
$this->setLayoutFile('popup_layout');
$this->setLayoutFile('popup_layout');
$security = new Security();
$security->encodeHTML('layout_list..');
$security->encodeHTML('layout_list..author..');
$security->encodeHTML('layout_list..history..');
$security->encodeHTML('layout_list..history..author..');
// Set a template file
$this->setTemplateFile('layout_detail_info');
}

2
modules/layout/tpl/index.html
View file

@ -28,7 +28,7 @@
(module)
<!--@end-->
</td>
<td class="wide">{htmlspecialchars($val->title)}</td>
<td class="wide">{$val->title}</td>
<td class="nowrap">{zdate($val->regdate,"Y-m-d")}</td>
<td>
<!--@if(!$val->module_srl)-->

2
modules/layout/tpl/mindex.html
View file

@ -28,7 +28,7 @@
(module)
<!--@end-->
</td>
<td class="wide">{htmlspecialchars($val->title)}</td>
<td class="wide">{$val->title}</td>
<td class="nowrap">{zdate($val->regdate,"Y-m-d")}</td>
<td>
<!--@if(!$val->module_srl)-->