Aesthetic patch.

Maikuolan · Maikuolan · commit d806f6fb12f7 · 2023-02-11T00:24:36.000+08:00
diff --git a/assets/bluemetal/frontend.css b/assets/bluemetal/frontend.css
@@ -19,6 +19,7 @@ select,option,input,textarea{filter:grayscale(.1) brightness(.94)}
 select:active,textarea:active:not([readonly]),input:active{filter:grayscale(0) brightness(1)}
 select:disabled,textarea:disabled,input:disabled{filter:grayscale(1) brightness(.5)}
 select:focus,textarea:focus,input:focus,select:hover,textarea:hover:not([readonly]),input:hover{filter:grayscale(0) brightness(1)}
+table{table-layout:fixed}
 table,.spanner{width:100%}
 textarea{height:150px}
 textarea.half{height:75px}
@@ -99,6 +100,7 @@ blockquote.comSub{margin:-2px 0 0 0;padding:0 0 0 0}
 #statnavlink::before{content:"🗠"}
 #testnavlink::before{content:"🔬"}
 #websitelink::before{content:"🔗"}
+.navicon{filter:invert(85%) saturate(1074%) hue-rotate(206deg) brightness(100%) contrast(87%);position:relative;top:1px;width:16px;height:16px}
 select+input[type=submit],select+input[type=button],input[name=qkey]+input[type=submit]{height:20px;margin-{FE_Align}:-3px;border-bottom-{FE_Align}-radius:0;border-top-{FE_Align}-radius:0;padding-{FE_Align}:3px}
 input[name=qkey]{margin-{FE_Align}:-3px;padding-{FE_Align}:3px}
 select,input[type=submit],input[type=reset],input[type=button],input[type=text],input[type=password],input[type=number],input[type=date],input[type=time],button{box-sizing:border-box;height:20px;padding-top:0;padding-bottom:0}
diff --git a/assets/bluemetal/pips.yml b/assets/bluemetal/pips.yml
@@ -7,7 +7,7 @@
 # License: GNU/GPLv2
 # @see LICENSE.txt
 #
-# This file: Blue metal theme pips data (last modified: 2022.02.13).
+# This file: Blue metal theme pips data (last modified: 2023.02.09).
 ##/
 
 Key: !!binary "R0lGODlhBwAJAIABAH+UsP///yH5BAEKAAEALAAAAAAHAAkAAAINjH+gyaaAAkQrznRbKAA7"
@@ -17,3 +17,4 @@ Left: !!binary "R0lGODlhCAAQAIABAH+UsAAAACH5BAEKAAEALAAAAAAIABAAAAIWjH+ga6vJIEDh
 Right Invalid: !!binary "R0lGODlhCAAQAIABAH+UsAAAACH5BAEKAAEALAAAAAAIABAAAAIWjH+gmwvoUGBSSfPatTVDr10i94lIAQA7"
 Right Valid: !!binary "R0lGODlhCAAQAKECAAKZAH+UsAAAAAAAACH5BAEKAAIALAAAAAAIABAAAAIalH+hmxvokGBSSfOuFuCCLoHId5Ci8Z3ohhQAOw=="
 Right: !!binary "R0lGODlhCAAIAIABAH+UsP///yH5BAEKAAEALAAAAAAIAAgAAAINjH+gmwvoUGBSSfOuKQA7"
+Tick: !!binary "R0lGODlhCAAJAIABAAKZAP///yH5BAEKAAEALAAAAAAIAAkAAAINjI8IGbD5VHQNUshYAQA7"
diff --git a/assets/default/frontend.css b/assets/default/frontend.css
@@ -19,6 +19,7 @@ select,option,input,textarea{filter:grayscale(.1) brightness(.94)}
 select:active,textarea:active:not([readonly]),input:active{filter:grayscale(0) brightness(1)}
 select:disabled,textarea:disabled,input:disabled{filter:grayscale(1) brightness(.5)}
 select:focus,textarea:focus,input:focus,select:hover,textarea:hover:not([readonly]),input:hover{filter:grayscale(0) brightness(1)}
