Photowall/Photowall_WebApp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'levi' into 'master'

Browse Source 
Merge levi into master

See merge request photowall/photowall-webapp!6
This commit is contained in:
Wiesner András 2021-01-25 21:11:40 +01:00
commit af9ee79751
5 changed files with 28 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
approve.php
View File

@ -381,7 +381,7 @@ if ($logged_in) {
<?php } ?>
<!-- TESZTVERZIÓ -->
<section class="testversion-sign">TESZTVERZIÓ</section>
<!-- <section class="testversion-sign">TESZTVERZIÓ</section> -->
</body>
</html>

10
globals.php
View File

@ -1,10 +0,0 @@
<?php
// SQL-paraméterek
define("SQL_USER", "root");
define("SQL_PASS", "");
define("SQL_DB", "photowall_db");
define("SQL_IP", "127.0.0.1");
define('PHW_DB_GRANTED', true);
define('HASHED_REVIS_PASSWORD', '$2y$10$r9y4r6Z4/xnI94MhtkYZf.Oj2/uAUNTMANZRgya1d15.m71Ac7exy');
define('DEBUG_MODE', true);

92
init.sql
View File

File diff suppressed because one or more lines are too long

24
interface.php
View File

@ -118,30 +118,20 @@ function publish_image($artwork_details)
// nagyméretű kép elkészítése
$large_filename = PUBLISHED_DIR . DIRECTORY_SEPARATOR . $final_filename;
// korrekciós parancs
// konvertálás paraméterei
$autocorrect = $artwork_details["autocorrect"];
$img_autocorrect = $autocorrect ? "-normalize -sharpen 5" : "";
$strip_exifdata = "-strip";
$auto_orient = "-auto-orient"; // autómatikus elforgatás az EXIF infók alapján
$strip_exifdata = "-strip"; // EXIF információk kiszedése
// ha a fájl nagyobb, mint 2MB, akkor visszatömörítjük
$filesize = filesize($incoming_filename);
if ($filesize > $MAX_LARGE_IMAGE_FILESIZE) {
$cmd = "convert -define jpeg:extent=$MAX_LARGE_IMAGE_FILESIZE_STR $img_autocorrect $strip_exifdata $incoming_filename $large_filename";
// tömörítés, korrekció, elforgatás, EXIF tisztítás
$cmd = "convert -define jpeg:extent=$MAX_LARGE_IMAGE_FILESIZE_STR $img_autocorrect $auto_orient $strip_exifdata $incoming_filename $large_filename";
shell_exec($cmd);
unlink($incoming_filename); // törlés az incoming-ból
} else { //...ha nem volt túl nagy a fájl
if ($autocorrect) {
$cmd = "convert $img_autocorrect $strip_exifdata $incoming_filename $large_filename";
shell_exec($cmd);
unlink($incoming_filename); // törlés az incoming-ból
} else {
shell_exec("mv $incoming_filename $large_filename && exiftool -overwrite_original -all= '$large_filename'");
}
}
// bélyegkép elkészítése
$thumb_filename = THUMBNAIL_DIR . DIRECTORY_SEPARATOR . $final_filename;
$cmd = "convert $strip_exifdata -define jpeg:extent=$MAX_THUMB_IMAGE_FILESIZE_STR -thumbnail \"$THUMB_IMAGE_LARGEST_DIM>\" $large_filename $thumb_filename";
$cmd = "convert -define jpeg:extent=$MAX_THUMB_IMAGE_FILESIZE_STR -thumbnail \"$THUMB_IMAGE_LARGEST_DIM>\" $large_filename $thumb_filename";
shell_exec($cmd);
// átlagszín kiszámítása
@ -228,7 +218,7 @@ function get_update_batch($last_uid)
$batch = [];
// az utolsó UID óta érkezett sorok kiválogatása
$query = "SELECT Image_FileName,AspectRatio,ColorMean,Author,AuthorGroup,Description,Title,UID FROM publish_table WHERE No > (SELECT No FROM publish_table WHERE UID = '$last_uid') AND Approved=1;";
$query = "SELECT Image_FileName,AspectRatio,ColorMean,Author,AuthorGroup,Description,Title,UID FROM publish_table WHERE No > IFNULL((SELECT No FROM publish_table WHERE UID = '$last_uid'), -1) AND Approved=1;";
$ret = mysqli_query($dbconn, $query);
while (($row = $ret->fetch_assoc()) != NULL) {

3
js/phw.js
View File

@ -306,6 +306,8 @@ function req_batch() {
function recv_batch(state, resp) {
let img_batch = JSON.parse(resp);
// ha van még kép, akkor frissítjük a falat
if (img_batch.length > 0) {
// utolsó UID mentése, ha most történt az első letöltés
if (artworks_loaded_n === 0) {
last_uid = img_batch[0].UID;
@ -327,6 +329,7 @@ function recv_batch(state, resp) {
if (wall_height < window.innerHeight && total_artwork_count > artworks_loaded_n) {
req_batch();
}
}
// töltés kész
dynamic_loading_under_way = false;