sbrl-github/Pepperminty-Wiki
sbrl-github
/
Pepperminty-Wiki
mirror of https://github.com/sbrl/Pepperminty-Wiki.git
1
0
Fork 0
Code

Refactor css minification code out into own function

This commit is contained in:
Starbeamrainbowlabs 2019-09-29 15:54:40 +01:00
parent a239f5c044
commit 6120fa8842
Signed by: sbrl
GPG Key ID: 1BE5172E637709C2
3 changed files with 119 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@ -8,6 +8,7 @@ This file holds the changelog for Pepperminty Wiki. This is the master list of t
- TODO Update the first-run wizard to ask whether people want the theme auto-updater to turned on because privacy and inadvertent requests to my web server - TODO Update the first-run wizard to ask whether people want the theme auto-updater to turned on because privacy and inadvertent requests to my web server
- NOTE Don't forget to tell people how to turn the theme auto-updater off in this changelog - NOTE Don't forget to tell people how to turn the theme auto-updater off in this changelog
- Added automatic dark mode to default theme using `prefers-color-scheme` - Added automatic dark mode to default theme using `prefers-color-scheme`
- [Module API] Added new `minify_css` module API function by refactoring the page renderer
### Fixed ### Fixed
- Fixed a bug in the search query performance metrics - Fixed a bug in the search query performance metrics

200
core/05-functions.php
View File

