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

merge from 1.5.3.2 (~r11225)

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@11226 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-09-13 06:14:45 +00:00
parent 54e3a72065
commit 77f5aa2671
313 changed files with 8058 additions and 14251 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/page/conf/module.xml
View file

@ -19,6 +19,8 @@
<action name="dispPageAdminAddContent" type="view" standalone="true" />
<action name="dispPageAdminMobileContentModify" type="view" standalone="true" />
<action name="dispPageAdminMobileContent" type="view" standalone="true" />
<action name="dispPageAdminSkinInfo" type="view" standalone="true" />
<action name="dispPageAdminMobileSkinInfo" type="view" standalone="true" />
<action name="procPageAdminRemoveWidgetCache" type="controller" standalone="true" />
<action name="procPageAdminInsert" type="controller" standalone="true" ruleset="insertPage" />

1
modules/page/m.skins/default/mobile.html
View file

@ -2,7 +2,6 @@
<div class="content">{$lang->content} : {$oDocument->getContent()}</div>
<div class="tag">{$lang->tag} : <block cond="is_array($oDocument->get('tag_list'))">{implode(',', $oDocument->get('tag_list'))}</block></div>
<!--@if($grant->manager)-->
<!--%import("./js/page_admin.js")-->
<div class="tRight clear">
<!--@if($logged_info->is_admin=='Y')-->
<a href="{getUrl('act','dispPageAdminInfo','module_srl',$module_info->module_srl)}" class="button green"><span>{$lang->cmd_setup}...</span></a>

20
modules/page/page.admin.controller.php
View file

@ -234,12 +234,26 @@
$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
$content = $module_info->content;
$cache_file = sprintf("%sfiles/cache/page/%d.%s.cache.php", _XE_PATH_, $module_info->module_srl, Context::getLangType());
if(file_exists($cache_file)) FileHandler::removeFile($cache_file);
// widget controller re-run of the cache files
$oWidgetController = &getController('widget');
$oWidgetController->recompileWidget($content);
if($module_info->page_type == 'WIDGET')
{
$cache_file = sprintf("%sfiles/cache/page/%d.%s.%s.cache.php", _XE_PATH_, $module_info->module_srl, Context::getLangType(), Context::getSslStatus());
$mcacheFile = sprintf("%sfiles/cache/page/%d.%s.%s.m.cache.php", _XE_PATH_, $module_info->module_srl, Context::getLangType(), Context::getSslStatus());
}
else if($module_info->page_type == 'OUTSIDE')
{
$cache_file = sprintf("%sfiles/cache/opage/%d.cache.php", _XE_PATH_, $module_info->module_srl);
if($module_info->mpath)
{
$mcacheFile = sprintf("%sfiles/cache/opage/%d.m.cache.php", _XE_PATH_, $module_info->module_srl);
}
}
if(file_exists($cache_file)) FileHandler::removeFile($cache_file);
if(file_exists($mcacheFile)) FileHandler::removeFile($mcacheFile);
}
function procPageAdminArticleDocumentInsert()

31
modules/page/page.admin.view.php
View file

