Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions admin/components/head.admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,12 @@
<html>
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0 user-scalable=no">
<meta name="viewport" content="width=device-width, initial-scale=1.0 user-scalable=no, viewport-fit=cover">
<meta name="mobile-web-app-capable" content="yes" />
<meta name="msapplication-TileColor" content="<?=$config['colors']['primary']?>">
<meta name="theme-color" content="<?=$config['colors']['primary']?>">
<meta name="theme-color" content="<?=$config['colors']['status_bar'] ?? '#000000'?>">
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />

<title><?=$pageTitle ?></title>

Expand Down
20 changes: 17 additions & 3 deletions api/admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,17 @@
$newConfig['background']['admin'] = $normalizePath($newConfig['background']['admin'] ?? null);
$newConfig['background']['chroma'] = $normalizePath($newConfig['background']['chroma'] ?? null);
$newConfig['collage']['placeholderpath'] = $normalizePath($newConfig['collage']['placeholderpath'] ?? null);
$newConfig['screensaver']['image_source'] = $normalizePath($newConfig['screensaver']['image_source'] ?? null);
$newConfig['screensaver']['video_source'] = $normalizePath($newConfig['screensaver']['video_source'] ?? null);
if (isset($newConfig['screensaver']['switch_minutes'])) {
$newConfig['screensaver']['switch_minutes'] = (int)$newConfig['screensaver']['switch_minutes'];
}
if (isset($newConfig['screensaver']['timeout_minutes'])) {
$newConfig['screensaver']['timeout_minutes'] = (int)$newConfig['screensaver']['timeout_minutes'];
}
if (isset($newConfig['screensaver']['text_backdrop_opacity'])) {
$newConfig['screensaver']['text_backdrop_opacity'] = (float)$newConfig['screensaver']['text_backdrop_opacity'];
}

// Fonts selected via font picker
$newConfig['textonpicture']['font'] = $normalizePath($newConfig['textonpicture']['font'] ?? null);
Expand Down Expand Up @@ -187,6 +198,11 @@
$newConfig['login']['pin'] = '';
}

// Normalize screensaver boolean values (checkbox submits strings)
if (isset($newConfig['screensaver']['enabled'])) {
$newConfig['screensaver']['enabled'] = filter_var($newConfig['screensaver']['enabled'], FILTER_VALIDATE_BOOLEAN);
}