+table{table-layout:fixed}
 table,.spanner{width:100%}
 textarea{height:150px}
 textarea.half{height:75px}
@@ -103,6 +104,7 @@ blockquote.comSub{margin:-2px 0 0 0;padding:0 0 0 0}
 #statnavlink::before{content:"🗠"}
 #testnavlink::before{content:"🔬"}
 #websitelink::before{content:"🔗"}
+.navicon{filter:invert(12%) sepia(91%) saturate(1979%) hue-rotate(222deg) brightness(107%) contrast(94%);position:relative;top:1px;width:16px;height:16px}
 select+input[type=submit],select+input[type=button],input[name=qkey]+input[type=submit]{margin-{FE_Align}:-3px;border-bottom-{FE_Align}-radius:0;border-top-{FE_Align}-radius:0;padding-{FE_Align}:3px}
 input[name=qkey]{margin-{FE_Align}:-3px;padding-{FE_Align}:3px}
 select,input[type=submit],input[type=reset],input[type=button],input[type=text],input[type=password],input[type=number],input[type=date],input[type=time],button{box-sizing:border-box;height:20px;padding-top:0;padding-bottom:0}
diff --git a/assets/default/pips.yml b/assets/default/pips.yml
@@ -7,7 +7,7 @@
 # License: GNU/GPLv2
 # @see LICENSE.txt
 #
-# This file: Default theme pips data (last modified: 2022.02.13).
+# This file: Default theme pips data (last modified: 2023.02.09).
 ##/
 
 Key: !!binary "R0lGODlhBwAJAKECAJkCAP3/+////////yH5BAEKAAEALAAAAAAHAAkAAAINjH+gyaaAAkQrznRbKAA7"
@@ -17,3 +17,4 @@ Left: !!binary "R0lGODlhCAAIAKECAJkCAPv99P///////yH5BAEKAAEALAAAAAAIAAgAAAINjH+g
 Right Invalid: !!binary "R0lGODlhCAAQAIABAJkCAAAAACH5BAEKAAEALAAAAAAIABAAAAIWjH+gmwvoUGBSSfPatTVDr10i94lIAQA7"
 Right Valid: !!binary "R0lGODlhCAAQAKECAJkCAAKZAAAAAAAAACH5BAEKAAIALAAAAAAIABAAAAIalH+gmwvokGBSSfOuFuGGLoHId5Ci8Z3ohhQAOw=="
 Right: !!binary "R0lGODlhCAAIAKECAJkCAPv99P///////yH5BAEKAAEALAAAAAAIAAgAAAINjH+gmwvoUGBSSfOuKQA7"
+Tick: !!binary "R0lGODlhCAAJAIABAAKZAP///yH5BAEKAAEALAAAAAAIAAkAAAINjI8IGbD5VHQNUshYAQA7"
diff --git a/assets/fullmoon/frontend.css b/assets/fullmoon/frontend.css
@@ -18,6 +18,7 @@ select,option,input,textarea{filter:grayscale(.1) brightness(.94)}
 select:active,textarea:active:not([readonly]),input:active{filter:grayscale(0) brightness(1)}
 select:disabled,textarea:disabled,input:disabled{filter:grayscale(1) brightness(.5)}
 select:focus,textarea:focus,input:focus,select:hover,textarea:hover:not([readonly]),input:hover{filter:grayscale(0) brightness(1)}
+table{table-layout:fixed}
 table,.spanner{width:100%}
 textarea{height:150px}
 textarea.half{height:75px}
diff --git a/assets/fullmoon/pips.yml b/assets/fullmoon/pips.yml
@@ -7,7 +7,7 @@
 # License: GNU/GPLv2
 # @see LICENSE.txt
 #
