Compare commits
No commits in common. "v1.1.0" and "main" have entirely different histories.
@ -1,11 +1,4 @@
|
|||||||
{
|
{
|
||||||
"com.thorlaksson.phpcs.formatOnSave" : true,
|
|
||||||
"com.thorlaksson.phpcs.runOnChange" : "onSave",
|
|
||||||
"com.thorlaksson.phpcs.standard" : "PSR2",
|
|
||||||
"prettier.default-config.tabWidth" : 4,
|
|
||||||
"prettier.format-on-save" : "Disable",
|
|
||||||
"workspace.art_style" : 0,
|
"workspace.art_style" : 0,
|
||||||
"workspace.name" : "PhotoPrismUpload",
|
"workspace.name" : "PhotoPrismUpload"
|
||||||
"workspace.preview_type" : "custom",
|
|
||||||
"workspace.preview_url" : "http:\/\/phlaym.net\/photoupload\/?token=1g29eaapq6"
|
|
||||||
}
|
}
|
||||||
|
37
composer.lock
generated
37
composer.lock
generated
@ -8,16 +8,16 @@
|
|||||||
"packages": [
|
"packages": [
|
||||||
{
|
{
|
||||||
"name": "monolog/monolog",
|
"name": "monolog/monolog",
|
||||||
"version": "2.9.1",
|
"version": "2.3.5",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/Seldaek/monolog.git",
|
"url": "https://github.com/Seldaek/monolog.git",
|
||||||
"reference": "f259e2b15fb95494c83f52d3caad003bbf5ffaa1"
|
"reference": "fd4380d6fc37626e2f799f29d91195040137eba9"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/Seldaek/monolog/zipball/f259e2b15fb95494c83f52d3caad003bbf5ffaa1",
|
"url": "https://api.github.com/repos/Seldaek/monolog/zipball/fd4380d6fc37626e2f799f29d91195040137eba9",
|
||||||
"reference": "f259e2b15fb95494c83f52d3caad003bbf5ffaa1",
|
"reference": "fd4380d6fc37626e2f799f29d91195040137eba9",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -30,22 +30,18 @@
|
|||||||
"require-dev": {
|
"require-dev": {
|
||||||
"aws/aws-sdk-php": "^2.4.9 || ^3.0",
|
"aws/aws-sdk-php": "^2.4.9 || ^3.0",
|
||||||
"doctrine/couchdb": "~1.0@dev",
|
"doctrine/couchdb": "~1.0@dev",
|
||||||
"elasticsearch/elasticsearch": "^7 || ^8",
|
"elasticsearch/elasticsearch": "^7",
|
||||||
"ext-json": "*",
|
"graylog2/gelf-php": "^1.4.2",
|
||||||
"graylog2/gelf-php": "^1.4.2 || ^2@dev",
|
|
||||||
"guzzlehttp/guzzle": "^7.4",
|
|
||||||
"guzzlehttp/psr7": "^2.2",
|
|
||||||
"mongodb/mongodb": "^1.8",
|
"mongodb/mongodb": "^1.8",
|
||||||
"php-amqplib/php-amqplib": "~2.4 || ^3",
|
"php-amqplib/php-amqplib": "~2.4 || ^3",
|
||||||
"phpspec/prophecy": "^1.15",
|
"php-console/php-console": "^3.1.3",
|
||||||
|
"phpspec/prophecy": "^1.6.1",
|
||||||
"phpstan/phpstan": "^0.12.91",
|
"phpstan/phpstan": "^0.12.91",
|
||||||
"phpunit/phpunit": "^8.5.14",
|
"phpunit/phpunit": "^8.5",
|
||||||
"predis/predis": "^1.1 || ^2.0",
|
"predis/predis": "^1.1",
|
||||||
"rollbar/rollbar": "^1.3 || ^2 || ^3",
|
"rollbar/rollbar": "^1.3",
|
||||||
"ruflin/elastica": "^7",
|
"ruflin/elastica": ">=0.90@dev",
|
||||||
"swiftmailer/swiftmailer": "^5.3|^6.0",
|
"swiftmailer/swiftmailer": "^5.3|^6.0"
|
||||||
"symfony/mailer": "^5.4 || ^6",
|
|
||||||
"symfony/mime": "^5.4 || ^6"
|
|
||||||
},
|
},
|
||||||
"suggest": {
|
"suggest": {
|
||||||
"aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB",
|
"aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB",
|
||||||
@ -60,6 +56,7 @@
|
|||||||
"graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server",
|
"graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server",
|
||||||
"mongodb/mongodb": "Allow sending log messages to a MongoDB server (via library)",
|
"mongodb/mongodb": "Allow sending log messages to a MongoDB server (via library)",
|
||||||
"php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib",
|
"php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib",
|
||||||
|
"php-console/php-console": "Allow sending log messages to Google Chrome",
|
||||||
"rollbar/rollbar": "Allow sending log messages to Rollbar",
|
"rollbar/rollbar": "Allow sending log messages to Rollbar",
|
||||||
"ruflin/elastica": "Allow sending log messages to an Elastic Search server"
|
"ruflin/elastica": "Allow sending log messages to an Elastic Search server"
|
||||||
},
|
},
|
||||||
@ -94,7 +91,7 @@
|
|||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/Seldaek/monolog/issues",
|
"issues": "https://github.com/Seldaek/monolog/issues",
|
||||||
"source": "https://github.com/Seldaek/monolog/tree/2.9.1"
|
"source": "https://github.com/Seldaek/monolog/tree/2.3.5"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
@ -106,7 +103,7 @@
|
|||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2023-02-06T13:44:46+00:00"
|
"time": "2021-10-01T21:08:31+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "psr/log",
|
"name": "psr/log",
|
||||||
@ -172,5 +169,5 @@
|
|||||||
"platform-overrides": {
|
"platform-overrides": {
|
||||||
"php": "7.4.1"
|
"php": "7.4.1"
|
||||||
},
|
},
|
||||||
"plugin-api-version": "2.3.0"
|
"plugin-api-version": "2.1.0"
|
||||||
}
|
}
|
||||||
|
@ -1,10 +1,7 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
return [
|
return [
|
||||||
'username' => '',
|
'username' => '',
|
||||||
'password' => '',
|
'password' => ''
|
||||||
'noAlbumToken' => '',
|
'noAlbumToken' => ''
|
||||||
'fileUploadLimitMb' => 1024,
|
|
||||||
'maximumNumberOfFilesPerUpload' => 200,
|
|
||||||
'baseUrl' => 'https://rabenberger.photos',
|
|
||||||
];
|
];
|
||||||
|
221
index.php
221
index.php
@ -1,16 +1,9 @@
|
|||||||
<?php
|
<?php
|
||||||
session_start();
|
session_start();
|
||||||
|
|
||||||
/** require autoloading to manage namespaces */
|
|
||||||
require __DIR__ . '/vendor/autoload.php';
|
require __DIR__ . '/vendor/autoload.php';
|
||||||
|
|
||||||
use PhotoPrismUpload\API\PhotoPrism;
|
use PhotoPrismUpload\API\PhotoPrism;
|
||||||
use PhotoPrismUpload\Entities\Album;
|
$footer = '<footer style="position: fixed;bottom: 0;left: 0;"><a href="/git/phlaym/photoprismupload">Ich bin Open Source</a></footer>';
|
||||||
|
|
||||||
/** @var string $footer Footer text which links to the Gitea repo */
|
|
||||||
$footer =
|
|
||||||
'<footer style="position: fixed;bottom: 0;left: 0;">' .
|
|
||||||
'<!--<a href="https://phlaym.net/git/phlaym/photoprismupload">Ich bin Open Source</a></footer>-->';
|
|
||||||
?>
|
?>
|
||||||
<html>
|
<html>
|
||||||
<head>
|
<head>
|
||||||
@ -43,20 +36,12 @@ $footer =
|
|||||||
.form-wrapper {
|
.form-wrapper {
|
||||||
display: grid;
|
display: grid;
|
||||||
grid-template-rows: auto auto auto;
|
grid-template-rows: auto auto auto;
|
||||||
grid-auto-columns: minmax(auto, 400px) auto;
|
grid-auto-columns: auto auto;
|
||||||
|
max-width: 300px;
|
||||||
}
|
}
|
||||||
label[for="album"] {
|
label[for="album"] {
|
||||||
grid-column: 1;
|
grid-column: 1;
|
||||||
grid-row: 1;
|
grid-row: 1;
|
||||||
align-self: center;
|
|
||||||
}
|
|
||||||
label[for="artist"], label[for="uploader"] {
|
|
||||||
grid-column: 1;
|
|
||||||
align-self: center;
|
|
||||||
}
|
|
||||||
input[type=text] {
|
|
||||||
grid-column: 2;
|
|
||||||
justify-self: right;
|
|
||||||
}
|
}
|
||||||
#album {
|
#album {
|
||||||
grid-column: 2;
|
grid-column: 2;
|
||||||
@ -71,25 +56,19 @@ $footer =
|
|||||||
}
|
}
|
||||||
input[type=submit] {
|
input[type=submit] {
|
||||||
grid-column: 2;
|
grid-column: 2;
|
||||||
grid-row: 5;
|
grid-row: 3;
|
||||||
justify-self: right;
|
justify-self: right;
|
||||||
}
|
}
|
||||||
#error,
|
#error, #fileProgress, #totalProgress, label[for="fileProgress"], label[for="totalProgress"] {
|
||||||
#fileProgress,
|
|
||||||
#totalProgress,
|
|
||||||
label[for="fileProgress"],
|
|
||||||
label[for="totalProgress"] {
|
|
||||||
display:none;
|
display:none;
|
||||||
grid-column: 1;
|
grid-column: 1;
|
||||||
}
|
}
|
||||||
#uploadForm {
|
#uploadForm {
|
||||||
grid-row: 1;
|
grid-row: 1;
|
||||||
grid-column: 1;
|
grid-column: 1;
|
||||||
grid-auto-columns: minmax(100px, auto);
|
|
||||||
}
|
}
|
||||||
#error {
|
#error {
|
||||||
grid-row: 2;
|
grid-row: 2;
|
||||||
grid-column: 1/3;
|
|
||||||
}
|
}
|
||||||
label[for="fileProgress"] {
|
label[for="fileProgress"] {
|
||||||
grid-row: 3;
|
grid-row: 3;
|
||||||
@ -105,9 +84,6 @@ $footer =
|
|||||||
grid-row: 6;
|
grid-row: 6;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
#viewAlbum {
|
|
||||||
grid-row: 7;
|
|
||||||
}
|
|
||||||
footer {
|
footer {
|
||||||
margin: 8px;
|
margin: 8px;
|
||||||
}
|
}
|
||||||
@ -115,77 +91,59 @@ $footer =
|
|||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<?php
|
<?php
|
||||||
/** @var array $config configuration options */
|
|
||||||
$config = require __DIR__ . '/config.php';
|
|
||||||
|
|
||||||
/** @var PhotoPrism $api API object to interface with PhotoPrism */
|
$config = require(__DIR__ . '/config.php');
|
||||||
$api = new PhotoPrism($config);
|
$api = new PhotoPrism($config);
|
||||||
|
|
||||||
/** @var Album[] $albums List of PhotoPrism albums */
|
|
||||||
$albums = [];
|
$albums = [];
|
||||||
try {
|
try {
|
||||||
$api->login();
|
$api->login();
|
||||||
} catch (\Exception $e) {
|
} catch (\Exception $e) {
|
||||||
die('Fehler: ' . $e->getMessage() . $footer . '</body></html>');
|
die('Fehler: ' . $e->getMessage().'</body></html>');
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!isset($_POST['submit'])) {
|
if (!isset($_POST['submit'])) {
|
||||||
if (!isset($_GET['token'])) {
|
if (!isset($_GET['token'])) {
|
||||||
die('Sorry, kein Zugriff' . $footer . '</body></html>');
|
die('Sorry, kein Zugriff</body></html>');
|
||||||
}
|
}
|
||||||
|
|
||||||
/** @var string $token Tokens for which album(s) are visible in the dropdown */
|
|
||||||
$token = $_GET['token'];
|
$token = $_GET['token'];
|
||||||
|
|
||||||
/** @var string[] $tokens List of album tokens */
|
|
||||||
$tokens = explode(',', $token);
|
$tokens = explode(',', $token);
|
||||||
|
|
||||||
/** @var string $album_url URL path to the selected album */
|
|
||||||
$album_url = '/';
|
|
||||||
try {
|
try {
|
||||||
$albums = $api->getAlbumsByTokens($tokens);
|
$albums = $api->getAlbumsByTokens($tokens);
|
||||||
} catch (\Exception $e) {
|
} catch (\Exception $e) {
|
||||||
die('Fehler: ' . $footer . $e->getMessage() . '</body></html>');
|
die('Fehler: ' . $e->getMessage().'</body></html>');
|
||||||
}
|
}
|
||||||
if (empty($albums) &&
|
if (empty($albums) && (empty($config['noAlbumToken']) || !in_array($config['noAlbumToken'], $tokens))) {
|
||||||
(empty($config['noAlbumToken']) ||
|
die('Falscher Token</body></html>');
|
||||||
!in_array($config['noAlbumToken'], $tokens))
|
|
||||||
) {
|
|
||||||
die('Falscher Token' . $footer . '</body></html>');
|
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
|
<script>
|
||||||
|
window.tooLarge = false;
|
||||||
|
window.tooManyFiles = false;
|
||||||
|
function validateForm() {
|
||||||
|
const isInvalid = window.tooLarge || window.tooManyFiles;
|
||||||
|
console.log('Validating', window.tooLarge, window.tooManyFiles, isInvalid);
|
||||||
|
if (isInvalid) {
|
||||||
|
const errorDiv = document.getElementById('error');
|
||||||
|
errorDiv.innerText = '';
|
||||||
|
errorDiv.innerText += window.tooLarge ? 'Zu groß, Upload muss weniger als 200MB sein. ' : '';
|
||||||
|
errorDiv.innerText += window.tooManyFiles ? 'Zu viele Dateien, maximal 200 erlaubt. ' : '';
|
||||||
|
errorDiv.style.display = 'block';
|
||||||
|
}
|
||||||
|
return !isInvalid;
|
||||||
|
}
|
||||||
|
</script>
|
||||||
<div class="form-wrapper">
|
<div class="form-wrapper">
|
||||||
|
<!--<form method="POST" enctype="multipart/form-data" onsubmit="return validateForm();" id="uploadForm"> !-->
|
||||||
<form method="POST" enctype="multipart/form-data" id="uploadForm">
|
<form method="POST" enctype="multipart/form-data" id="uploadForm">
|
||||||
<label for="album">Zu Album hinzufügen</label>
|
<label for="album">Zu Album hinzufügen</label>
|
||||||
<select name="album" id="album">
|
<select name="album" id="album">
|
||||||
<?php
|
<option value="">---</option>
|
||||||
if (!empty($config['noAlbumToken'])) {
|
<?php foreach ($albums as $album) {
|
||||||
echo '<option value="" data-url="/">---</option>';
|
echo '<option value="' . $album->uid . '">' . $album->title . '</option>\n';
|
||||||
}
|
} ?>
|
||||||
/** @var Album $album Current PhotoPrism albums */
|
|
||||||
foreach ($albums as $album) {
|
|
||||||
/** @var string $selected Selected attribute of the option */
|
|
||||||
$selected = $album->token === $tokens[0] ? ' selected ' : '';
|
|
||||||
if ($album->token === $tokens[0]) {
|
|
||||||
$album_url = $album->getUrlPath() ?? '/';
|
|
||||||
}
|
|
||||||
echo '<option value="' .
|
|
||||||
$album->uid .
|
|
||||||
'"' .
|
|
||||||
$selected .
|
|
||||||
'data-url=' .
|
|
||||||
($album->getUrlPath() ?? '/') .
|
|
||||||
'>' .
|
|
||||||
$album->title .
|
|
||||||
'</option>\n';
|
|
||||||
}
|
|
||||||
$album_url = "{$api->base_url}{$album_url}";
|
|
||||||
?>
|
|
||||||
</select>
|
</select>
|
||||||
<label for="artist">Fotograf*in</label>
|
<!--<label></label>
|
||||||
<input type="text" name="artist" id="artist" required/>
|
<input type="text" />!-->
|
||||||
<label for="artist">Dein Name</label>
|
|
||||||
<input type="text" name="uploader" id="uploader"/>
|
|
||||||
<input multiple type="file" name="files[]" id="input" required/>
|
<input multiple type="file" name="files[]" id="input" required/>
|
||||||
<input type="submit" name="submit" value="Upload" />
|
<input type="submit" name="submit" value="Upload" />
|
||||||
</form>
|
</form>
|
||||||
@ -194,23 +152,17 @@ if (!isset($_POST['submit'])) {
|
|||||||
<progress id="fileProgress"></progress>
|
<progress id="fileProgress"></progress>
|
||||||
<label for="totalProgress">Gesamt:</label>
|
<label for="totalProgress">Gesamt:</label>
|
||||||
<progress max="0" value="0" id="totalProgress"></progress>
|
<progress max="0" value="0" id="totalProgress"></progress>
|
||||||
<a href="<?= $album_url ?>" target="_blank" id="viewAlbum">Album ansehen</a>
|
|
||||||
</div>
|
</div>
|
||||||
<script>
|
<script>
|
||||||
window.tooLarge = false;
|
|
||||||
window.tooManyFiles = false;
|
|
||||||
const form = document.getElementById('uploadForm');
|
const form = document.getElementById('uploadForm');
|
||||||
const submitButton = form.querySelector('input[type=submit]');
|
const submitButton = form.querySelector('input[type=submit]');
|
||||||
const albumInput = form.querySelector('select[name=album]');
|
const albumInput = form.querySelector('select[name=album]');
|
||||||
const artistInput = form.querySelector('input[name=artist]');
|
|
||||||
const uploaderInput = form.querySelector('input[name=uploader]');
|
|
||||||
const input = document.getElementById('input');
|
const input = document.getElementById('input');
|
||||||
const fileProgress = document.getElementById('fileProgress');
|
const fileProgress = document.getElementById('fileProgress');
|
||||||
const totalProgress = document.getElementById('totalProgress');
|
const totalProgress = document.getElementById('totalProgress');
|
||||||
const fileProgressLabel = document.querySelector('label[for=fileProgress]');
|
const fileProgressLabel = document.querySelector('label[for=fileProgress]');
|
||||||
const totalProgressLabel = document.querySelector('label[for=totalProgress]');
|
const totalProgressLabel = document.querySelector('label[for=totalProgress]');
|
||||||
const errorDiv = document.getElementById('error');
|
const errorDiv = document.getElementById('error');
|
||||||
const albumAnchor = document.getElementById('viewAlbum');
|
|
||||||
|
|
||||||
async function postData(url, data = {}, method = 'POST') {
|
async function postData(url, data = {}, method = 'POST') {
|
||||||
const response = await fetch(url, {
|
const response = await fetch(url, {
|
||||||
@ -220,31 +172,8 @@ if (!isset($_POST['submit'])) {
|
|||||||
return response;
|
return response;
|
||||||
}
|
}
|
||||||
|
|
||||||
function validateFileType(file) {
|
|
||||||
if (file.type && (file.type.startsWith('image/') || file.type.startsWith('video/'))) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
const parts = file.name.split('.');
|
|
||||||
const extension = parts.length > 0 ? parts[parts.length-1] : '';
|
|
||||||
if (['jpg', 'jpeg', 'png', 'heic', 'heif', 'mov', 'mp4', 'mkv'].includes(extension)) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
console.warn('Invalid file type', extension);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
albumInput.addEventListener('change', (event) => {
|
|
||||||
console.log(event);
|
|
||||||
albumAnchor.href = `<?=$api->base_url?>${albumInput.selectedOptions[0].dataset.url}`;
|
|
||||||
});
|
|
||||||
|
|
||||||
form.addEventListener('submit', async function(event) {
|
form.addEventListener('submit', async function(event) {
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
const isInvalid = window.tooLarge || window.tooManyFiles;
|
|
||||||
if (isInvalid) {
|
|
||||||
console.error('Aborting upload! Too many files or files too large');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
errorDiv.innerText = '';
|
errorDiv.innerText = '';
|
||||||
|
|
||||||
fileProgressLabel.style.display = 'inherit';
|
fileProgressLabel.style.display = 'inherit';
|
||||||
@ -264,8 +193,6 @@ if (!isset($_POST['submit'])) {
|
|||||||
formData.set(input.name, file);
|
formData.set(input.name, file);
|
||||||
formData.set(submitButton.name, submitButton.value);
|
formData.set(submitButton.name, submitButton.value);
|
||||||
formData.set(albumInput.name, albumInput.value);
|
formData.set(albumInput.name, albumInput.value);
|
||||||
formData.set(artistInput.name, artistInput.value);
|
|
||||||
formData.set(uploaderInput.name, uploaderInput.value);
|
|
||||||
try {
|
try {
|
||||||
let resp = await postData(form.action, formData, form.method);
|
let resp = await postData(form.action, formData, form.method);
|
||||||
} catch(e) {
|
} catch(e) {
|
||||||
@ -283,91 +210,35 @@ if (!isset($_POST['submit'])) {
|
|||||||
|
|
||||||
let fileList = [];
|
let fileList = [];
|
||||||
input.addEventListener('change', (event) => {
|
input.addEventListener('change', (event) => {
|
||||||
const maxFileSize = <?= $config['fileUploadLimitMb'] ?>;
|
|
||||||
const maxAmountOfFiles = <?= $config[
|
|
||||||
'maximumNumberOfFilesPerUpload'
|
|
||||||
] ?>;
|
|
||||||
const errorDiv = document.getElementById('error');
|
const errorDiv = document.getElementById('error');
|
||||||
const totalProgress = document.getElementById('totalProgress');
|
const totalProgress = document.getElementById('totalProgress');
|
||||||
|
|
||||||
errorDiv.innerText = '';
|
errorDiv.innerText = '';
|
||||||
errorDiv.style.display = 'none';
|
errorDiv.style.display = 'none';
|
||||||
submitButton.disabled = false;
|
|
||||||
|
|
||||||
const target = event.target;
|
const target = event.target;
|
||||||
|
let totalSize = 0;
|
||||||
fileList = [];
|
fileList = [];
|
||||||
const filesTooLarge = [];
|
|
||||||
if (target.files) {
|
if (target.files) {
|
||||||
for (file of target.files) {
|
for (file of target.files) {
|
||||||
const sizeInMb = file.size / 1024 / 1024;
|
totalSize += file.size;
|
||||||
if (sizeInMb >= maxFileSize) {
|
fileList.push(file);
|
||||||
filesTooLarge.push(file.name);
|
|
||||||
console.warn(
|
|
||||||
'File',
|
|
||||||
file.name,
|
|
||||||
'is',
|
|
||||||
sizeInMb,
|
|
||||||
'MB big, which is over the limit of',
|
|
||||||
maxFileSize);
|
|
||||||
} else if(validateFileType(file)) {
|
|
||||||
fileList.push(file);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
totalProgress.max = fileList.length;
|
totalProgress.max = fileList.length;
|
||||||
|
const sizeInMb = totalSize / 1000 / 1000;
|
||||||
window.tooManyFiles = fileList.length > maxAmountOfFiles;
|
window.tooLarge = sizeInMb >= 200;
|
||||||
if (window.tooManyFiles) {
|
console.log('Total size:', totalSize, 'too large: ', window.tooLarge);
|
||||||
errorDiv.style.display = 'block';
|
window.tooManyFiles = target.files.length > 200;
|
||||||
errorDiv.innerHTML += ```
|
console.log('Total files:', target.files.length, 'too many: ', window.tooManyFiles);
|
||||||
Das sind zu viele Dateien, du darfst max.
|
|
||||||
${maxAmountOfFiles} Dateien gleichzeitig hochladen. ```;
|
|
||||||
submitButton.disabled = true;
|
|
||||||
console.warn('Total files:', target.files.length, '. Too many!');
|
|
||||||
}
|
|
||||||
|
|
||||||
window.tooLarge = filesTooLarge.length > 0;
|
|
||||||
if (window.tooLarge) {
|
|
||||||
const names = filesTooLarge.join(', ')
|
|
||||||
errorDiv.style.display = 'block';
|
|
||||||
const pluralizedMessage = filesTooLarge.length > 1
|
|
||||||
? 'Die folgenden Dateien sind'
|
|
||||||
: 'Die folgende Datei ist';
|
|
||||||
errorDiv.innerHTML += ```
|
|
||||||
${pluralizedMessage} zu groß und wird beim Upload ignoriert: ${names}.
|
|
||||||
Jede Datei darf max. ${maxFileSize} MB groß sein.```;
|
|
||||||
}
|
|
||||||
if (!fileList.length) {
|
|
||||||
submitButton.disabled = true;
|
|
||||||
errorDiv.style.display = 'block';
|
|
||||||
errorDiv.innerHTML += 'Keine gültigen Bilder oder Videos gefunden';
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
<?php die($footer . '</body></html>');
|
<?php
|
||||||
|
die($footer.'</body></html>');
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
$hashes = $api->uploadPhotos($_POST['album']);
|
$api->uploadPhotos($_POST['album']);
|
||||||
foreach ($hashes as $hash) {
|
|
||||||
$photo = $api->getByHash($hash);
|
|
||||||
if (!isset($photo)) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
$details = [
|
|
||||||
'Artist' => $_POST['artist'],
|
|
||||||
'ArtistSrc' => 'manual',
|
|
||||||
'Copyright' => $_POST['artist'],
|
|
||||||
'CopyrightSrc' => 'manual',
|
|
||||||
];
|
|
||||||
if (!empty($_POST['uploader'])) {
|
|
||||||
$details['Notes'] = 'Hochgeladen von: ' . $_POST['uploader'];
|
|
||||||
$details['NotesSrc'] = 'manual';
|
|
||||||
}
|
|
||||||
$api->updatePhotoDetails($photo, $details);
|
|
||||||
}
|
|
||||||
} catch (\Exception $e) {
|
} catch (\Exception $e) {
|
||||||
die('Fehler: ' . $footer . $e->getMessage() . '</body></html>');
|
die('Fehler: ' . $e->getMessage().'</body></html>');
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
Erfolg! <a href=".">Zurück</a>
|
Erfolg! <a href=".">Zurück</a>
|
||||||
|
@ -1,103 +0,0 @@
|
|||||||
<?php
|
|
||||||
session_start();
|
|
||||||
|
|
||||||
/** require autoloading to manage namespaces */
|
|
||||||
require __DIR__ . '/vendor/autoload.php';
|
|
||||||
|
|
||||||
use PhotoPrismUpload\API\PhotoPrism;
|
|
||||||
use PhotoPrismUpload\Entities\Album;
|
|
||||||
use PhotoPrismUpload\Entities\Photo;
|
|
||||||
|
|
||||||
?>
|
|
||||||
<html>
|
|
||||||
<head>
|
|
||||||
<title>Collagen Abstimmung</title>
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
|
||||||
<meta charset="utf-8">
|
|
||||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
|
||||||
<link href="vote.css" rel="stylesheet">
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<?php
|
|
||||||
|
|
||||||
$footer = '</body></html>';
|
|
||||||
|
|
||||||
/** @var array $config configuration options */
|
|
||||||
$config = require(__DIR__ . '/config.php');
|
|
||||||
|
|
||||||
/** @var PhotoPrism $api API object to interface with PhotoPrism */
|
|
||||||
$api = new PhotoPrism($config);
|
|
||||||
|
|
||||||
/** @var Album[] $albums List of PhotoPrism albums */
|
|
||||||
$albums = [];
|
|
||||||
try {
|
|
||||||
$api->login();
|
|
||||||
} catch (\Exception $e) {
|
|
||||||
die('Fehler: ' . $e->getMessage().$footer.'</body></html>');
|
|
||||||
}
|
|
||||||
|
|
||||||
/** @var string $token Tokens for which album(s) are visible in the dropdown */
|
|
||||||
$token = $_GET['token'];
|
|
||||||
|
|
||||||
/** @var int $page Page number of photos to load */
|
|
||||||
$page = 1;
|
|
||||||
|
|
||||||
/** @var int $count Number of pictures to load */
|
|
||||||
$count = 200;
|
|
||||||
|
|
||||||
/** @var int $offset Tokens for which album(s) are visible in the dropdown */
|
|
||||||
$offset = ($page - 1) * $count;
|
|
||||||
|
|
||||||
/** @var string $album_url URL path to the selected album */
|
|
||||||
$album_url = '/';
|
|
||||||
|
|
||||||
$votes_file = 'votes.json';
|
|
||||||
|
|
||||||
$contents = file_get_contents($votes_file);
|
|
||||||
if ($contents === false) {
|
|
||||||
$contents = '{}';
|
|
||||||
}
|
|
||||||
$contents = json_decode($contents, true);
|
|
||||||
|
|
||||||
$vote_counts = [];
|
|
||||||
foreach ($contents as $votes) {
|
|
||||||
foreach ($votes as $photo_uid => $vote_value) {
|
|
||||||
if (!array_key_exists($photo_uid, $vote_counts)) {
|
|
||||||
$vote_counts[$photo_uid] = 0;
|
|
||||||
}
|
|
||||||
$vote_counts[$photo_uid] += intval($vote_value);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
$page_sizes = array_values(array_unique([10, 20, 50, 100, $count]));
|
|
||||||
sort($page_sizes);
|
|
||||||
$link_class = $page === 1 ? 'pageLink disabled' : 'pageLink';
|
|
||||||
|
|
||||||
try {
|
|
||||||
$album = $api->getAlbumByToken($token);
|
|
||||||
if ($album === null) {
|
|
||||||
die('Album nicht gefunden' . $footer . '</body></html>');
|
|
||||||
}
|
|
||||||
$photos = $api->getAlbumPhotos($album, $count, $offset);
|
|
||||||
$photos = array_filter($photos, function (Photo $a) use ($vote_counts) {
|
|
||||||
$vote_a = $vote_counts[$a->uid] ?? 0;
|
|
||||||
return $vote_a >= 0;
|
|
||||||
});
|
|
||||||
usort($photos, function (Photo $a, Photo $b) use ($vote_counts) {
|
|
||||||
$vote_a = $vote_counts[$a->uid] ?? 0;
|
|
||||||
$vote_b = $vote_counts[$b->uid] ?? 0;
|
|
||||||
return $vote_b - $vote_a;
|
|
||||||
});
|
|
||||||
?>
|
|
||||||
<?php
|
|
||||||
foreach ($photos as $photo) {
|
|
||||||
$thumb = $photo->getThumbnailUrl();?>
|
|
||||||
<div class="photowrapper">
|
|
||||||
<img src="<?= $api->api_url.$thumb?>" id="<?= $photo->uid?>" loading="lazy" data-votes="<?=$vote_counts[$photo->uid]?>">
|
|
||||||
</div>
|
|
||||||
<?php
|
|
||||||
}
|
|
||||||
} catch (\Exception $e) {
|
|
||||||
die('Fehler: ' . $footer . $e->getMessage() . '</body></html>');
|
|
||||||
}
|
|
||||||
?>
|
|
@ -1,38 +0,0 @@
|
|||||||
<?php
|
|
||||||
namespace PhotoPrismUpload\API;
|
|
||||||
|
|
||||||
use Monolog\Logger;
|
|
||||||
use Monolog\Handler\HandlerInterface;
|
|
||||||
|
|
||||||
/** Simple factory to create a logger without needing to set stream handlers every time */
|
|
||||||
class LoggerFactory
|
|
||||||
{
|
|
||||||
private static $handlers = [];
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Add a new handler which is automatically added to the list of handlers
|
|
||||||
* for all _future_ loggers
|
|
||||||
*
|
|
||||||
* @param HandlerInterface $handler The handler to add
|
|
||||||
*
|
|
||||||
* @return void
|
|
||||||
*/
|
|
||||||
public static function addHandler(HandlerInterface $handler): void
|
|
||||||
{
|
|
||||||
self::$handlers[] = $handler;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Create a new Logger with the specified name
|
|
||||||
*
|
|
||||||
* @param string $name
|
|
||||||
*
|
|
||||||
* @return Logger
|
|
||||||
*/
|
|
||||||
public static function create(string $name): Logger
|
|
||||||
{
|
|
||||||
$l = new Logger($name);
|
|
||||||
$l->setHandlers(self::$handlers);
|
|
||||||
return $l;
|
|
||||||
}
|
|
||||||
}
|
|
@ -8,85 +8,35 @@ use Psr\Log\LoggerInterface;
|
|||||||
use PhotoPrismUpload\Exceptions\NetworkException;
|
use PhotoPrismUpload\Exceptions\NetworkException;
|
||||||
use PhotoPrismUpload\Exceptions\AuthenticationException;
|
use PhotoPrismUpload\Exceptions\AuthenticationException;
|
||||||
use PhotoPrismUpload\Entities\Album;
|
use PhotoPrismUpload\Entities\Album;
|
||||||
use PhotoPrismUpload\Entities\Photo;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The main API class to interface with PhotoPrism
|
|
||||||
*/
|
|
||||||
class PhotoPrism
|
class PhotoPrism
|
||||||
{
|
{
|
||||||
/** @var string $base_url Base URL of the PhotoPrism instance */
|
protected string $base_url = 'https://photos.phlaym.net';
|
||||||
public string $base_url = 'https://photos.phlaym.net';
|
protected string $api_url = '';
|
||||||
|
|
||||||
/** @var string $api_url API URL of the PhotoPrism instance */
|
|
||||||
public string $api_url = '';
|
|
||||||
|
|
||||||
/** @var string|null $user_id Id of the currently logged in user */
|
|
||||||
protected ?string $user_id = null;
|
|
||||||
|
|
||||||
/** @var string|null $session_id Session id of the currently logged in user */
|
|
||||||
protected ?string $session_id = null;
|
protected ?string $session_id = null;
|
||||||
|
|
||||||
/** @var string|null $download_token Token for downloading files */
|
|
||||||
protected ?string $download_token = null;
|
|
||||||
|
|
||||||
/** @var string|null $preview_token Token for thumbnails files */
|
|
||||||
protected ?string $preview_token = null;
|
|
||||||
|
|
||||||
/** @var array $config Configuration options */
|
|
||||||
protected array $config;
|
protected array $config;
|
||||||
|
|
||||||
/** @var LoggerInterface $logger Logger object */
|
|
||||||
protected LoggerInterface $logger;
|
protected LoggerInterface $logger;
|
||||||
|
|
||||||
/**
|
public function __construct(
|
||||||
* Creates a new Photoprism API object from the configuration
|
array $config,
|
||||||
*
|
?string $log_path = null
|
||||||
* @param array $config Configuration dictionary
|
) {
|
||||||
* @param string|null $log_path Path where the log files end up in.
|
$this->api_url = $this->base_url.'/api/v1';
|
||||||
* Will be set to `$log_path = __DIR__.'/logs/log.log';` if empty.
|
|
||||||
*
|
|
||||||
* @return void
|
|
||||||
*/
|
|
||||||
public function __construct(array $config, ?string $log_path = null)
|
|
||||||
{
|
|
||||||
$this->config = $config;
|
$this->config = $config;
|
||||||
|
$this->logger = new Logger('PhotoPrismUpload');
|
||||||
if (empty($log_path)) {
|
if (empty($log_path)) {
|
||||||
$log_path = __DIR__ . '/logs/log.log';
|
$log_path = __DIR__.'/logs/log.log';
|
||||||
}
|
}
|
||||||
if (isset($config['baseUrl'])) {
|
$handler = new RotatingFileHandler($log_path, 5, Logger::DEBUG, true);
|
||||||
$this->base_url = $config['baseUrl'];
|
$this->logger->pushHandler($handler);
|
||||||
}
|
|
||||||
$this->api_url = $this->base_url . '/api/v1';
|
|
||||||
LoggerFactory::addHandler(
|
|
||||||
new RotatingFileHandler($log_path, 5, Logger::DEBUG, true)
|
|
||||||
);
|
|
||||||
$this->logger = LoggerFactory::create('PhotoPrismUpload');
|
|
||||||
if (isset($_SESSION['pp_sessionid'])) {
|
if (isset($_SESSION['pp_sessionid'])) {
|
||||||
$this->session_id = $_SESSION['pp_sessionid'];
|
$this->session_id = $_SESSION['pp_sessionid'];
|
||||||
$this->preview_token = $_SESSION['pp_preview_token'];
|
|
||||||
$this->download_token = $_SESSION['pp_download_token'];
|
|
||||||
$this->user_id = $_SESSION['pp_userid'];
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Parse headers from a cURL HTTP response.
|
|
||||||
* Returns an array with the keys `headers` and `content`.
|
|
||||||
* The former is an array containing the headers (header name as key, value as value).
|
|
||||||
* The latter is a string with the body of the response
|
|
||||||
*
|
|
||||||
* @param string $response The complete response, containing the headers and body
|
|
||||||
*
|
|
||||||
* @return array
|
|
||||||
*/
|
|
||||||
private function parseHeaders(string $response): array
|
private function parseHeaders(string $response): array
|
||||||
{
|
{
|
||||||
$response = explode("\r\n\r\n", $response, 2);
|
$response = explode("\r\n\r\n", $response, 2);
|
||||||
if (count($response) === 3) {
|
|
||||||
$dropped = array_shift($response);
|
|
||||||
$this->logger->warning('Dropping start of response:' . $dropped);
|
|
||||||
}
|
|
||||||
$headers = $response[0];
|
$headers = $response[0];
|
||||||
if ($headers === 'HTTP/1.1 100 Continue') {
|
if ($headers === 'HTTP/1.1 100 Continue') {
|
||||||
$response = explode("\r\n\r\n", $response[1], 2);
|
$response = explode("\r\n\r\n", $response[1], 2);
|
||||||
@ -107,32 +57,19 @@ class PhotoPrism
|
|||||||
if (count($header) < 2) {
|
if (count($header) < 2) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
list($k, $v) = $header;
|
list($k,$v) = $header;
|
||||||
$header_arr[$k] = $v;
|
$header_arr[$k] = $v;
|
||||||
}
|
}
|
||||||
return ['headers' => $header_arr, 'content' => $content];
|
return ['headers' => $header_arr, 'content' => $content];
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Sends a HTTP request using cURL
|
|
||||||
* Returns the body of the response
|
|
||||||
*
|
|
||||||
* @param string $method -The HTTP method to use
|
|
||||||
* @param string $path The HTTP request path without the API URL
|
|
||||||
* @param array $data Request data to send
|
|
||||||
* @param string $content_type Content-Type to use
|
|
||||||
*
|
|
||||||
* @throws NetworkException on failure
|
|
||||||
*
|
|
||||||
* @return string The response body
|
|
||||||
*/
|
|
||||||
private function makeRequest(
|
private function makeRequest(
|
||||||
string $method,
|
string $method,
|
||||||
string $path,
|
string $path,
|
||||||
array $data = [],
|
array $data = [],
|
||||||
string $content_type = 'application/json'
|
string $content_type = 'application/json'
|
||||||
): string {
|
): string {
|
||||||
$url = $this->api_url . $path;
|
$url = $this->api_url.$path;
|
||||||
$method = strtolower($method);
|
$method = strtolower($method);
|
||||||
$query_data = [];
|
$query_data = [];
|
||||||
$headers = [];
|
$headers = [];
|
||||||
@ -150,85 +87,57 @@ class PhotoPrism
|
|||||||
|
|
||||||
$ch = curl_init();
|
$ch = curl_init();
|
||||||
if ($method === 'get' && !empty($query_data)) {
|
if ($method === 'get' && !empty($query_data)) {
|
||||||
$url .= '?' . $query_data;
|
$url .= '?'.$query_data;
|
||||||
}
|
}
|
||||||
if ($method !== 'get') {
|
if ($method !== 'get') {
|
||||||
$headers[] = 'Content-Type: ' . $content_type;
|
$headers[] = 'Content-Type: '.$content_type;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!empty($this->session_id)) {
|
if (!empty($this->session_id)) {
|
||||||
$headers[] = 'X-Session-Id: ' . $this->session_id;
|
$headers[] = 'X-Session-Id: ' . $this->session_id;
|
||||||
}
|
}
|
||||||
$this->logger->info($method . ' request to ' . $url);
|
$this->logger->info($method .' request to ' . $url);
|
||||||
$this->logger->debug('Headers ' . json_encode($headers));
|
$this->logger->debug('Headers ' . json_encode($headers));
|
||||||
$this->logger->debug('postfields data ' . json_encode($data));
|
$this->logger->debug('postfields data ' . json_encode($data));
|
||||||
$this->logger->debug('postfields ' . json_encode($query_data));
|
$this->logger->debug('postfields ' . json_encode($query_data));
|
||||||
|
|
||||||
curl_setopt($ch, CURLOPT_URL, $url);
|
curl_setopt($ch, CURLOPT_URL, $url);
|
||||||
curl_setopt($ch, CURLOPT_POST, $method !== 'get' && $method !== 'put');
|
curl_setopt($ch, CURLOPT_POST, $method !== 'get');
|
||||||
if ($method === 'put') {
|
|
||||||
curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT');
|
|
||||||
}
|
|
||||||
curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
|
curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
|
||||||
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
|
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
|
||||||
curl_setopt($ch, CURLOPT_HEADER, true);
|
curl_setopt($ch, CURLOPT_HEADER, true);
|
||||||
curl_setopt($ch, CURLINFO_HEADER_OUT, true);
|
curl_setopt($ch, CURLINFO_HEADER_OUT, true);
|
||||||
curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
|
|
||||||
if ($method !== 'get' && !empty($query_data)) {
|
if ($method !== 'get' && !empty($query_data)) {
|
||||||
curl_setopt($ch, CURLOPT_POSTFIELDS, $query_data);
|
curl_setopt($ch, CURLOPT_POSTFIELDS, $query_data);
|
||||||
}
|
}
|
||||||
$output = curl_exec($ch);
|
$output = curl_exec($ch);
|
||||||
|
|
||||||
|
$request = curl_getinfo($ch, CURLINFO_HEADER_OUT);
|
||||||
$http_status = curl_getinfo($ch, CURLINFO_HTTP_CODE);
|
$http_status = curl_getinfo($ch, CURLINFO_HTTP_CODE);
|
||||||
|
|
||||||
if ($output === false) {
|
if ($output === false) {
|
||||||
throw new NetworkException(
|
throw new NetworkException("Error sending request to " . $url, 0);
|
||||||
'Error sending request to ' . $url,
|
|
||||||
0
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
if (empty($output) || $output === false) {
|
if (empty($output) || $output === false) {
|
||||||
$e = new NetworkException('No answer from' . $url, 0);
|
$e = new NetworkException("No answer from" . $url, 0);
|
||||||
$this->logger->error(
|
$this->logger->error("Error sending request", ['Exception' => $e]);
|
||||||
'Error sending request. No answer from server',
|
|
||||||
[
|
|
||||||
'Exception' => print_r($e, true),
|
|
||||||
]
|
|
||||||
);
|
|
||||||
throw $e;
|
throw $e;
|
||||||
}
|
}
|
||||||
if ($http_status === 0) {
|
if ($http_status === 0) {
|
||||||
throw new NetworkException('Unable to connect to API ' . $url);
|
throw new NetworkException('Unable to connect to API ' . $url);
|
||||||
}
|
}
|
||||||
if ($http_status >= 400) {
|
if ($http_status >= 400) {
|
||||||
throw new NetworkException(
|
throw new NetworkException('Invalid response ' . $url . ': ' . $http_status);
|
||||||
'Invalid response ' . $url . ': ' . $http_status
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
$result = $this->parseHeaders($output);
|
$result = $this->parseHeaders($output);
|
||||||
} catch (\Exception $e) {
|
} catch (\Exception $e) {
|
||||||
$this->logger->error('Error sending request', [
|
$this->logger->error("Error sending request", ['Exception' => $e]);
|
||||||
'Exception' => print_r($e, true),
|
throw new NetworkException("Error sending request to " . $url, 0, $e);
|
||||||
]);
|
|
||||||
throw new NetworkException(
|
|
||||||
'Error sending request to ' . $url,
|
|
||||||
0,
|
|
||||||
$e
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
return $result['content'];
|
return $result['content'];
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
public function login(bool $force = false)
|
||||||
* Log in to PhotoPrism.
|
|
||||||
* If already logged in nothing happens.
|
|
||||||
* No check whether the session is still valid is performed
|
|
||||||
|
|
||||||
* @throws AuthenticationException on failure
|
|
||||||
*
|
|
||||||
* @param bool $force -Force re-login even if already logged in
|
|
||||||
*/
|
|
||||||
public function login(bool $force = false): void
|
|
||||||
{
|
{
|
||||||
if (!empty($this->session_id) && !$force) {
|
if (!empty($this->session_id) && !$force) {
|
||||||
$this->logger->info('Skipping login, already logged in');
|
$this->logger->info('Skipping login, already logged in');
|
||||||
@ -245,65 +154,36 @@ class PhotoPrism
|
|||||||
throw new AuthenticationException($response['error']);
|
throw new AuthenticationException($response['error']);
|
||||||
}
|
}
|
||||||
$this->session_id = $response['id'];
|
$this->session_id = $response['id'];
|
||||||
$this->download_token = $response['config']['downloadToken'];
|
|
||||||
$this->preview_token = $response['config']['previewToken'];
|
|
||||||
$this->user_id = $response['user']['UID'];
|
|
||||||
$_SESSION['pp_sessionid'] = $this->session_id;
|
$_SESSION['pp_sessionid'] = $this->session_id;
|
||||||
$_SESSION['pp_preview_token'] = $this->preview_token;
|
$this->logger->debug('Session ID: ' . $this->session_id);
|
||||||
$_SESSION['pp_download_token'] = $this->download_token;
|
|
||||||
$_SESSION['pp_userid'] = $this->user_id;
|
|
||||||
$this->logger->debug(
|
|
||||||
'Session ID: ' .
|
|
||||||
$this->session_id .
|
|
||||||
', preview token: ' .
|
|
||||||
$this->preview_token
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Fetches albums from PhotoPrism
|
|
||||||
|
|
||||||
* @throws NetworkException on failure
|
|
||||||
*
|
|
||||||
* @param int $count -Maximum amount of albums to fetch
|
|
||||||
* @param int $offset -Number of albums to skip
|
|
||||||
* @return Album[]
|
|
||||||
*/
|
|
||||||
public function getAlbums(int $count = 1000, int $offset = 0): array
|
public function getAlbums(int $count = 1000, int $offset = 0): array
|
||||||
{
|
{
|
||||||
$data = [
|
$data = [
|
||||||
'count' => $count,
|
'count' => $count,
|
||||||
'offset' => $offset,
|
'offset' => $offset,
|
||||||
'type' => 'album',
|
'type' => 'album'
|
||||||
];
|
];
|
||||||
$res = $this->makeRequest('GET', '/albums', $data, 'text/plain');
|
$res = $this->makeRequest('GET', '/albums', $data, 'text/plain');
|
||||||
$response = json_decode($res, true);
|
$response = json_decode($res, true);
|
||||||
if (!empty($response['error'])) {
|
if (!empty($response['error'])) {
|
||||||
throw new NetworkException($response['error']);
|
throw new NetworkException($response['error']);
|
||||||
}
|
}
|
||||||
$albums = array_map(function ($entry) {
|
$albums = array_map(
|
||||||
return new Album($entry);
|
function ($entry) {
|
||||||
}, $response);
|
return new Album($entry);
|
||||||
|
},
|
||||||
|
$response
|
||||||
|
);
|
||||||
$this->logger->debug('Albums' . json_encode($albums));
|
$this->logger->debug('Albums' . json_encode($albums));
|
||||||
return $albums;
|
return $albums;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
public function getAlbumsByTokens(array $tokens, int $count = 1000, int $offset = 0): array
|
||||||
* Fetches albums from PhotoPrism which can be viewed with the provided tokens
|
{
|
||||||
|
|
||||||
* @throws NetworkException on failure
|
|
||||||
* @param string[] $tokens -A list of tokens by which the albums are filtered
|
|
||||||
* @param int $count -Maximum amount of albums to fetch
|
|
||||||
* @param int $offset -Number of albums to skip
|
|
||||||
* @return Album[]
|
|
||||||
*/
|
|
||||||
public function getAlbumsByTokens(
|
|
||||||
array $tokens,
|
|
||||||
int $count = 1000,
|
|
||||||
int $offset = 0
|
|
||||||
): array {
|
|
||||||
$this->logger->debug('getAlbumsByToken');
|
$this->logger->debug('getAlbumsByToken');
|
||||||
$albums = $this->getAlbums($count, $offset);
|
$albums = $this->getAlbums($count, 0);
|
||||||
$visibleAlbums = [];
|
$visibleAlbums = [];
|
||||||
foreach ($albums as $album) {
|
foreach ($albums as $album) {
|
||||||
$token = $this->getAlbumToken($album);
|
$token = $this->getAlbumToken($album);
|
||||||
@ -311,9 +191,7 @@ class PhotoPrism
|
|||||||
if ($token != null && in_array($album->token, $tokens)) {
|
if ($token != null && in_array($album->token, $tokens)) {
|
||||||
$visibleAlbums[] = $album;
|
$visibleAlbums[] = $album;
|
||||||
} else {
|
} else {
|
||||||
$this->logger->debug(
|
$this->logger->debug('Skipping album without access: ' . $album->title);
|
||||||
'Skipping album without access: ' . $album->title
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -321,173 +199,42 @@ class PhotoPrism
|
|||||||
return $visibleAlbums;
|
return $visibleAlbums;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Fetches an album from PhotoPrism which can be viewed with the provided token
|
|
||||||
|
|
||||||
* @throws NetworkException on failure
|
|
||||||
* @param string $token -A token by which the albums are filtered
|
|
||||||
* @return Album|null
|
|
||||||
*/
|
|
||||||
public function getAlbumByToken(string $token): ?Album
|
|
||||||
{
|
|
||||||
$this->logger->debug('getAlbumByToken');
|
|
||||||
$albums = $this->getAlbumsByTokens([$token]);
|
|
||||||
if (empty($albums)) {
|
|
||||||
$this->logger->debug('Could not find album for token' . $token);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
$this->logger->debug('getAlbumByToken done');
|
|
||||||
return $albums[0];
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Fetches the secret token of an album
|
|
||||||
|
|
||||||
* @throws NetworkException on failure
|
|
||||||
*
|
|
||||||
* @param Album $album -The album which's toke should be fetched
|
|
||||||
* @return string|null Album token or null if the album is private
|
|
||||||
*/
|
|
||||||
public function getAlbumToken($album): ?string
|
public function getAlbumToken($album): ?string
|
||||||
{
|
{
|
||||||
$uid = is_string($album) ? $album : $album->uid;
|
$uid = is_string($album) ? $album : $album->uid;
|
||||||
$res = $this->makeRequest('GET', '/albums/' . $uid . '/links');
|
$res = $this->makeRequest('GET', '/albums/' . $uid . '/links');
|
||||||
$this->logger->debug('Token response: ' . $res);
|
|
||||||
/** @var array $response */
|
|
||||||
$response = json_decode($res, true)[0];
|
$response = json_decode($res, true)[0];
|
||||||
if (!empty($response['error'])) {
|
if (!empty($response['error'])) {
|
||||||
throw new NetworkException($response['error']);
|
throw new NetworkException($response['error']);
|
||||||
}
|
}
|
||||||
if (!array_key_exists('Token', $response)) {
|
$this->logger->debug('Token response: ' . $res);
|
||||||
|
if (!in_array('Token', $response)) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
return $response['Token'];
|
return $response['Token'];
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
public function uploadPhotos(?string $album = null)
|
||||||
* Upload photos, optionally add them to a specific album
|
|
||||||
|
|
||||||
* @throws NetworkException on failure
|
|
||||||
* @param string|null $album -The album uid to which the photos should be aded
|
|
||||||
*/
|
|
||||||
public function uploadPhotos(?string $album = null): array
|
|
||||||
{
|
{
|
||||||
$albums = empty($album) ? [] : [$album];
|
|
||||||
$import_data = ['albums' => $albums];
|
|
||||||
|
|
||||||
$path = time();
|
$path = time();
|
||||||
$url = '/users/' . $this->user_id . '/upload/' . $path;
|
$url = '/upload/'.$path;
|
||||||
$hashes = [];
|
$import_url = '/import'.$url;
|
||||||
$this->logger->info('Uploading ' . json_encode($_FILES));
|
foreach ($_FILES['files']['tmp_name'] as $key => $value) {
|
||||||
foreach (array_keys($_FILES['files']['tmp_name']) as $key) {
|
|
||||||
$file_tmpname = $_FILES['files']['tmp_name'][$key];
|
$file_tmpname = $_FILES['files']['tmp_name'][$key];
|
||||||
if (empty($file_tmpname)) {
|
|
||||||
$this->logger->warning('file tmp_name is empty. All file info: ' . json_encode($_FILES));
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
$this->logger->info('Uploading ' . $file_tmpname . ' to ' . $url);
|
$this->logger->info('Uploading ' . $file_tmpname . ' to ' . $url);
|
||||||
$hashes[] = sha1_file($file_tmpname);
|
|
||||||
$filename = basename($_FILES['files']['name'][$key]);
|
$filename = basename($_FILES['files']['name'][$key]);
|
||||||
$cFile = curl_file_create(
|
$cFile = curl_file_create($file_tmpname, $_FILES['files']['type'][$key], $filename);
|
||||||
$file_tmpname,
|
|
||||||
$_FILES['files']['type'][$key],
|
|
||||||
$filename
|
|
||||||
);
|
|
||||||
|
|
||||||
$data = ['files' => $cFile];
|
$data = ['files' => $cFile];
|
||||||
$res = $this->makeRequest(
|
$res = $this->makeRequest('POST', $url, $data, 'multipart/form-data');
|
||||||
'POST',
|
|
||||||
$url,
|
|
||||||
$data,
|
|
||||||
'multipart/form-data'
|
|
||||||
);
|
|
||||||
$this->logger->info('Upload result: ' . $res);
|
$this->logger->info('Upload result: ' . $res);
|
||||||
$this->logger->info('Importing files');
|
|
||||||
$res = $this->makeRequest(
|
|
||||||
'PUT',
|
|
||||||
$url,
|
|
||||||
$import_data
|
|
||||||
);
|
|
||||||
$this->logger->info('Import result: ' . $res);
|
|
||||||
}
|
}
|
||||||
return $hashes;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function getByHash(string $hash): ?Photo
|
$this->logger->info('Importing files');
|
||||||
{
|
$albums = empty($album) ? [] : [$album];
|
||||||
$this->logger->debug('getByHash');
|
|
||||||
|
|
||||||
$data = [
|
$import_data = ["move" => true, "albums" => $albums];
|
||||||
'q' => 'hash:' . $hash,
|
$res = $this->makeRequest('POST', $import_url, $import_data);
|
||||||
'count' => 1,
|
$this->logger->info('Import result: ' . $res);
|
||||||
'offset' => 0
|
|
||||||
];
|
|
||||||
$res = $this->makeRequest('GET', '/photos', $data, 'text/plain');
|
|
||||||
$this->logger->debug('getByHash response: ' . $res);
|
|
||||||
$response = json_decode($res, true);
|
|
||||||
if (!empty($response['error'])) {
|
|
||||||
throw new NetworkException($response['error']);
|
|
||||||
}
|
|
||||||
if (empty($response)) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
$photo = new Photo($response[0]);
|
|
||||||
$photo->thumbnail_token = $this->preview_token;
|
|
||||||
$this->logger->debug('getByHash photo: ' . json_encode($photo));
|
|
||||||
return $photo;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function updatePhotoDetails(Photo $photo, array $updatedDetails): void
|
|
||||||
{
|
|
||||||
$updatedDetails['PhotoID'] = $photo->id;
|
|
||||||
foreach ($updatedDetails as $key => $value) {
|
|
||||||
$details[$key] = $value;
|
|
||||||
}
|
|
||||||
$res = $this->makeRequest('PUT', '/photos/' . $photo->uid, ['Details' => $details]);
|
|
||||||
$this->logger->debug('updatePhotoDetails response: ' . json_encode($res));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Retrieves the photos of an album
|
|
||||||
|
|
||||||
* @throws NetworkException on failure
|
|
||||||
* @param Album $album - The album to which the photos should be loaded
|
|
||||||
* @param int $count - How many photos should be loaded
|
|
||||||
* @param int $offset - Offset for paging
|
|
||||||
* @return Photo[] - Photos in the album
|
|
||||||
*/
|
|
||||||
public function getAlbumPhotos(
|
|
||||||
Album $album,
|
|
||||||
int $count = 60,
|
|
||||||
int $offset = 0
|
|
||||||
): array {
|
|
||||||
$this->logger->debug('getAlbumPhotos');
|
|
||||||
$data = [
|
|
||||||
'album' => $album->uid,
|
|
||||||
'count' => $count,
|
|
||||||
'offset' => $offset,
|
|
||||||
];
|
|
||||||
$res = $this->makeRequest('GET', '/photos', $data, 'text/plain');
|
|
||||||
$response = json_decode($res, true);
|
|
||||||
if (!empty($response['error'])) {
|
|
||||||
throw new NetworkException($response['error']);
|
|
||||||
}
|
|
||||||
$this->logger->debug('getAlbumPhotos response');
|
|
||||||
$photos = array_map(function ($entry) {
|
|
||||||
$photo = new Photo($entry);
|
|
||||||
$photo->thumbnail_token = $this->preview_token;
|
|
||||||
return $photo;
|
|
||||||
}, $response);
|
|
||||||
$this->logger->info('Got photos:' . json_encode($photos));
|
|
||||||
$photos = array_filter($photos, function ($obj) {
|
|
||||||
static $idList = [];
|
|
||||||
if (in_array($obj->uid, $idList)) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
$idList[] = $obj->uid;
|
|
||||||
return true;
|
|
||||||
});
|
|
||||||
$this->logger->info('unique photos:' . json_encode($photos));
|
|
||||||
return $photos;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,54 +1,20 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace PhotoPrismUpload\Entities;
|
namespace PhotoPrismUpload\Entities;
|
||||||
|
|
||||||
use PhotoPrismUpload\API\LoggerFactory;
|
use Monolog\Logger;
|
||||||
use Psr\Log\LoggerInterface;
|
|
||||||
|
|
||||||
/** A PhotoPrism Album */
|
|
||||||
class Album
|
class Album
|
||||||
{
|
{
|
||||||
/** @var string $uid Unique Id of the album */
|
|
||||||
public string $uid = '';
|
public string $uid = '';
|
||||||
|
|
||||||
/** @var string $slug URL slug of the album */
|
|
||||||
public string $slug = '';
|
public string $slug = '';
|
||||||
|
|
||||||
/** @var string $title Title of the album */
|
|
||||||
public string $title = '';
|
public string $title = '';
|
||||||
|
|
||||||
/** @var string|null $token Secret token of the album. Needs to be set by the API */
|
|
||||||
public ?string $token = null;
|
public ?string $token = null;
|
||||||
|
|
||||||
/** @var LoggerInterface $logger Logger object */
|
public function __construct(
|
||||||
protected LoggerInterface $logger;
|
array $response
|
||||||
|
) {
|
||||||
/**
|
|
||||||
* Creates a new album from the api response
|
|
||||||
*
|
|
||||||
* @param array $response Photoprism API response containing an album object
|
|
||||||
*
|
|
||||||
* @return void
|
|
||||||
*/
|
|
||||||
public function __construct(array $response)
|
|
||||||
{
|
|
||||||
$this->uid = $response['UID'];
|
$this->uid = $response['UID'];
|
||||||
$this->slug = $response['Slug'];
|
$this->slug = $response['Slug'];
|
||||||
$this->title = $response['Title'];
|
$this->title = $response['Title'];
|
||||||
$this->logger = LoggerFactory::create('PhotoPrismUpload.Album');
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the URL path for this album.
|
|
||||||
* Starts with a leading /
|
|
||||||
* Returns null if the album's token is not set
|
|
||||||
*
|
|
||||||
* @return string|null
|
|
||||||
*/
|
|
||||||
public function getUrlPath(): ?string
|
|
||||||
{
|
|
||||||
if (empty($this->token)) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
return "/s/{$this->token}/{$this->slug}";
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,66 +0,0 @@
|
|||||||
<?php
|
|
||||||
namespace PhotoPrismUpload\Entities;
|
|
||||||
|
|
||||||
use PhotoPrismUpload\API\LoggerFactory;
|
|
||||||
|
|
||||||
/** A PhotoPrism Photo */
|
|
||||||
class Photo
|
|
||||||
{
|
|
||||||
|
|
||||||
/** @var string $thumbnail_token Token for fetching the thumbnail*/
|
|
||||||
public string $thumbnail_token = '';
|
|
||||||
|
|
||||||
/** @var string $uid Unique Id of the photo */
|
|
||||||
public string $uid = '';
|
|
||||||
|
|
||||||
/** @var string $id Id of the photo */
|
|
||||||
public int $id = 0;
|
|
||||||
|
|
||||||
/** @var string $type Type of the photo (image, video, etc) */
|
|
||||||
public string $type = '';
|
|
||||||
|
|
||||||
public string $fileUID;
|
|
||||||
public string $fileRoot;
|
|
||||||
public string $fileName;
|
|
||||||
public string $hash;
|
|
||||||
public int $width;
|
|
||||||
public int $height;
|
|
||||||
|
|
||||||
public array $files;
|
|
||||||
|
|
||||||
public array $details;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates a new photo from the api response
|
|
||||||
*
|
|
||||||
* @param array $response Photoprism API response containing a photo object
|
|
||||||
*
|
|
||||||
* @return void
|
|
||||||
*/
|
|
||||||
public function __construct(
|
|
||||||
array $response
|
|
||||||
) {
|
|
||||||
$this->uid = $response['UID'];
|
|
||||||
$this->id = intval($response['ID']);
|
|
||||||
$this->type = $response['Type'];
|
|
||||||
$this->fileUID = $response['FileUID'];
|
|
||||||
$this->fileRoot = $response['FileRoot'];
|
|
||||||
$this->fileName = $response['FileName'];
|
|
||||||
$this->hash = $response['Hash'];
|
|
||||||
$this->width = intval($response['Width']);
|
|
||||||
$this->height = intval($response['Height']);
|
|
||||||
$this->logger = LoggerFactory::create('PhotoPrismUpload.Photo');
|
|
||||||
$this->details = $response;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the thumbnail URL path for this image.
|
|
||||||
* Starts with a leading /
|
|
||||||
*
|
|
||||||
* @return string
|
|
||||||
*/
|
|
||||||
public function getThumbnailUrl(string $size = 'tile_500'): string
|
|
||||||
{
|
|
||||||
return "/t/{$this->hash}/{$this->thumbnail_token}/{$size}";
|
|
||||||
}
|
|
||||||
}
|
|
110
vote-gallery.php
110
vote-gallery.php
@ -1,110 +0,0 @@
|
|||||||
<?php
|
|
||||||
session_start();
|
|
||||||
|
|
||||||
/** require autoloading to manage namespaces */
|
|
||||||
require __DIR__ . '/vendor/autoload.php';
|
|
||||||
|
|
||||||
use PhotoPrismUpload\API\PhotoPrism;
|
|
||||||
use PhotoPrismUpload\Entities\Album;
|
|
||||||
|
|
||||||
?>
|
|
||||||
<html>
|
|
||||||
<head>
|
|
||||||
<title>Collagen Abstimmung</title>
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
|
||||||
<meta charset="utf-8">
|
|
||||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
|
||||||
<script src="vote.js"></script>
|
|
||||||
<link href="vote.css" rel="stylesheet">
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<?php
|
|
||||||
|
|
||||||
$footer = '</body></html><footer style="position: fixed;bottom: 0;left: 0;">'
|
|
||||||
.'<a href="/git/phlaym/photoprismupload">Ich bin Open Source</a></footer>';
|
|
||||||
|
|
||||||
/** @var array $config configuration options */
|
|
||||||
$config = require(__DIR__ . '/config.php');
|
|
||||||
|
|
||||||
/** @var PhotoPrism $api API object to interface with PhotoPrism */
|
|
||||||
$api = new PhotoPrism($config);
|
|
||||||
|
|
||||||
/** @var Album[] $albums List of PhotoPrism albums */
|
|
||||||
$albums = [];
|
|
||||||
try {
|
|
||||||
$api->login();
|
|
||||||
} catch (\Exception $e) {
|
|
||||||
die('Fehler: ' . $e->getMessage().$footer.'</body></html>');
|
|
||||||
}
|
|
||||||
|
|
||||||
/** @var string $token Tokens for which album(s) are visible in the dropdown */
|
|
||||||
$token = $_GET['token'];
|
|
||||||
|
|
||||||
/** @var int $page Page number of photos to load */
|
|
||||||
$page = intval($_GET['page'] ?? 1);
|
|
||||||
|
|
||||||
/** @var int $count Number of pictures to load */
|
|
||||||
$count = intval($_GET['count'] ?? 50);
|
|
||||||
|
|
||||||
/** @var int $offset Tokens for which album(s) are visible in the dropdown */
|
|
||||||
$offset = ($page - 1) * $count;
|
|
||||||
|
|
||||||
/** @var string $album_url URL path to the selected album */
|
|
||||||
$album_url = '/';
|
|
||||||
|
|
||||||
$page_sizes = array_values(array_unique([10, 20, 50, 100, $count]));
|
|
||||||
sort($page_sizes);
|
|
||||||
$link_class = $page === 1 ? 'pageLink disabled' : 'pageLink';
|
|
||||||
|
|
||||||
try {
|
|
||||||
$album = $api->getAlbumByToken($token);
|
|
||||||
if ($album === null) {
|
|
||||||
die('Album nicht gefunden' . $footer . '</body></html>');
|
|
||||||
}
|
|
||||||
$photos = $api->getAlbumPhotos($album, $count, $offset);
|
|
||||||
?>
|
|
||||||
<div>
|
|
||||||
<input type="text" placeholder="Name" name="name" id="nameInput" style="margin: 0 0 0 8px">
|
|
||||||
<button onclick="loadVotes()">OK</button>
|
|
||||||
<a class="<?=$link_class?>" href="vote-gallery.php?token=<?=$token?>&count=<?=$count?>&page=1"><<</a>
|
|
||||||
<a class="<?=$link_class?>" href="vote-gallery.php?token=<?=$token?>&count=<?=$count?>&page=<?=$page-1?>"><</a>
|
|
||||||
Seite <?=$page?>
|
|
||||||
<a class="pageLink" href="vote-gallery.php?token=<?=$token?>&count=<?=$count?>&page=<?=$page+1?>">></a>
|
|
||||||
<select>
|
|
||||||
<?php
|
|
||||||
foreach ($page_sizes as $current_page_size) {
|
|
||||||
$selected_string = $current_page_size === $count ? 'selected' : '';
|
|
||||||
echo '<option '.$selected_string.'>'.$current_page_size.'</option>';
|
|
||||||
}
|
|
||||||
?>
|
|
||||||
</select> pro Seite
|
|
||||||
</div>
|
|
||||||
<?php
|
|
||||||
foreach ($photos as $photo) {
|
|
||||||
$thumb = $photo->getThumbnailUrl();?>
|
|
||||||
<div class="photowrapper">
|
|
||||||
<img src="<?= $api->api_url.$thumb?>" id="<?= $photo->uid?>" loading="lazy">
|
|
||||||
<div class="votewrapper">
|
|
||||||
<button value="1" onclick="vote(this)" class="voteButton" data-uid="<?= $photo->uid?>" disabled>
|
|
||||||
👍 Dafür
|
|
||||||
</button>
|
|
||||||
<button value="0" onclick="vote(this)" class="voteButton" data-uid="<?= $photo->uid?>" disabled>
|
|
||||||
😶 Neutral
|
|
||||||
</button>
|
|
||||||
<button value="-1" onclick="vote(this)" class="voteButton" data-uid="<?= $photo->uid?>" disabled>
|
|
||||||
👎 Dagegen
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<?php
|
|
||||||
}
|
|
||||||
} catch (\Exception $e) {
|
|
||||||
die('Fehler: ' . $footer . $e->getMessage() . '</body></html>');
|
|
||||||
}
|
|
||||||
?>
|
|
||||||
<div>
|
|
||||||
<a class="<?=$link_class?>" href="vote-gallery.php?token=<?=$token?>&count=<?=$count?>&page=1"><<</a>
|
|
||||||
<a class="<?=$link_class?>" href="vote-gallery.php?token=<?=$token?>&count=<?=$count?>&page=<?=$page-1?>"><</a>
|
|
||||||
Seite <?=$page?>
|
|
||||||
<a class="pageLink" href="vote-gallery.php?token=<?=$token?>&count=<?=$count?>&page=<?=$page+1?>">></a>
|
|
||||||
</div>
|
|
52
vote.css
52
vote.css
@ -1,52 +0,0 @@
|
|||||||
:root {
|
|
||||||
--main-bg-color: white;
|
|
||||||
--main-text-color: #333333;
|
|
||||||
}
|
|
||||||
|
|
||||||
@media (prefers-color-scheme: dark) {
|
|
||||||
:root {
|
|
||||||
--main-bg-color: #333333;
|
|
||||||
--main-text-color: white;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
body {
|
|
||||||
background-color: var(--main-bg-color);
|
|
||||||
color: var(--main-text-color);
|
|
||||||
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Oxygen-Sans, Ubuntu,
|
|
||||||
Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", Arial, sans-serif;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
button {
|
|
||||||
padding: 4px;
|
|
||||||
}
|
|
||||||
|
|
||||||
img {
|
|
||||||
display: block;
|
|
||||||
}
|
|
||||||
|
|
||||||
.photowrapper {
|
|
||||||
margin: 8px;
|
|
||||||
display: inline-block;
|
|
||||||
}
|
|
||||||
|
|
||||||
.votewrapper {
|
|
||||||
margin: auto;
|
|
||||||
display: flex;
|
|
||||||
justify-content: center;
|
|
||||||
}
|
|
||||||
|
|
||||||
a.disabled, a.disabled:visited {
|
|
||||||
pointer-events: none;
|
|
||||||
color: rgb(163, 163, 163);
|
|
||||||
cursor: not-allowed;
|
|
||||||
}
|
|
||||||
|
|
||||||
.pageLink {
|
|
||||||
color: orange;
|
|
||||||
}
|
|
||||||
|
|
||||||
.pageLink:visited {
|
|
||||||
color: rgb(195, 0, 255);
|
|
||||||
}
|
|
41
vote.js
41
vote.js
@ -1,41 +0,0 @@
|
|||||||
async function vote(button) {
|
|
||||||
console.log(button);
|
|
||||||
const name = document.getElementById('nameInput').value;
|
|
||||||
const data = new FormData();
|
|
||||||
data.append("name", name);
|
|
||||||
data.append("vote", button.value);
|
|
||||||
data.append("uid", button.dataset.uid);
|
|
||||||
const response = await fetch('vote.php', { method: "POST", body: data });
|
|
||||||
button.disabled = true;
|
|
||||||
button.parentElement
|
|
||||||
.querySelectorAll('.voteButton')
|
|
||||||
.forEach(b => {
|
|
||||||
b.disabled = b.value === button.value;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
async function loadVotes() {
|
|
||||||
const name = document.getElementById('nameInput').value;
|
|
||||||
localStorage.setItem('name', name);
|
|
||||||
const response = await fetch('vote.php?' + new URLSearchParams({
|
|
||||||
name: name
|
|
||||||
}));
|
|
||||||
const result = await response.json();
|
|
||||||
console.log(result);
|
|
||||||
document
|
|
||||||
.querySelectorAll('.voteButton')
|
|
||||||
.forEach(b => {
|
|
||||||
b.disabled = b.dataset.uid in result && b.value == result[b.dataset.uid];
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
window.addEventListener('DOMContentLoaded', async (event) => {
|
|
||||||
console.log('DOMContentLoaded');
|
|
||||||
const loadedName = localStorage.getItem('name');
|
|
||||||
console.log(loadedName);
|
|
||||||
if (loadedName) {
|
|
||||||
const nameInput = document.getElementById('nameInput');
|
|
||||||
nameInput.value = loadedName;
|
|
||||||
await loadVotes();
|
|
||||||
}
|
|
||||||
});
|
|
30
vote.php
30
vote.php
@ -1,30 +0,0 @@
|
|||||||
<?php
|
|
||||||
$votes_file = 'votes.json';
|
|
||||||
|
|
||||||
if (isset($_GET['name'])) {
|
|
||||||
$name = $_GET['name'];
|
|
||||||
$contents = file_get_contents($votes_file);
|
|
||||||
if ($contents === false) {
|
|
||||||
$contents = '{}';
|
|
||||||
}
|
|
||||||
$contents = json_decode($contents, true);
|
|
||||||
$data = $contents[$name] ?? [];
|
|
||||||
header('Content-Type: application/json; charset=utf-8');
|
|
||||||
die(json_encode($data));
|
|
||||||
} elseif (isset($_POST['name']) && isset($_POST['uid']) && isset($_POST['vote'])) {
|
|
||||||
$name = $_POST['name'];
|
|
||||||
$contents = file_get_contents($votes_file);
|
|
||||||
if ($contents === false) {
|
|
||||||
$contents = '{}';
|
|
||||||
}
|
|
||||||
$contents = json_decode($contents, true);
|
|
||||||
$data = $contents[$name] ?? [];
|
|
||||||
$data[$_POST['uid']] = $_POST['vote'];
|
|
||||||
$contents[$name] = $data;
|
|
||||||
file_put_contents($votes_file, json_encode($contents));
|
|
||||||
header('HTTP/1.1 204 No Content');
|
|
||||||
die();
|
|
||||||
} else {
|
|
||||||
header('HTTP/1.1 400 Bad Request');
|
|
||||||
die();
|
|
||||||
}
|
|
@ -1 +0,0 @@
|
|||||||
{"":{"pra15px12nephjox":"1"},"Max":{"pra15px12nephjox":"1","pra15pf3bal4owcz":"-1","pra15oq302x3jkuz":"1","pra15nj2z2ludgom":"1","pr354wv3w00i7czq":"1","pr354x42wpbkkg7m":"1","pr354z62mo0pncoz":"1","pr9mmge3mws6j0rw":"1","pr354yv3323z8b3z":"1","pr354wnz5nl70u4v":"1","pr354we11aqlpp4w":"1","pr354v03myo2bo7b":"1","pr354v63s8rslcv9":"1","pr354vp2ac5w1475":"1","pr354vs27id73evj":"1","pr354vwa8rws201t":"1","pra15okcu3t5ob18":"-1","pra15no38usadrog":"1","pr354x99sy2hweha":"-1","pr354wz2t3pdxu96":"1"},"Tanja":{"pra15px12nephjox":"-1","pra15pu3vm33tk8q":"-1","pra15pn12aqtap4o":"0","pra15pf3bal4owcz":"-1","pra15p92aj8kop1p":"0","pra15p43fyu1terq":"1","pra15ox3hmtsdz3l":"-1","pra15oq302x3jkuz":"1","pra15okcu3t5ob18":"0","pra15od10vgdxzrb":"1","pra15o6zv5tgetvk":"-1","pra15nz2zm6knku7":"-1","pra15nuvxk0zmeh9":"-1","pra15no38usadrog":"-1","pra15nj2z2ludgom":"1","pra15nd3ov8vazx7":"1","pra15n3y8fe0petq":"-1","pra15mw24h20rl1a":"1","pr9mmge3mws6j0rw":"1","pr354z62mo0pncoz":"-1","pr354z11al5w7r7g":"-1","pr354yv3323z8b3z":"-1","pr354yn28trvqtyy":"-1","pr354yi4avhp502d":"-1","pr354yc26ml4vbae":"-1","pr354y8edf9t34mj":"1","pr354y14maa7029f":"1","pr354xy2bhnte2gq":"-1","pr354xvtxuexra59":"1","pr354xl3gvk4amup":"-1","pr354xc1yyqjiciw":"-1","pr354x99sy2hweha":"-1","pr354x42wpbkkg7m":"1","pr354wz2t3pdxu96":"1","pr354wv3w00i7czq":"1","pr354wr25rtuux68":"1","pr354wnz5nl70u4v":"1","pr354wj2ph8qjcwg":"1","pr354we11aqlpp4w":"-1","pr354w93pprqutov":"-1","pr354w62c5g8t1po":"1","pr354vz2dnwjdm1r":"1","pr354vwa8rws201t":"-1","pr354vs27id73evj":"-1","pr354vp2ac5w1475":"1","pr354v63s8rslcv9":"0","pr354v03myo2bo7b":"0","pr354uovlc3coazv":"-1"},"Colin":{"pra15px12nephjox":"1","pra15pu3vm33tk8q":"-1","pra15pn12aqtap4o":"1","pra15pf3bal4owcz":"1","pra15p92aj8kop1p":"1","pra15p43fyu1terq":"0","pra15ox3hmtsdz3l":"0","pra15oq302x3jkuz":"1","pra15okcu3t5ob18":"0","pra15od10vgdxzrb":"1","pra15o6zv5tgetvk":"0","pra15nz2zm6knku7":"1","pra15nuvxk0zmeh9":"-1","pra15no38usadrog":"0","pra15nj2z2ludgom":"1","pra15nd3ov8vazx7":"1","pra15n3y8fe0petq":"-1","pra15mw24h20rl1a":"1","pr9mmge3mws6j0rw":"0","pr354z62mo0pncoz":"1","pr354z11al5w7r7g":"1","pr354yv3323z8b3z":"1","pr354yn28trvqtyy":"1","pr354yi4avhp502d":"1","pr354yc26ml4vbae":"1","pr354y8edf9t34mj":"1","pr354y14maa7029f":"1","pr354xy2bhnte2gq":"-1","pr354xvtxuexra59":"1","pr354xl3gvk4amup":"-1","pr354xc1yyqjiciw":"-1","pr354x99sy2hweha":"-1","pr354x42wpbkkg7m":"1","pr354wz2t3pdxu96":"0","pr354wv3w00i7czq":"1","pr354wr25rtuux68":"1","pr354wnz5nl70u4v":"0","pr354wj2ph8qjcwg":"0","pr354we11aqlpp4w":"-1","pr354w93pprqutov":"-1","pr354w62c5g8t1po":"0","pr354vz2dnwjdm1r":"1","pr354vwa8rws201t":"0","pr354vs27id73evj":"1","pr354vp2ac5w1475":"1","pr354v63s8rslcv9":"1","pr354v03myo2bo7b":"1","pr354uovlc3coazv":"1"},"Claraaa":{"pra15px12nephjox":"1","pra15pu3vm33tk8q":"0","pra15pn12aqtap4o":"1","pra15pf3bal4owcz":"1","pra15p92aj8kop1p":"1","pra15p43fyu1terq":"1","pra15ox3hmtsdz3l":"1","pra15oq302x3jkuz":"1","pra15okcu3t5ob18":"0","pra15od10vgdxzrb":"1","pra15o6zv5tgetvk":"-1","pra15nz2zm6knku7":"1","pra15nuvxk0zmeh9":"0","pra15no38usadrog":"0","pra15nj2z2ludgom":"1","pra15nd3ov8vazx7":"1","pra15n3y8fe0petq":"-1","pra15mw24h20rl1a":"0","pr9mmge3mws6j0rw":"0","pr354z62mo0pncoz":"1","pr354z11al5w7r7g":"1","pr354yv3323z8b3z":"1","pr354yn28trvqtyy":"0","pr354yi4avhp502d":"0","pr354yc26ml4vbae":"1","pr354y8edf9t34mj":"0","pr354y14maa7029f":"1","pr354xy2bhnte2gq":"0","pr354xvtxuexra59":"1","pr354xl3gvk4amup":"0","pr354xc1yyqjiciw":"0","pr354x99sy2hweha":"0","pr354x42wpbkkg7m":"1","pr354wv3w00i7czq":"1","pr354wz2t3pdxu96":"1","pr354wr25rtuux68":"1","pr354wnz5nl70u4v":"1"}}
|
|
Loading…
Reference in New Issue
Block a user