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

Merge branch 'rhymix:develop' into develop

Browse source
This commit is contained in:
Lastorder 2024-07-15 10:19:17 +09:00 • committed by GitHub
commit a8d8e0663d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 9 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

8
modules/document/document.controller.php
View file

@ -2866,15 +2866,11 @@ class DocumentController extends Document
'<?php '.
'require_once(\''.FileHandler::getRealPath('./common/autoload.php').'\'); '.
'Context::init(); '.
'Context::setCacheControl(0); '.
'header("Content-Type: text/xml; charset=UTF-8"); '.
'header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); '.
'header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT"); '.
'header("Cache-Control: no-store, no-cache, must-revalidate"); '.
'header("Cache-Control: post-check=0, pre-check=0", false); '.
'header("Pragma: no-cache"); '.
'%s'.
'%s '.
'$oContext->close();'.
'Context::close();'.
'?>'.
'<root>%s</root>',
$header_script,

5
modules/layout/layout.admin.controller.php
View file

@ -618,11 +618,8 @@ class LayoutAdminController extends Layout
$stream = $tar->toTarStream();
$filename = 'faceoff_' . date('YmdHis') . '.tar';
header("Cache-Control: ");
header("Pragma: ");
Context::setCacheControl(0);
header("Content-Type: application/x-compressed");
header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
// header("Content-Length: " .strlen($stream)); ?? why??
header('Content-Disposition: attachment; filename="'. $filename .'"');
header("Content-Transfer-Encoding: binary\n");
echo $stream;

8
modules/menu/menu.admin.controller.php
View file

@ -1893,14 +1893,10 @@ class MenuAdminController extends Menu
'<?php ' . PHP_EOL .
'require_once('.var_export(FileHandler::getRealPath('./common/autoload.php'), true) . ');' . PHP_EOL .
'Context::init(); ' . PHP_EOL .
'Context::setCacheControl(0); ' . PHP_EOL .
'header("Content-Type: text/xml; charset=UTF-8");' . PHP_EOL .
'header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");' . PHP_EOL .
'header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");' . PHP_EOL .
'header("Cache-Control: no-store, no-cache, must-revalidate");' . PHP_EOL .
'header("Cache-Control: post-check=0, pre-check=0", false);' . PHP_EOL .
'header("Pragma: no-cache");' . PHP_EOL .
'%s' . PHP_EOL .
'$oContext->close(); ?' . '>' . PHP_EOL .
'Context::close(); ?' . '>' . PHP_EOL .
'<root>%s</root>',
$header_script,
$this->getXmlTree($tree[0], $tree, $site_srl, $domain)

2
widgets/content/skins/default/gallery.html
View file

@ -6,7 +6,7 @@
<!--@if($v=='thumbnail')-->
<a href="{$item->getLink()}" class="thumb" style="width:{$widget_info->thumbnail_width}px;height:{$widget_info->thumbnail_height}px" target="_blank"|cond="$widget_info->new_window">
<!--@if($item->getThumbnail())-->
<img src="{$item->getThumbnail()}" style="width:{$widget_info->thumbnail_width}px;height:{$widget_info->thumbnail_height}px"/>
<img src="{$item->getThumbnail()}" srcset="{$item->getThumbnail(2)} 2x"|cond="$item->getThumbnail(2)" style="width:{$widget_info->thumbnail_width}px;height:{$widget_info->thumbnail_height}px"/>
<!--@else-->
<span class="imgNone">{$lang->none_image}</span>
<!--@end-->

4
widgets/content/skins/default/image_title.html
View file

@ -5,7 +5,7 @@
{@$thumbnail_idx = $widget_info->content_items[0]->getFirstThumbnailIdx() }
{@$have_first_thumbnail=true}
<p class="widgetThumb floatLeft" style="margin-right:-{$widget_info->thumbnail_width}px">
<a href="{$widget_info->content_items[$thumbnail_idx]->getLink()}" class="thumb" target="_blank"|cond="$widget_info->new_window"><img src="{$widget_info->content_items[$thumbnail_idx]->getThumbnail()}" style="width:{$widget_info->thumbnail_width}px;height:{$widget_info->thumbnail_height}px"></a>
<a href="{$widget_info->content_items[$thumbnail_idx]->getLink()}" class="thumb" target="_blank"|cond="$widget_info->new_window"><img src="{$widget_info->content_items[$thumbnail_idx]->getThumbnail()}" srcset="{$widget_info->content_items[$thumbnail_idx]->getThumbnail(2)} 2x"|cond="$widget_info->content_items[$thumbnail_idx]->getThumbnail(2)" style="width:{$widget_info->thumbnail_width}px;height:{$widget_info->thumbnail_height}px"></a>
</p>
<!--@end-->
@ -63,7 +63,7 @@
{@$thumbnail_idx = $widget_info->content_items[0]->getFirstThumbnailIdx() }
{@$have_first_thumbnail=true}
<p class="widgetThumb floatLeft" style="margin-right:-{$widget_info->thumbnail_width}px">
<a href="{$widget_info->content_items[$thumbnail_idx]->getLink()}" class="thumb" target="_blank"|cond="$widget_info->new_window"><img src="{$widget_info->content_items[$thumbnail_idx]->getThumbnail()}" style="width:{$widget_info->thumbnail_width}px;height:{$widget_info->thumbnail_height}px"></a>
<a href="{$widget_info->content_items[$thumbnail_idx]->getLink()}" class="thumb" target="_blank"|cond="$widget_info->new_window"><img src="{$widget_info->content_items[$thumbnail_idx]->getThumbnail()}" srcset="{$widget_info->content_items[$thumbnail_idx]->getThumbnail(2)} 2x"|cond="$widget_info->content_items[$thumbnail_idx]->getThumbnail(2)" style="width:{$widget_info->thumbnail_width}px;height:{$widget_info->thumbnail_height}px"></a>
</p>
<!--@end-->

2
widgets/content/skins/default/image_title_content.html
View file

@ -6,7 +6,7 @@
<p class="thumbArea" style="width:{$widget_info->thumbnail_width}px;margin-right:-{$widget_info->thumbnail_width}px;">
<a href="{$item->getLink()}" class="thumb" style="width:{$widget_info->thumbnail_width}px;height:{$widget_info->thumbnail_height}px" target="_blank"|cond="$widget_info->new_window">
<!--@if($item->getThumbnail())-->
<img src="{$item->getThumbnail()}" style="width:{$widget_info->thumbnail_width}px;height:{$widget_info->thumbnail_height}px" />
<img src="{$item->getThumbnail()}" srcset="{$item->getThumbnail(2)} 2x"|cond="$item->getThumbnail(2)" style="width:{$widget_info->thumbnail_width}px;height:{$widget_info->thumbnail_height}px" />
<!--@else-->
<span class="imgNone">{$lang->none_image}</span>
<!--@end-->