Skip to content
This repository was archived by the owner on Aug 27, 2022. It is now read-only.
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
5 changes: 5 additions & 0 deletions api/admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,11 @@
$newConfig['remotebuzzer']['port'] = 14711;
}

if (isset($newConfig['get_request']['server']) && empty($newConfig['get_request']['server'])) {
$newConfig['get_request']['countdown'] = false;
$newConfig['get_request']['processed'] = false;
}

if ($newConfig['collage']['layout'] === '1+2') {
$newConfig['collage']['limit'] = 3;
} else {
Expand Down
8 changes: 8 additions & 0 deletions config/config.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,14 @@
$config['synctodrive']['interval'] = 300;


// G E T R E Q U E S T
$config['get_request']['countdown'] = false;
$config['get_request']['processed'] = false;
$config['get_request']['server'] = NULL;
$config['get_request']['picture'] = 'CNTDWNPHOTO';
$config['get_request']['collage'] = 'CNTDWNCOLLAGE';


// A U T H E N T I C A T I O N
$config['login']['enabled'] = false;
$config['login']['username'] = 'Photo';
Expand Down
36 changes: 36 additions & 0 deletions lib/configsetup.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -1531,6 +1531,42 @@
'value' => $config['synctodrive']['logfile'],
],
],
'get_request' => [
'view' => 'advanced',
'get_request_countdown' => [
'view' => 'basic',
'type' => 'checkbox',
'name' => 'get_request[countdown]',
'value' => $config['get_request']['countdown'],
],
'get_request_processed' => [
'view' => 'basic',
'type' => 'checkbox',
'name' => 'get_request[processed]',
'value' => $config['get_request']['processed'],
],
'get_request_server' => [
'view' => 'advanced',
'type' => 'input',
'placeholder' => 'http://xxx.xxx.xxx.xxx',
'name' => 'get_request[server]',
'value' => htmlentities($config['get_request']['server']),
],
'get_request_picture' => [
'view' => 'advanced',
'type' => 'input',
'placeholder' => $defaultConfig['get_request']['picture'],
'name' => 'get_request[picture]',
'value' => htmlentities($config['get_request']['picture']),
],
'get_request_collage' => [
'view' => 'advanced',
'type' => 'input',
'placeholder' => $defaultConfig['get_request']['collage'],
'name' => 'get_request[collage]',
'value' => htmlentities($config['get_request']['collage']),
],
],
'authentication' => [
'view' => 'basic',
'login_enabled' => [
Expand Down
11 changes: 11 additions & 0 deletions resources/lang/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,12 @@
"general:ui_language": "Choose Language",
"general:webserver_ip": "IP address of the Photobooth web server",
"general:webserver_ssid": "Wireless network name (SSID) used to access the photobooth",
"get_request": "GET request",
"get_request:get_request_collage": "GET request for collage at countdown",
"get_request:get_request_countdown": "Send GET request to server at countdown",
"get_request:get_request_picture": "GET request for picture at countdown",
"get_request:get_request_processed": "Send \"Photostyle\" GET request to server after processing",
"get_request:get_request_server": "GET request server",
"githead": "Latest changes",
"home": "Home",
"insertMail": "Enter your e-mail address to receive the photo.",
Expand Down Expand Up @@ -298,6 +304,11 @@
"manual:general:ui_language": "Choose interface language.<p>If you're missing a language or like to help improving translations visit the <a href=\"https://github.com/andi34/photobooth/wiki/FAQ#how-to-update-or-add-translations\" target=\"_blank\">\"How to update or add translations?\"</a> inside the Photobooth Wiki for instructions.</p>",
"manual:general:webserver_ip": "Please define the IP address of the Photobooth web server to make the QR-Code working if you're accessing Photobooth via \"localhost\", \"127.0.0.1\" or if you have Photobooth installed inside a subfolder. <p>Example if Photobooth can be accessed directly: <code>192.168.0.50</code>.</p><p>Example if Photobooth is installed inside a subfolder: <code>192.168.0.50/photobooth</code>.</p>",
"manual:general:webserver_ssid": "Please define the wireless network name (SSID) to be used to access the Photobooth. The wireless network name (SSID) is displayed on the results page when the QR code is called up.",
"manual:get_request:get_request_collage": "Define GET request at countdown while taking a collage.",
"manual:get_request:get_request_countdown": "If enabled, a GET request will be made to defined Server at countdown. GET request needs to be defined for picture and collage.",
"manual:get_request:get_request_picture": "Define GET request at countdown while taking a picture.",
"manual:get_request:get_request_processed": "If enabled, a GET request will be made to defined Server after processing the picture. \"Photostyle\" (\"photo\", \"collage\" or \"chroma\") is used for the GET request.",
"manual:get_request:get_request_server": "Define the server for a GET request.",
"manual:jpeg_quality:jpeg_quality_chroma": "Picture quality used for chromakeying pictures.",
"manual:jpeg_quality:jpeg_quality_image": "Picture quality used for taking pictures. Value of -1 means the original file from the camera will be retained, if there is no other mods i.e. filters active.",
"manual:jpeg_quality:jpeg_quality_thumb": "Picture quality used for thumbnails.",
Expand Down
18 changes: 18 additions & 0 deletions src/js/core.js
Original file line number Diff line number Diff line change
Expand Up @@ -631,6 +631,14 @@ const photoBooth = (function () {
totalTime = endTime - startTime;
photoboothTools.console.logDev('Processing ' + photoStyle + ' took ' + totalTime + 'ms');

if (config.get_request.processed) {
const getUrl = config.get_request.server + '/' + photoStyle;
const request = new XMLHttpRequest();
photoboothTools.console.log('Sending GET request to: ' + getUrl);
request.open('GET', getUrl);
request.send();
}

if (data.error) {
api.errorPic(data);
} else if (photoStyle === 'chroma') {
Expand Down Expand Up @@ -873,6 +881,16 @@ const photoBooth = (function () {
let current = start;
const stop = start > 2 ? start - 2 : start;

if (config.get_request.countdown) {
const getMode =
start == config.picture.cntdwn_time ? config.get_request.picture : config.get_request.collage;
const getUrl = config.get_request.server + '/' + getMode;
const request = new XMLHttpRequest();
photoboothTools.console.log('Sending GET request to: ' + getUrl);
request.open('GET', getUrl);
request.send();
}

function timerFunction() {
element.text(Number(current) + Number(config.picture.cntdwn_offset));
current--;
Expand Down