malhuda/lookingglass
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 16 Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
dqos 2023-12-20 12:15:00 +01:00
commit 2ae44ada4b
No known key found for this signature in database
6 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
LookingGlass.php
View File

@ -62,8 +62,8 @@ class LookingGlass
if (!defined('LG_BLOCK_NETWORK')) { if (!defined('LG_BLOCK_NETWORK')) {
die('LG_BLOCK_NETWORK not found in config.php'); die('LG_BLOCK_NETWORK not found in config.php');
} }
if (!defined('LG_BLOCK_LOOKINGGLAS')) { if (!defined('LG_BLOCK_LOOKINGGLASS')) {
die('LG_BLOCK_LOOKINGGLAS not found in config.php'); die('LG_BLOCK_LOOKINGGLASS not found in config.php');
} }
if (!defined('LG_BLOCK_SPEEDTEST')) { if (!defined('LG_BLOCK_SPEEDTEST')) {
die('LG_BLOCK_SPEEDTEST not found in config.php'); die('LG_BLOCK_SPEEDTEST not found in config.php');

2
bootstrap.php
View File

@ -44,7 +44,7 @@ $templateData = [
'logo_data_dark' => LG_LOGO_DARK, 'logo_data_dark' => LG_LOGO_DARK,
// //
'block_network' => LG_BLOCK_NETWORK, 'block_network' => LG_BLOCK_NETWORK,
'block_lookingglas' => LG_BLOCK_LOOKINGGLAS, 'block_lookingglass' => LG_BLOCK_LOOKINGGLASS,
'block_speedtest' => LG_BLOCK_SPEEDTEST, 'block_speedtest' => LG_BLOCK_SPEEDTEST,
'block_custom' => LG_BLOCK_CUSTOM, 'block_custom' => LG_BLOCK_CUSTOM,
'custom_html' => '', 'custom_html' => '',

2
config.dist.php
View File

@ -24,7 +24,7 @@ const LG_CUSTOM_HEAD = false;
// Enable or disable blocks/parts of the LG, set false to hide a part; // Enable or disable blocks/parts of the LG, set false to hide a part;
const LG_BLOCK_NETWORK = true; const LG_BLOCK_NETWORK = true;
const LG_BLOCK_LOOKINGGLAS = true; const LG_BLOCK_LOOKINGGLASS = true;
const LG_BLOCK_SPEEDTEST = true; const LG_BLOCK_SPEEDTEST = true;
// This enables the custom block, which you can use to add something custom to the LG; // This enables the custom block, which you can use to add something custom to the LG;
const LG_BLOCK_CUSTOM = false; const LG_BLOCK_CUSTOM = false;

4
docker-compose.yml
View File

@ -25,6 +25,10 @@ services:
IPV4_ADDRESS: 127.0.0.1 IPV4_ADDRESS: 127.0.0.1
IPV6_ADDRESS: ::1 IPV6_ADDRESS: ::1
MAPS_QUERY: Amsterdam MAPS_QUERY: Amsterdam
# Pass these variables with any arbitrary value to disable the respective block.
# DISABLE_BLOCK_NETWORK: 'true'
# DISABLE_BLOCK_LOOKINGGLASS: 'true'
# DISABLE_BLOCK_SPEEDTEST: 'true'
# Uncomment to enable the custom block, which you can use to add something custom to the LG. # Uncomment to enable the custom block, which you can use to add something custom to the LG.
# ENABLE_CUSTOM_BLOCK: 'true' # ENABLE_CUSTOM_BLOCK: 'true'
# Uncomment if you require visitors to accept the Terms of Use; the value should be a link to the terms. # Uncomment if you require visitors to accept the Terms of Use; the value should be a link to the terms.

10
docker/php-fpm/src/config.php
View File

@ -22,12 +22,12 @@ const LG_CSS_OVERRIDES = false;
// Define <head> content, this could be JS, CSS or meta tags; // Define <head> content, this could be JS, CSS or meta tags;
const LG_CUSTOM_HEAD = false; const LG_CUSTOM_HEAD = false;
// Enable or disable blocks/parts of the LG, set false to hide a part; // Enable or disable blocks/parts of the LG, pass these environment variables with any value to disable them;
const LG_BLOCK_NETWORK = true; define('LG_BLOCK_NETWORK', !isset($_ENV['DISABLE_BLOCK_NETWORK']));
const LG_BLOCK_LOOKINGGLAS = true; define('LG_BLOCK_LOOKINGGLASS', !isset($_ENV['DISABLE_BLOCK_LOOKINGGLASS']));
const LG_BLOCK_SPEEDTEST = true; define('LG_BLOCK_SPEEDTEST', !isset($_ENV['DISABLE_BLOCK_SPEEDTEST']));
// This enables the custom block, which you can use to add something custom to the LG; // This enables the custom block, which you can use to add something custom to the LG;
define('LG_BLOCK_CUSTOM', getenv('ENABLE_CUSTOM_BLOCK') !== false); define('LG_BLOCK_CUSTOM', isset($_ENV['ENABLE_CUSTOM_BLOCK']));
// Define a file here which will be used to display the custom block, can be PHP too which outputs HTML; // Define a file here which will be used to display the custom block, can be PHP too which outputs HTML;
const LG_CUSTOM_HTML = __DIR__.'/custom.html.php'; const LG_CUSTOM_HTML = __DIR__.'/custom.html.php';

18
index.php
View File

@ -70,19 +70,23 @@ if (isset($_SESSION[LookingGlass::SESSION_ERROR_MESSAGE])) {
} }
if (LG_BLOCK_CUSTOM) { if (LG_BLOCK_CUSTOM) {
include LG_CUSTOM_PHP; if (defined('LG_CUSTOM_PHP') && file_exists(LG_CUSTOM_PHP)) {
include LG_CUSTOM_PHP;
}
ob_start(); if (defined('LG_CUSTOM_HTML') && file_exists(LG_CUSTOM_HTML)) {
include LG_CUSTOM_HTML; ob_start();
$templateData['custom_html'] = ob_get_clean(); include LG_CUSTOM_HTML;
$templateData['custom_html'] = ob_get_clean();
}
if (defined('LG_CUSTOM_HEADER_PHP')) { if (defined('LG_CUSTOM_HEADER_PHP') && file_exists(LG_CUSTOM_HEADER_PHP)) {
ob_start(); ob_start();
include LG_CUSTOM_HEADER_PHP; include LG_CUSTOM_HEADER_PHP;
$templateData['custom_header'] = ob_get_clean(); $templateData['custom_header'] = ob_get_clean();
} }
if (defined('LG_CUSTOM_FOOTER_PHP')) { if (defined('LG_CUSTOM_FOOTER_PHP') && file_exists(LG_CUSTOM_FOOTER_PHP)) {
ob_start(); ob_start();
include LG_CUSTOM_FOOTER_PHP; include LG_CUSTOM_FOOTER_PHP;
$templateData['custom_footer'] = ob_get_clean(); $templateData['custom_footer'] = ob_get_clean();
@ -194,7 +198,7 @@ $templateData['csrfToken'] = $_SESSION[LookingGlass::SESSION_CSRF] = bin2hex(ran
</div> </div>
<?php endif ?> <?php endif ?>
<?php if (LG_BLOCK_LOOKINGGLAS): ?> <?php if (LG_BLOCK_LOOKINGGLASS): ?>
<div class="row pb-5"> <div class="row pb-5">
<div class="card shadow-lg"> <div class="card shadow-lg">
<div class="card-body p-3"> <div class="card-body p-3">