@ -10,14 +10,14 @@
function url_origin( $s = false, $use_forwarded_host = false ) function url_origin( $s = false, $use_forwarded_host = false )
{ {
if($s === false) $s = $_SERVER; if($s === false) $s = $_SERVER;
$ssl = ( ! empty( $s['HTTPS'] ) && $s['HTTPS'] == 'on' ); $ssl = ( ! empty( $s['HTTPS'] ) && $s['HTTPS'] == 'on' );
$sp = strtolower( $s['SERVER_PROTOCOL'] ); $sp = strtolower( $s['SERVER_PROTOCOL'] );
$protocol = substr( $sp, 0, strpos( $sp, '/' ) ) . ( ( $ssl ) ? 's' : '' ); $protocol = substr( $sp, 0, strpos( $sp, '/' ) ) . ( ( $ssl ) ? 's' : '' );
$port = $s['SERVER_PORT']; $port = $s['SERVER_PORT'];
$port = ( ( ! $ssl && $port=='80' ) || ( $ssl && $port=='443' ) ) ? '' : ':'.$port; $port = ( ( ! $ssl && $port=='80' ) || ( $ssl && $port=='443' ) ) ? '' : ':'.$port;
$host = ( $use_forwarded_host && isset( $s['HTTP_X_FORWARDED_HOST'] ) ) ? $s['HTTP_X_FORWARDED_HOST'] : ( isset( $s['HTTP_HOST'] ) ? $s['HTTP_HOST'] : null ); $host = ( $use_forwarded_host && isset( $s['HTTP_X_FORWARDED_HOST'] ) ) ? $s['HTTP_X_FORWARDED_HOST'] : ( isset( $s['HTTP_HOST'] ) ? $s['HTTP_HOST'] : null );
$host = isset( $host ) ? $host : $s['SERVER_NAME'] . $port; $host = isset( $host ) ? $host : $s['SERVER_NAME'] . $port;
return $protocol . '://' . $host; return $protocol . '://' . $host;
} }
/** /**
@ -31,7 +31,7 @@ function url_origin( $s = false, $use_forwarded_host = false )
function full_url( $s = false, $use_forwarded_host = false ) function full_url( $s = false, $use_forwarded_host = false )
{ {
if($s == false) $s = $_SERVER; if($s == false) $s = $_SERVER;
return url_origin( $s, $use_forwarded_host ) . $s['REQUEST_URI']; return url_origin( $s, $use_forwarded_host ) . $s['REQUEST_URI'];
} }
/** /**
@ -119,28 +119,28 @@ function glob_recursive($pattern, $flags = 0)
* @return string An absolute path. * @return string An absolute path.
*/ */
function path_resolve(string $path, string $basePath = null) { function path_resolve(string $path, string $basePath = null) {
// Make absolute path // Make absolute path
if (substr($path, 0, 1) !== DIRECTORY_SEPARATOR) { if (substr($path, 0, 1) !== DIRECTORY_SEPARATOR) {
if ($basePath === null) { if ($basePath === null) {
// Get PWD first to avoid getcwd() resolving symlinks if in symlinked folder // Get PWD first to avoid getcwd() resolving symlinks if in symlinked folder
$path=(getenv('PWD') ?: getcwd()).DIRECTORY_SEPARATOR.$path; $path=(getenv('PWD') ?: getcwd()).DIRECTORY_SEPARATOR.$path;
} elseif (strlen($basePath)) { } elseif (strlen($basePath)) {
$path=$basePath.DIRECTORY_SEPARATOR.$path; $path=$basePath.DIRECTORY_SEPARATOR.$path;
} }
} }
// Resolve '.' and '..' // Resolve '.' and '..'
$components=array(); $components=array();
foreach(explode(DIRECTORY_SEPARATOR, rtrim($path, DIRECTORY_SEPARATOR)) as $name) { foreach(explode(DIRECTORY_SEPARATOR, rtrim($path, DIRECTORY_SEPARATOR)) as $name) {
if ($name === '..') { if ($name === '..') {
array_pop($components); array_pop($components);
} elseif ($name !== '.' && !(count($components) && $name === '')) { } elseif ($name !== '.' && !(count($components) && $name === '')) {
// … && !(count($components) && $name === '') - we want to keep initial '/' for abs paths // … && !(count($components) && $name === '') - we want to keep initial '/' for abs paths
$components[]=$name; $components[]=$name;
} }
} }
return implode(DIRECTORY_SEPARATOR, $components); return implode(DIRECTORY_SEPARATOR, $components);
} }
/** /**
@ -279,10 +279,9 @@ function hide_email($str)
* of $haystack. * of $haystack.
* @return bool Whether $needle can be found at the beginning of $haystack. * @return bool Whether $needle can be found at the beginning of $haystack.
*/ */
function starts_with($haystack, $needle) function starts_with($haystack, $needle) {
{ $length = strlen($needle);
$length = strlen($needle); return (substr($haystack, 0, $length) === $needle);
return (substr($haystack, 0, $length) === $needle);
} }
/** /**
@ -328,9 +327,8 @@ function startsWith($haystack, $needle) {
* @param string $end The substring test for. * @param string $end The substring test for.
* @return bool Whether $whole ends in $end. * @return bool Whether $whole ends in $end.
*/ */
function endsWith($whole, $end) function endsWith($whole, $end) {
{ return (strpos($whole, $end, strlen($whole) - strlen($end)) !== false);
return (strpos($whole, $end, strlen($whole) - strlen($end)) !== false);
} }
/** /**
* Replaces the first occurrence of $find with $replace. * Replaces the first occurrence of $find with $replace.
@ -340,8 +338,7 @@ function endsWith($whole, $end)
* @param string $subject The string ot perform the search and replace on. * @param string $subject The string ot perform the search and replace on.
* @return string The source string after the find and replace has been performed. * @return string The source string after the find and replace has been performed.
*/ */
function str_replace_once($find, $replace, $subject) function str_replace_once($find, $replace, $subject) {
{
$index = strpos($subject, $find); $index = strpos($subject, $find);
if($index !== false) if($index !== false)
return substr_replace($subject, $replace, $index, strlen($find)); return substr_replace($subject, $replace, $index, strlen($find));
@ -357,8 +354,7 @@ function str_replace_once($find, $replace, $subject)
* @author Edited by Starbeamrainbowlabs * @author Edited by Starbeamrainbowlabs
* @return array An array of mime type mappings. * @return array An array of mime type mappings.
*/ */
function system_mime_type_extensions() function system_mime_type_extensions() {
{
global $settings; global $settings;
$out = array(); $out = array();
$file = fopen($settings->mime_extension_mappings_location, 'r'); $file = fopen($settings->mime_extension_mappings_location, 'r');
@ -386,8 +382,7 @@ function system_mime_type_extensions()
* @param string $type The mime type to convert. * @param string $type The mime type to convert.
* @return string The extension for the given mime type. * @return string The extension for the given mime type.
*/ */
function system_mime_type_extension($type) function system_mime_type_extension($type) {
{
static $exts; static $exts;
if(!isset($exts)) if(!isset($exts))
$exts = system_mime_type_extensions(); $exts = system_mime_type_extensions();
@ -402,24 +397,23 @@ function system_mime_type_extension($type)
* @author Edited by Starbeamrainbowlabs * @author Edited by Starbeamrainbowlabs
* @return array An array mapping file extensions to their associated mime types. * @return array An array mapping file extensions to their associated mime types.
*/ */
function system_extension_mime_types() function system_extension_mime_types() {
{
global $settings; global $settings;
$out = array(); $out = array();
$file = fopen($settings->mime_extension_mappings_location, 'r'); $file = fopen($settings->mime_extension_mappings_location, 'r');
while(($line = fgets($file)) !== false) { while(($line = fgets($file)) !== false) {
$line = trim(preg_replace('/#.*/', '', $line)); $line = trim(preg_replace('/#.*/', '', $line));
if(!$line) if(!$line)
continue; continue;
$parts = preg_split('/\s+/', $line); $parts = preg_split('/\s+/', $line);
if(count($parts) == 1) if(count($parts) == 1)
continue; continue;
$type = array_shift($parts); $type = array_shift($parts);
foreach($parts as $part) foreach($parts as $part)
$out[$part] = $type; $out[$part] = $type;
} }
fclose($file); fclose($file);
return $out; return $out;
} }
/** /**
* Converts a given file extension to it's associated mime type. * Converts a given file extension to it's associated mime type.
@ -432,10 +426,10 @@ function system_extension_mime_types()
*/ */
function system_extension_mime_type($ext) { function system_extension_mime_type($ext) {
static $types; static $types;
if(!isset($types)) if(!isset($types))
$types = system_extension_mime_types(); $types = system_extension_mime_types();
$ext = strtolower($ext); $ext = strtolower($ext);
return isset($types[$ext]) ? $types[$ext] : null; return isset($types[$ext]) ? $types[$ext] : null;
} }
/** /**
@ -505,19 +499,18 @@ if (!function_exists('getallheaders')) {
* @package core * @package core
* @todo Identify which platforms don't have it and whether we still need this * @todo Identify which platforms don't have it and whether we still need this
*/ */
function getallheaders() function getallheaders() {
{ if (!is_array($_SERVER))
if (!is_array($_SERVER)) return [];
return [];
$headers = array(); $headers = array();
foreach ($_SERVER as $name => $value) { foreach ($_SERVER as $name => $value) {
if (substr($name, 0, 5) == 'HTTP_') { if (substr($name, 0, 5) == 'HTTP_') {
$headers[str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($name, 5)))))] = $value; $headers[str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($name, 5)))))] = $value;
} }
} }
return $headers; return $headers;
} }
} }
/** /**
* Renders a timestamp in HTML. * Renders a timestamp in HTML.
@ -525,8 +518,7 @@ if (!function_exists('getallheaders')) {
* @param int $timestamp The timestamp to render. * @param int $timestamp The timestamp to render.
* @return string HTML representing the given timestamp. * @return string HTML representing the given timestamp.
*/ */
function render_timestamp($timestamp) function render_timestamp($timestamp) {
{
return "<time class='cursor-query' title='" . date("l jS \of F Y \a\\t h:ia T", $timestamp) . "'>" . human_time_since($timestamp) . "</time>"; return "<time class='cursor-query' title='" . date("l jS \of F Y \a\\t h:ia T", $timestamp) . "'>" . human_time_since($timestamp) . "</time>";
} }
/** /**
@ -535,8 +527,7 @@ function render_timestamp($timestamp)
* @param object $rchange The recent change to render as a page name * @param object $rchange The recent change to render as a page name
* @return string HTML representing the name of the given page. * @return string HTML representing the name of the given page.
*/ */
function render_pagename($rchange) function render_pagename($rchange) {
{
global $pageindex; global $pageindex;
$pageDisplayName = $rchange->page; $pageDisplayName = $rchange->page;
if(isset($pageindex->$pageDisplayName) and !empty($pageindex->$pageDisplayName->redirect)) if(isset($pageindex->$pageDisplayName) and !empty($pageindex->$pageDisplayName->redirect))
@ -550,11 +541,34 @@ function render_pagename($rchange)
* @param string $editorName The name of the editor to render. * @param string $editorName The name of the editor to render.
* @return string HTML representing the given editor's name. * @return string HTML representing the given editor's name.
*/ */
function render_editor($editorName) function render_editor($editorName) {
{
return "<span class='editor'>&#9998; $editorName</span>"; return "<span class='editor'>&#9998; $editorName</span>";
} }
/**
* Minifies CSS. Uses simple computationally-cheap optimisations to reduce size.
* CSS Minification ideas by Jean from catswhocode.com
* @source http://www.catswhocode.com/blog/3-ways-to-compress-css-files-using-php
* @apiVersion 0.20.0
* @param string $css_str The string of CSS to minify.
* @return string The minified CSS string.
*/
function minify_css($css_str) {
// Remove comments
$css = preg_replace('!/\*[^*]*\*+([^/][^*]*\*+)*/!', "", $css);
// Cut down whitespace
$css = preg_replace('/\s+/', " ", $css);
// Remove whitespace after colons and semicolons
$css = str_replace([
" :", ": ", "; ",
" { ", " } ", "{ ", " {", "} ", " }"
], [
":", ":", ";",
"{", "}", "{", "{", "}", "}"
], $css);
return $css;
}
/** /**
* Saves the settings file back to peppermint.json. * Saves the settings file back to peppermint.json.
* @package core * @package core
@ -674,17 +688,17 @@ function email_users($usernames, $subject, $body)
* @source https://stackoverflow.com/questions/4490637/recursive-delete * @source https://stackoverflow.com/questions/4490637/recursive-delete
*/ */
function delete_recursive($path, $delete_self = true) { function delete_recursive($path, $delete_self = true) {
$it = new RecursiveIteratorIterator( $it = new RecursiveIteratorIterator(
new RecursiveDirectoryIterator($path), new RecursiveDirectoryIterator($path),
RecursiveIteratorIterator::CHILD_FIRST RecursiveIteratorIterator::CHILD_FIRST
); );
foreach ($it as $file) { foreach ($it as $file) {
if (in_array($file->getBasename(), [".", ".."])) if (in_array($file->getBasename(), [".", ".."]))
continue; continue;
if($file->isDir()) if($file->isDir())
rmdir($file->getPathname()); rmdir($file->getPathname());
else else
unlink($file->getPathname()); unlink($file->getPathname());
} }
if($delete_self) rmdir($path); if($delete_self) rmdir($path);
} }

37
core/40-page-renderer.php
View File

@ -302,37 +302,22 @@ class page_renderer
public static function get_css_as_html() public static function get_css_as_html()
{ {
global $settings, $defaultCSS; global $settings, $defaultCSS;
$result = "";
if(self::is_css_url()) { if(self::is_css_url()) {
if($settings->css[0] === "/") // Push it if it's a relative resource if($settings->css[0] === "/") // Push it if it's a relative resource
self::add_server_push_indicator("style", $settings->css); self::add_server_push_indicator("style", $settings->css);
return "<link rel='stylesheet' href='$settings->css' />\n"; $result .= "<link rel='stylesheet' href='$settings->css' />\n";
} else { } else {
$css = $settings->css == "auto" ? $defaultCSS : $settings->css; $css = $settings->css == "auto" ? $defaultCSS : $settings->css;
if(!empty($settings->optimize_pages)) {
// CSS Minification ideas by Jean from catswhocode.com if(!empty($settings->optimize_pages))
// Link: http://www.catswhocode.com/blog/3-ways-to-compress-css-files-using-php $css = minify_css($css);
// Remove comments $result .= "<style>$css</style>\n";
$css = preg_replace('!/\*[^*]*\*+([^/][^*]*\*+)*/!', "", $css); }
// Cut down whitespace
$css = preg_replace('/\s+/', " ", $css); if(!empty($settings->css_custom)) {
// Remove whitespace after colons and semicolons $css .= "\n/*** Custom CSS ***/\n$settings->css_custom\n/******************/\n";
$css = str_replace([
" :",
": ",
"; ",
" { ",
" } "
], [
":",
":",
";",
"{",
"}"
], $css);
}
return "<style>$css</style>\n";
} }
} }