-# This file: Full moon theme pips data (last modified: 2022.02.13).
+# This file: Full moon theme pips data (last modified: 2023.02.09).
 ##/
 
 Key: !!binary "R0lGODlhBwAJAKECAMrMyf3/+////////yH5BAEKAAEALAAAAAAHAAkAAAINjH+gyaaAAkQrznRbKAA7"
@@ -17,3 +17,4 @@ Left: !!binary "R0lGODlhCAAIAKECAMrMyfv99P///////yH5BAEKAAEALAAAAAAIAAgAAAINjH+g
 Right Invalid: !!binary "R0lGODlhCAAQAIABAMrMyQAAACH5BAEKAAEALAAAAAAIABAAAAIWjH+gmwvoUGBSSfPatTVDr10i94lIAQA7"
 Right Valid: !!binary "R0lGODlhCAAQAKECAAKZAMrMyQAAAAAAACH5BAEKAAIALAAAAAAIABAAAAIalH+hmxvokGBSSfOuFuCCLoHId5Ci8Z3ohhQAOw=="
 Right: !!binary "R0lGODlhCAAIAKECAMrMyfv99P///////yH5BAEKAAEALAAAAAAIAAgAAAINjH+gmwvoUGBSSfOuKQA7"
+Tick: !!binary "R0lGODlhCAAJAIABAAKZAP///yH5BAEKAAEALAAAAAAIAAkAAAINjI8IGbD5VHQNUshYAQA7"
diff --git a/assets/moss/frontend.css b/assets/moss/frontend.css
@@ -19,6 +19,7 @@ select,option,input,textarea{filter:grayscale(.1) brightness(.94)}
 select:active,textarea:active:not([readonly]),input:active{filter:grayscale(0) brightness(1)}
 select:disabled,textarea:disabled,input:disabled{filter:grayscale(1) brightness(.5)}
 select:focus,textarea:focus,input:focus,select:hover,textarea:hover:not([readonly]),input:hover{filter:grayscale(0) brightness(1)}
+table{table-layout:fixed}
 table,.spanner{width:100%}
 textarea{height:150px}
 textarea.half{height:75px}
@@ -100,6 +101,7 @@ blockquote.comSub{margin:-2px 0 0 0;padding:0 0 0 0}
 #statnavlink::before{content:"🗠"}
 #testnavlink::before{content:"🔬"}
 #websitelink::before{content:"🔗"}
+.navicon{filter:invert(27%) sepia(5%) saturate(2258%) hue-rotate(314deg) brightness(97%) contrast(85%);position:relative;top:1px;width:16px;height:16px}
 select+input[type=submit],select+input[type=button],input[name=qkey]+input[type=submit]{height:20px;margin-{FE_Align}:-3px;border-bottom-{FE_Align}-radius:0;border-top-{FE_Align}-radius:0;padding-{FE_Align}:3px}
 input[name=qkey]{margin-{FE_Align}:-3px;padding-{FE_Align}:3px}
 select,input[type=submit],input[type=reset],input[type=button],input[type=text],input[type=password],input[type=number],input[type=date],input[type=time],button{box-sizing:border-box;height:20px;padding-top:0;padding-bottom:0}