if (isset($newConfig['login']['rental_keypad']) && $newConfig['login']['rental_keypad'] == true) {
if (strlen($newConfig['login']['rental_pin']) != 4 || $newConfig['login']['rental_pin'] === $newConfig['login']['pin']) {
$logger->debug('Rental keypad pin reset.', $newConfig['login']);
Expand Down Expand Up @@ -327,8 +343,6 @@
'Logo file is not a supported image type [' . $ext . ']. Logo disabled.',
$newConfig['logo'],
);
} else {
$logger->debug('Logo file is a supported image type [' . $ext . '], path saved.', $newConfig['logo']);
}
}
}
Expand All @@ -343,7 +357,7 @@
'message' => 'New config saved.',
]);
} catch (\Exception $exception) {
$logger->error('ERROR: Config can not be saved!');
$logger->error('ERROR: Config can not be saved!', ['error' => $exception->getMessage()]);
echo json_encode([
'status' => 'error',
'message' => $exception->getMessage(),
Expand Down
24 changes: 24 additions & 0 deletions api/settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,30 @@
if (!empty($config['background']['chroma'])) {
$config['background']['chroma'] = PathUtility::getPublicPath($config['background']['chroma']);
}
if (!empty($config['screensaver']['image_source']) && $config['screensaver']['mode'] !== 'folder') {
$config['screensaver']['image_source'] = PathUtility::getPublicPath($config['screensaver']['image_source']);
}
if (!empty($config['screensaver']['video_source'])) {
$config['screensaver']['video_source'] = PathUtility::getPublicPath($config['screensaver']['video_source']);
}
if (!empty($config['screensaver']['text_font'])) {
$config['screensaver']['text_font'] = PathUtility::getPublicPath($config['screensaver']['text_font']);
}
if (!empty($config['fonts']['start_screen_title'])) {
$config['fonts']['start_screen_title'] = PathUtility::getPublicPath($config['fonts']['start_screen_title']);
}
if (!empty($config['fonts']['event_text'])) {
$config['fonts']['event_text'] = PathUtility::getPublicPath($config['fonts']['event_text']);
}
if (!empty($config['fonts']['screensaver_text'])) {
$config['fonts']['screensaver_text'] = PathUtility::getPublicPath($config['fonts']['screensaver_text']);
}
if (!empty($config['fonts']['gallery_title'])) {
$config['fonts']['gallery_title'] = PathUtility::getPublicPath($config['fonts']['gallery_title']);
}
if (empty($config['screensaver']['text_position'])) {
$config['screensaver']['text_position'] = 'center';
}

echo 'const config = ' . json_encode($config) . ';';
echo 'const environment = ' . json_encode(new Environment()) . ';';
6 changes: 6 additions & 0 deletions assets/js/admin/buttons.js
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,12 @@ $(function () {
});
});

$('#screensaver-preview-btn').on('click', function (e) {
e.preventDefault();
window.open('../?screensaverPreview=1', '_blank');
return false;
});

$('#layout-generator').on('click', function (ev) {
ev.preventDefault();
window.open('../admin/generator');
Expand Down
62 changes: 59 additions & 3 deletions assets/js/core.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/* eslint n/no-unsupported-features/node-builtins: "off" */
/* globals initPhotoSwipeFromDOM initRemoteBuzzerFromDOM processChromaImage remoteBuzzerClient rotaryController globalGalleryHandle photoboothTools photoboothPreview virtualKeyboard */

/* global createScreensaver */
const photoBooth = (function () {
const PhotoStyle = {
PHOTO: 'photo',
Expand Down Expand Up @@ -40,6 +41,12 @@ const photoBooth = (function () {
loaderMessage = loader.find('.stage-message'),
loaderImage = loader.find('.stage-image'),
resultPage = $('.stage[data-stage="result"]'),
screensaverOverlay = $('#screensaver-overlay'),
screensaverVideo = $('#screensaver-video'),
screensaverImage = $('#screensaver-image'),
screensaverTextTop = $('#screensaver-text-top'),
screensaverTextCenter = $('#screensaver-text-center'),
screensaverTextBottom = $('#screensaver-text-bottom'),
previewIpcam = $('#preview--ipcam'),
previewVideo = $('#preview--video'),
previewFramePicture = $('#previewframe--picture'),
Expand All @@ -58,10 +65,20 @@ const photoBooth = (function () {
config.preview.asBackground &&
config.preview.mode === PreviewMode.DEVICE.valueOf() &&
((config.commands.preview && !config.preview.bsm) || !config.commands.preview),
timeToLive = config.picture.time_to_live * 1000,
timeToLive = parseInt(config.picture.time_to_live, 10) * 1000,
continuousCollageTime = config.collage.continuous_time * 1000,
retryTimeout = config.picture.retry_timeout * 1000,
notificationTimeout = config.ui.notification_timeout * 1000;
notificationTimeout = config.ui.notification_timeout * 1000,
screensaverMode = config.screensaver.mode,
screensaverEnabled =
config.screensaver.enabled &&
config.screensaver.timeout_minutes > 0 &&
(screensaverMode === 'gallery' ||
screensaverMode === 'folder' ||
(screensaverMode === 'video' ? !!config.screensaver.video_source : !!config.screensaver.image_source)),
screensaverTimeoutMs = (config.screensaver.timeout_minutes || 0) * 60000,
screensaverSwitchMs = (config.screensaver.switch_minutes || 1) * 60000,
urlSafe = (src) => (src ? encodeURI(src) : '');

let timeOut,
chromaFile = '',
Expand All @@ -86,7 +103,7 @@ const photoBooth = (function () {
};

api.resetTimeOut = function () {
if (timeToLive == 0) {
if (timeToLive === 0) {
return;
}
clearTimeout(timeOut);
Expand Down Expand Up @@ -137,8 +154,33 @@ const photoBooth = (function () {
rotaryController.focusSet(startPage);

initPhotoSwipeFromDOM('#galimages');

api.screensaver.resetTimer();

const params = new URLSearchParams(window.location.search);
if (params.has('screensaverPreview')) {
api.screensaver.show(true);
}
};

api.screensaver = createScreensaver({
config,
environment,
startPage,
overlay: screensaverOverlay,
videoEl: screensaverVideo,
imageEl: screensaverImage,
textTop: screensaverTextTop,
textCenter: screensaverTextCenter,
textBottom: screensaverTextBottom,
screensaverEnabled,
screensaverMode,
screensaverTimeoutMs,
screensaverSwitchMs,
urlSafe,
photoboothTools
});

api.navbar = {
open: function () {
filternav.addClass('sidenav--open');
Expand Down Expand Up @@ -504,6 +546,7 @@ const photoBooth = (function () {
videoBackground.hide();
startPage.removeClass('stage--active');
loader.addClass('stage--active');
api.screensaver.hide();

if (config.get_request.countdown) {
let getMode;
Expand Down Expand Up @@ -1269,6 +1312,8 @@ const photoBooth = (function () {
if (config.commands.post_photo) {
api.shellCommand('post-command', filename);
}

api.screensaver.resetTimer();
};

api.addImage = function (imageName) {
Expand Down Expand Up @@ -1485,6 +1530,17 @@ const photoBooth = (function () {
rotaryController.focusSet(startPage);
});

if (screensaverEnabled) {
$(document).on('click touchstart keydown mousemove', function () {
api.screensaver.resetTimer();
});

screensaverOverlay.on('click touchstart', function (e) {
e.preventDefault();
api.screensaver.resetTimer();
});
}

$('.cups-button').on('click', function (ev) {
ev.preventDefault();

Expand Down
Loading
Loading