@ -189,7 +189,7 @@
function dispPageAdminMobileContent() {
if($this->module_srl) Context::set('module_srl',$this->module_srl);
// Specifying the cache file
$cache_file = sprintf("%sfiles/cache/page/%d.%s.m.cache.php", _XE_PATH_, $this->module_info->module_srl, Context::getLangType());
$cache_file = sprintf("%sfiles/cache/page/%d.%s.%s.m.cache.php", _XE_PATH_, $this->module_info->module_srl, Context::getLangType(), Context::getSslStatus());
$interval = (int)($this->module_info->page_caching_interval);
if($interval>0) {
if(!file_exists($cache_file)) $mtime = 0;
@ -206,6 +206,7 @@
if(file_exists($cache_file)) FileHandler::removeFile($cache_file);
$page_content = $this->module_info->mcontent;
}
$page_content = preg_replace('@<\!--#Meta:@', '<!--Meta:', $page_content);
Context::set('module_info', $this->module_info);
Context::set('page_content', $page_content);
@ -254,8 +255,8 @@
Context::set('content', $content);
// Convert them to teach the widget
$oWidgetController = &getController('widget');
$content = $oWidgetController->transWidgetCode($content, true, false);
$content = str_replace('$', '&#36;', $content);
$content = $oWidgetController->transWidgetCode($content, true, true);
// $content = str_replace('$', '&#36;', $content);
Context::set('page_content', $content);
// Set widget list
$oWidgetModel = &getModel('widget');
@ -317,5 +318,29 @@
$security = new Security();
$security->encodeHTML('module_info.');
}
/**
* Display skin setting page
*/
function dispPageAdminSkinInfo()
{
$oModuleAdminModel = &getAdminModel('module');
$skin_content = $oModuleAdminModel->getModuleSkinHTML($this->module_info->module_srl);
Context::set('skin_content', $skin_content);
$this->setTemplateFile('skin_info');
}
/**
* Display mobile skin setting page
*/
function dispPageAdminMobileSkinInfo()
{
$oModuleAdminModel = &getAdminModel('module');
$skin_content = $oModuleAdminModel->getModuleMobileSkinHTML($this->module_info->module_srl);
Context::set('skin_content', $skin_content);
$this->setTemplateFile('skin_info');
}
}
?>

40
modules/page/page.mobile.php
View file