diff --git a/assets/primer/frontend.css b/assets/primer/frontend.css
@@ -7,6 +7,7 @@ code{background-color:rgba(164,128,102,.5);vertical-align:0;display:inline-block
 .branchline,hr::before{display:table;content:""}
 img.ico{width:16px;height:16px;border:0}
 label{font-weight:600}
+table{table-layout:fixed}
 table,.spanner{width:100%}
 textarea{height:150px}
 textarea.half{height:75px}
@@ -97,6 +98,7 @@ blockquote.comSub{margin:-2px 0 0 0;padding:0 0 0 0}
 #statnavlink::before{content:"🗠"}
 #testnavlink::before{content:"🔬"}
 #websitelink::before{content:"🔗"}
+.navicon{filter:invert(23%) sepia(82%) saturate(2401%) hue-rotate(201deg) brightness(97%) contrast(98%);position:relative;top:1px;width:16px;height:16px}
 p{margin-top:0;margin-bottom:10px}
 small{font-size:.9em}
 sub,sup{font-size:.7em;line-height:0;position:relative;vertical-align:baseline}
diff --git a/assets/primerdark/frontend.css b/assets/primerdark/frontend.css
@@ -8,6 +8,7 @@ code{background-color:rgba(255,153,102,.3);vertical-align:0;display:inline-block
 .branchline,hr::before{display:table;content:""}
 img.ico{width:16px;height:16px;border:0}
 label{font-weight:600}
+table{table-layout:fixed}
 table,.spanner{width:100%}
 textarea{height:150px}
 textarea.half{height:75px}
@@ -100,6 +101,7 @@ blockquote.comSub{margin:-2px 0 0 0;padding:0 0 0 0}
 #statnavlink::before{content:"🗠"}
 #testnavlink::before{content:"🔬"}
 #websitelink::before{content:"🔗"}
+.navicon{filter:invert(78%) sepia(74%) saturate(2174%) brightness(105%) contrast(104%);position:relative;top:1px;width:16px;height:16px}
 p{margin-top:0;margin-bottom:10px}
 small{font-size:.9em}
 sub,sup{font-size:.7em;line-height:0;position:relative;vertical-align:baseline}
diff --git a/assets/rbi/frontend.css b/assets/rbi/frontend.css
@@ -19,6 +19,7 @@ select,option,input,textarea{filter:grayscale(.1) brightness(.94)}
 select:active,textarea:active:not([readonly]),input:active{filter:grayscale(0) brightness(1)}
 select:disabled,textarea:disabled,input:disabled{filter:grayscale(1) brightness(.5)}
 select:focus,textarea:focus,input:focus,select:hover,textarea:hover:not([readonly]),input:hover{filter:grayscale(0) brightness(1)}
+table{table-layout:fixed}
 table,.spanner{width:100%}
 textarea{height:150px}
 textarea.half{height:75px}
@@ -103,6 +104,7 @@ blockquote.comSub{margin:-2px 0 0 0;padding:0 0 0 0}
 #statnavlink::before{content:"🗠"}
 #testnavlink::before{content:"🔬"}
 #websitelink::before{content:"🔗"}
+.navicon{filter:invert(22%) sepia(17%) saturate(5055%) hue-rotate(340deg) brightness(97%) contrast(90%);position:relative;top:1px;width:16px;height:16px}
 select+input[type=submit],select+input[type=button],input[name=qkey]+input[type=submit]{margin-{FE_Align}:-3px;border-bottom-{FE_Align}-radius:0;border-top-{FE_Align}-radius:0;padding-{FE_Align}:3px}
 input[name=qkey]{margin-{FE_Align}:-3px;padding-{FE_Align}:3px}
 select,input[type=submit],input[type=reset],input[type=button],input[type=text],input[type=password],input[type=number],input[type=date],input[type=time],button{box-sizing:border-box;height:20px;padding-top:0;padding-bottom:0}
diff --git a/assets/slate/frontend.css b/assets/slate/frontend.css
@@ -20,6 +20,7 @@ select,option,textarea,input{filter:brightness(.94)}
 select:active,textarea:active:not([readonly]),input:active{filter:brightness(1)}
 select:disabled,textarea:disabled,input:disabled{filter:brightness(.5)}
 select:focus,textarea:focus,input:focus,select:hover,textarea:hover:not([readonly]),input:hover{filter:brightness(1.3)}
+table{table-layout:fixed}
 table,.spanner{width:100%}
 textarea{height:150px}
 textarea.half{height:75px}
@@ -101,6 +102,7 @@ blockquote.comSub{margin:-2px 0 0 0;padding:0 0 0 0}
 #statnavlink::before{content:"🗠"}
 #testnavlink::before{content:"🔬"}
 #websitelink::before{content:"🔗"}
+.navicon{filter:invert(63%) sepia(44%) saturate(3371%) hue-rotate(1deg) brightness(104%) contrast(104%);position:relative;top:1px;width:16px;height:16px}
 select+input[type=submit],select+input[type=button],input[name=qkey]+input[type=submit]{margin-{FE_Align}:-3px;border-bottom-{FE_Align}-radius:0;border-top-{FE_Align}-radius:0;padding-{FE_Align}:3px}
 input[name=qkey]{margin-{FE_Align}:-3px;padding-{FE_Align}:3px}
 select,input[type=submit],input[type=reset],input[type=button],input[type=text],input[type=password],input[type=number],input[type=date],input[type=time],button{box-sizing:border-box;height:20px;padding-top:0;padding-bottom:0}
diff --git a/assets/slate/pips.yml b/assets/slate/pips.yml
@@ -7,7 +7,7 @@
 # License: GNU/GPLv2
 # @see LICENSE.txt
 #
-# This file: Slate theme pips data (last modified: 2022.02.13).
+# This file: Slate theme pips data (last modified: 2023.02.09).
 ##/
 
 Key: !!binary "R0lGODlhBwAJAKECAMrMyf3/+////////yH5BAEKAAEALAAAAAAHAAkAAAINjH+gyaaAAkQrznRbKAA7"
@@ -17,3 +17,4 @@ Left: !!binary "R0lGODlhCAAIAKECAMrMyfv99P///////yH5BAEKAAEALAAAAAAIAAgAAAINjH+g
 Right Invalid: !!binary "R0lGODlhCAAQAIABAMrMyQAAACH5BAEKAAEALAAAAAAIABAAAAIWjH+gmwvoUGBSSfPatTVDr10i94lIAQA7"
 Right Valid: !!binary "R0lGODlhCAAQAKECAAKZAMrMyQAAAAAAACH5BAEKAAIALAAAAAAIABAAAAIalH+hmxvokGBSSfOuFuCCLoHId5Ci8Z3ohhQAOw=="
 Right: !!binary "R0lGODlhCAAIAKECAMrMyfv99P///////yH5BAEKAAEALAAAAAAIAAgAAAINjH+gmwvoUGBSSfOuKQA7"
+Tick: !!binary "R0lGODlhCAAJAIABAAKZAP///yH5BAEKAAEALAAAAAAIAAkAAAINjI8IGbD5VHQNUshYAQA7"
diff --git a/src/FrontEnd.php b/src/FrontEnd.php
@@ -8,7 +8,7 @@
  * License: GNU/GPLv2
  * @see LICENSE.txt
  *
- * This file: Front-end handler (last modified: 2023.01.27).
+ * This file: Front-end handler (last modified: 2023.02.10).
  */
 
 namespace phpMussel\FrontEnd;
@@ -391,46 +391,14 @@ public function view(string $Page = ''): void
 
         /** A simple passthru for non-private theme images and related data. */
         if (!empty($this->QueryVariables['phpmussel-asset'])) {
-            /** Guard. */
-            if (!$ThisAsset = $this->getAssetPath($this->QueryVariables['phpmussel-asset'], true)) {
-                return;
-            }
-
-            if (is_readable($ThisAsset) && ($Delimiter = strrpos($ThisAsset, '.')) !== false) {
-                $AssetType = strtolower(substr($ThisAsset, $Delimiter + 1));
-                if ($AssetType === 'jpeg') {
-                    $AssetType = 'jpg';
-                }
-                $Success = false;
-                if (preg_match('~^(?:gif|jpg|png|webp)$~', $AssetType)) {
-                    /** Set asset mime-type (images). */
-                    header('Content-Type: image/' . $AssetType);
-                    $Success = true;
-                } elseif ($AssetType === 'js') {
-                    /** Set asset mime-type (JavaScript). */
-                    header('Content-Type: text/javascript');
-                    $Success = true;
-                }
-                if ($Success) {
-                    if (!empty($this->QueryVariables['theme'])) {
-                        /** Prevents needlessly reloading static assets. */
-                        header('Last-Modified: ' . gmdate('D, d M Y H:i:s T', filemtime($ThisAsset)));
-                    }
-                    /** Send asset data. */
-                    echo $this->Loader->readFileContent($ThisAsset);
-                }
-            }
-            return;
+            $this->eTaggable($this->QueryVariables['phpmussel-asset']);
         }
 
         /** A simple passthru for the front-end CSS. */
         if ($Page === 'css') {
-            header('Content-Type: text/css');
-            echo $this->Loader->parse($FE, $this->Loader->parse(
-                $this->Loader->L10N->Data,
-                $this->Loader->readFileContent($this->getAssetPath('frontend.css'))
-            ));
-            return;
+            $this->eTaggable('frontend.css', function ($AssetData) use (&$FE) {
+                return $this->Loader->parse($FE, $this->Loader->parse($this->Loader->L10N->Data, $AssetData));
+            });
         }
 
         /** A simple passthru for the favicon. */
@@ -2883,4 +2851,63 @@ private function canonical(string $Path): string
         }
         return $Path;
     }
