From 9a40901475d6c086ff3f716b23cf2f6bad39a304 Mon Sep 17 00:00:00 2001
From: Soyu Kim <mmx900@gmail.com>
Date: Sun, 7 Jul 2024 09:39:55 +0900
Subject: [PATCH 1/2] Add HiDPI thumbnails to default content widget skin

---
 widgets/content/skins/default/gallery.html             | 2 +-
 widgets/content/skins/default/image_title.html         | 4 ++--
 widgets/content/skins/default/image_title_content.html | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/widgets/content/skins/default/gallery.html b/widgets/content/skins/default/gallery.html
index e7a02ef12..67b3dc262 100644
--- a/widgets/content/skins/default/gallery.html
+++ b/widgets/content/skins/default/gallery.html
@@ -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-->
diff --git a/widgets/content/skins/default/image_title.html b/widgets/content/skins/default/image_title.html
index 8a0b7fdfc..5c9c340f1 100644
--- a/widgets/content/skins/default/image_title.html
+++ b/widgets/content/skins/default/image_title.html
@@ -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-->
 
diff --git a/widgets/content/skins/default/image_title_content.html b/widgets/content/skins/default/image_title_content.html
index 6fc83a5f3..a3307dc6f 100644
--- a/widgets/content/skins/default/image_title_content.html
+++ b/widgets/content/skins/default/image_title_content.html
@@ -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-->

From e4c3c5ac6ca98de3080d7ec4f16071b5d065740c Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Mon, 15 Jul 2024 10:14:37 +0900
Subject: [PATCH 2/2] Fix #2376 unnecessary header output in menu, document,
 layout modules

---
 modules/document/document.controller.php   | 8 ++------
 modules/layout/layout.admin.controller.php | 5 +----
 modules/menu/menu.admin.controller.php     | 8 ++------
 3 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php
index 8d67f5134..c174bec79 100644
--- a/modules/document/document.controller.php
+++ b/modules/document/document.controller.php
@@ -2865,15 +2865,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,
diff --git a/modules/layout/layout.admin.controller.php b/modules/layout/layout.admin.controller.php
index 2abf56ebd..a60ce6ea5 100644
--- a/modules/layout/layout.admin.controller.php
+++ b/modules/layout/layout.admin.controller.php
@@ -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;
diff --git a/modules/menu/menu.admin.controller.php b/modules/menu/menu.admin.controller.php
index b7b78b77d..7ab647c62 100644
--- a/modules/menu/menu.admin.controller.php
+++ b/modules/menu/menu.admin.controller.php
@@ -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)