@ -10,12 +10,12 @@ class pageMobile extends pageView {
switch($this->module_info->page_type)
{
case 'WIDGET' : {
$this->cache_file = sprintf("%sfiles/cache/page/%d.%s.cache.php", _XE_PATH_, $this->module_info->module_srl, Context::getLangType());
$this->cache_file = sprintf("%sfiles/cache/page/%d.%s.%s.m.cache.php", _XE_PATH_, $this->module_info->module_srl, Context::getLangType(), Context::getSslStatus());
$this->interval = (int)($this->module_info->page_caching_interval);
break;
}
case 'OUTSIDE' : {
$this->cache_file = sprintf("./files/cache/opage/%d.cache.php", $this->module_info->module_srl);
$this->cache_file = sprintf("./files/cache/opage/%d.%s.m.cache.php", $this->module_info->module_srl, Context::getSslStatus());
$this->interval = (int)($this->module_info->page_caching_interval);
$this->path = $this->module_info->mpath;
break;
@ -37,26 +37,43 @@ class pageMobile extends pageView {
$this->setTemplateFile('mobile');
}
function _getWidgetContent(){
function _getWidgetContent()
{
// Arrange a widget ryeolro
if($this->module_info->mcontent)
{
$cache_file = sprintf("%sfiles/cache/page/%d.%s.m.cache.php", _XE_PATH_, $this->module_info->module_srl, Context::getLangType());
$interval = (int)($this->module_info->page_caching_interval);
if($interval>0) {
if(!file_exists($cache_file)) $mtime = 0;
else $mtime = filemtime($cache_file);
if($interval>0)
{
if(!file_exists($cache_file) || filesize($cache_file) < 1)
{
$mtime = 0;
}
else
{
$mtime = filemtime($cache_file);
}
if($mtime + $interval*60 > time()) {
if($mtime + $interval*60 > time())
{
$page_content = FileHandler::readFile($cache_file);
$page_content = preg_replace('@<\!--#Meta:@', '<!--Meta:', $page_content);
} else {
}
else
{
$oWidgetController = &getController('widget');
$page_content = $oWidgetController->transWidgetCode($this->module_info->mcontent);
FileHandler::writeFile($cache_file, $page_content);
}
} else {
if(file_exists($cache_file)) FileHandler::removeFile($cache_file);
}
else
{
if(file_exists($cache_file))
{
FileHandler::removeFile($cache_file);
}
$page_content = $this->module_info->mcontent;
}
}
@ -64,7 +81,8 @@ class pageMobile extends pageView {
{
preg_match_all('!(<img)([^\>]*)(widget=)([^\>]*?)(\>)!is', $this->module_info->content, $matches);
$page_content = '';
for($i=0,$c=count($matches[0]);$i<$c;$i++) {
for($i=0,$c=count($matches[0]);$i<$c;$i++)
{
$page_content .= preg_replace('/ style\=\"([^\"]+)\" /i',' style="overflow:hidden;clear:both;margin:0 0 20px 0; _margin-right:10px;" ',$matches[0][$i])."\n\n";
}
}

8
modules/page/page.view.php
View file

@ -24,12 +24,12 @@
switch($this->module_info->page_type)
{
case 'WIDGET' : {
$this->cache_file = sprintf("%sfiles/cache/page/%d.%s.cache.php", _XE_PATH_, $this->module_info->module_srl, Context::getLangType());
$this->cache_file = sprintf("%sfiles/cache/page/%d.%s.%s.cache.php", _XE_PATH_, $this->module_info->module_srl, Context::getLangType(), Context::getSslStatus());
$this->interval = (int)($this->module_info->page_caching_interval);
break;
}
case 'OUTSIDE' : {
$this->cache_file = sprintf("./files/cache/opage/%d.cache.php", $this->module_info->module_srl);
$this->cache_file = sprintf("./files/cache/opage/%d.%s.cache.php", $this->module_info->module_srl, Context::getSslStatus());
$this->interval = (int)($this->module_info->page_caching_interval);
$this->path = $this->module_info->path;
break;
@ -60,7 +60,7 @@
if(!file_exists($this->cache_file)) $mtime = 0;
else $mtime = filemtime($this->cache_file);
if($mtime + $interval*60 > time()) {
if($mtime + $this->interval*60 > time()) {
$page_content = FileHandler::readFile($this->cache_file);
$page_content = preg_replace('@<\!--#Meta:@', '<!--Meta:', $page_content);
} else {
@ -86,6 +86,8 @@
}
Context::set('oDocument', $oDocument);
Context::set('module_info', $this->module_info);
if ($this->module_info->skin)
$this->setTemplatePath(sprintf($this->module_path.'skins/%s', $this->module_info->skin));
else

4
modules/page/skins/default/content.html
View file

@ -1,5 +1,5 @@
<h1>{$oDocument->getTitle()}</h1>
{$oDocument->getContent()}
<h1 cond="$module_info->display_title != 'hide'">{$oDocument->getTitle()}</h1>
{$oDocument->getContent($module_info->display_popupmenu != 'hide')}
<block cond="$grant->manager">
<load target="../../tpl/js/page_admin.js" />
<div class="btnArea">

53
modules/page/skins/default/skin.xml Normal file
View file

@ -0,0 +1,53 @@
<?xml version="1.0" encoding="UTF-8"?>
<skin version="0.2">
<title xml:lang="ko">Default Page Skin</title>
<title xml:lang="en">Default Page Skin</title>
<description xml:lang="ko">
문서형 페이지의 기본 스킨입니다.
</description>
<version>0.2</version>
<date>2012-08-28</date>
<author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
<name xml:lang="ko">NHN</name>
<name xml:lang="jp">NHN</name>
<name xml:lang="zh-CN">NHN</name>
<name xml:lang="en">NHN</name>
<name xml:lang="vi">NHN</name>
<name xml:lang="es">NHN</name>
<name xml:lang="zh-TW">NHN</name>
<name xml:lang="tr">NHN</name>
</author>
<extra_vars>
<var name="display_title" type="radio" default="show">
<title xml:lang="ko">제목표시</title>
<title xml:lang="en">Display title</title>
<description xml:lang="ko">
문서의 제목을 표시 할지 결정합니다.
</description>
<options value="show">
<title xml:lang="ko">출력</title>
<title xml:lang="en">Show</title>
</options>
<options value="hide">
<title xml:lang="ko">출력하지 않음</title>
<title xml:lang="en">Hide</title>
</options>
</var>
<var name="display_popupmenu" type="radio" default="show">
<title xml:lang="ko">팝업메뉴 표시</title>
<title xml:lang="en">Display popup menu</title>
<description xml:lang="ko">
문서 하단의 팝업 메뉴를 표시 할지 선택합니다.
</description>
<options value="show">
<title xml:lang="ko">출력</title>
<title xml:lang="en">Show</title>
</options>
<options value="hide">
<title xml:lang="ko">출력하지 않음</title>
<title xml:lang="en">Hide</title>
</options>
</var>
</extra_vars>
</skin>

4
modules/page/tpl/content.html
View file

@ -2,16 +2,14 @@
<!--@if($grant->manager)-->
<load target="./js/page_admin.js" usecdn="true" />
<div class="btnArea">
<!--@if($module_info->page_type == 'WIDGET')-->
<span class="btn"><button type="button" onclick="doRemoveWidgetCache({$module_info->module_srl}); return false;">{$lang->cmd_remake_cache}</button></span>
<!--@end-->
<!--@if($logged_info->is_admin=='Y')-->
<span class="btn"><a href="{getUrl('act','dispPageAdminInfo','module_srl',$module_info->module_srl)}">{$lang->cmd_setup}...</a></span>
<!--@end-->
<!--@if($module_info->page_type != 'OUTSIDE')-->
<span class="btn"><a href="{getUrl('act','dispPageAdminContentModify','document_srl','')}">{$lang->cmd_page_modify}...</a></span>
<!--@end-->
<!--@if($module_info->use_mobile =="Y")-->
<!--@if($module_info->use_mobile =="Y" && $module_info->page_type == 'WIDGET')-->
<span class="btn"><a href="{getUrl('act','dispPageAdminMobileContent','module_srl',$module_info->module_srl)}">Mobile</a></span>
<!--@end-->
</div>

5
modules/page/tpl/header.html
View file

@ -22,6 +22,11 @@
<li <!--@if($act=='dispPageAdminInfo')-->class="active"<!--@end-->><a href="{getUrl('act','dispPageAdminInfo')}">{$lang->module_info}</a></li>
<li <!--@if($act=='dispPageAdminPageAdditionSetup')-->class="active"<!--@end-->><a href="{getUrl('act','dispPageAdminPageAdditionSetup')}">{$lang->cmd_addition_setup}</a></li>
<li <!--@if($act=='dispPageAdminGrantInfo')-->class="active"<!--@end-->><a href="{getUrl('act','dispPageAdminGrantInfo')}">{$lang->cmd_manage_grant}</a></li>
<block cond="$module_info->page_type === 'ARTICLE'">
<li <!--@if($act === 'dispPageAdminSkinInfo')-->class="active"<!--@end-->><a href="{getUrl('act','dispPageAdminSkinInfo')}">{$lang->cmd_manage_skin}</a></li>
<li <!--@if($act === 'dispPageAdminMobileSkinInfo')-->class="active"<!--@end-->><a href="{getUrl('act','dispPageAdminMobileSkinInfo')}">{$lang->cmd_manage_mobile_skin}</a></li>
<li></li>
</block>
<!--@else-->
<li <!--@if($act=='dispPageAdminInsert')-->class="active"<!--@end-->><a href="{getUrl('act','dispPageAdminInsert')}">{$lang->cmd_page_create}</a></li>
<!--@end-->

7
modules/page/tpl/page_info.html
View file

@ -101,6 +101,13 @@
</tr>
<!--@end-->
<!--@if($module_info->page_type == 'ARTICLE')-->
<tr>
<th scope="row">{$lang->skin_fix}</th>
<td class="text">
<input type="checkbox" name="is_skin_fix" id="is_skin_fix" value="Y" checked="checked"|cond="$module_info->is_skin_fix == 'Y'" />
<p>{$lang->about_skin_fix}</p>
</td>
</tr>
<tr>
<th scope="row">{$lang->skin}</th>
<td class="text">

3
modules/page/tpl/skin_info.html Normal file
View file

@ -0,0 +1,3 @@
<!--#include("./header.html")-->
{$skin_content}