+
+    /**
+     * Fetch an etaggable asset as requested by the client.
+     *
+     * @param string $Asset The path to the asset.
+     * @param ?callable $Callback An optional callback.
+     * @return exit
+     */
+    private function eTaggable(string $Asset, ?callable $Callback = null): void
+    {
+        if (!preg_match('~[^\da-z._]~i', $Asset)) {
+            $ThisAsset = $this->getAssetPath($Asset, true);
+            if (strlen($ThisAsset) && is_readable($ThisAsset) && ($ThisAssetDel = strrpos($ThisAsset, '.')) !== false) {
+                $Success = false;
+                $Type = strtolower(substr($ThisAsset, $ThisAssetDel + 1));
+                if ($Type === 'jpeg') {
+                    $Type = 'jpg';
+                }
+                if (preg_match('/^(?:gif|jpg|png|webp)$/', $Type)) {
+                    $MimeType = 'Content-Type: image/' . $Type;
+                    $Success = true;
+                } elseif ($Type === 'js') {
+                    $MimeType = 'Content-Type: text/javascript';
+                    $Success = true;
+                } elseif ($Type === 'css') {
+                    $MimeType = 'Content-Type: text/css';
+                    $Success = true;
+                }
+                if ($Success) {
+                    $AssetData = $this->Loader->readFileContent($ThisAsset);
+                    $OldETag = $_SERVER['HTTP_IF_NONE_MATCH'] ?? '';
+                    $NewETag = hash('sha256', $AssetData) . '-' . strlen($AssetData);
+                    header('Last-Modified: ' . gmdate('D, d M Y H:i:s T', filemtime($ThisAsset)));
+                    header('ETag: "' . $NewETag . '"');
+                    header('Expires: ' . gmdate('D, d M Y H:i:s T', $this->Loader->Time + 2592000));
+                    if (preg_match('~(?:^|, )(?:"' . $NewETag . '"|' . $NewETag . ')(?:$|, )~', $OldETag)) {
+                        header('HTTP/1.0 304 Not Modified');
+                        header('HTTP/1.1 304 Not Modified');
+                        header('Status: 304 Not Modified');
+                        die;
+                    }
+                    header($MimeType);
+                    if (is_callable($Callback)) {
+                        $AssetData = $Callback($AssetData);
+                    }
+                    echo $AssetData;
+                    die;
+                }
+            }
+            header('HTTP/1.0 404 Not Found');
+            header('HTTP/1.1 404 Not Found');
+            header('Status: 404 Not Found');
+            die;
+        }
+        header('HTTP/1.0 403 Forbidden');
+        header('HTTP/1.1 403 Forbidden');
+        header('Status: 403 Forbidden');
+        die;
+    }
 }
