From 85d67d058beb834eb7bed8ee19bcbf400ecc7631 Mon Sep 17 00:00:00 2001
From: Senad Uka <senaduka@gmail.com>
Date: Sun, 30 Aug 2020 05:57:19 +0200
Subject: [PATCH] Smanji broj okvirova / koristi adler hash

---
 admin/upload.php | 8 +++-----
 image.php        | 2 +-
 okvirovi.php     | 8 ++++----
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/admin/upload.php b/admin/upload.php
index f3c5e26..e1440a2 100644
--- a/admin/upload.php
+++ b/admin/upload.php
@@ -1,15 +1,13 @@
 <?php
 
-function hashedName() {
-  $now = time();
-  $somenumber = rand();
-  return sha1("ojhaa $now $somenumber ojhaaa");
+function hashedName($fileName) {
+  return mhash(MHASH_ADLER32, $fileName);
 }
 
 $target_dir = __DIR__ . "/../slike/";
 $target_file = $target_dir . basename($_FILES["fileToUpload"]["name"]);
 $imageFileType = strtolower(pathinfo($target_file,PATHINFO_EXTENSION));
-$hashed_name = hashedName();
+$hashed_name = hashedName($target_file);
 $target_file = $target_dir . $hashed_name . ".$imageFileType";
 
 $uploadOk = 1;
diff --git a/image.php b/image.php
index 0a62a10..e11b73f 100644
--- a/image.php
+++ b/image.php
@@ -62,7 +62,7 @@ $gotova_slika = $imagine->create($okvir_size, $color);
 $gotova_slika->paste($okvir_image, new Imagine\Image\Point(0,0));
 
 $imeslike = "$okvir_id" . "$slika";
-$etag = md5($imeslike);
+$etag = mhash(MHASH_ADLER32, $imeslike);
 header("Etag: $etag"); 
 
 $seconds_to_cache = 86400;
diff --git a/okvirovi.php b/okvirovi.php
index 1b19a79..39785c4 100644
--- a/okvirovi.php
+++ b/okvirovi.php
@@ -6,7 +6,7 @@ $okvirovi = array (
   2 => 'Okvir-za-slike-ERLAND-18x23cm-roza.png',
   3 => 'Okvir-za-slike-OSCAR-13x18cm-bijela.png',
   4 => 'Okvir-za-slike-OSCAR-13x18cm-crna.png',
-  5 => 'Okvir-za-slike-OSCAR-21x30cm-bijela.png',
+/*  5 => 'Okvir-za-slike-OSCAR-21x30cm-bijela.png',
   6 => 'Okvir-za-slike-OSCAR-21x30cm-crna.png',
   7 => 'Okvir-za-slike-OSCAR-30x40cm-bijela.png',
   8 => 'Okvir-za-slike-OSCAR-30x40cm-crna.png',
@@ -25,7 +25,7 @@ $okvirovi = array (
   21 => 'Okvir-za-slike-VALTER-30x40cm-bijela.png',
   22 => 'Okvir-za-slike-VALTER-40x50cm-crna.png',
   23 => 'Okvir-za-slike-VALTER-50x70cm-crna.png',
-  24 => 'Okvir-za-slike-BERGUR-18x24cm-srebrna.png',
+  24 => 'Okvir-za-slike-BERGUR-18x24cm-srebrna.png', */
 );
 
 $radne_velicine = array(
@@ -33,7 +33,7 @@ $radne_velicine = array(
 2 => new Imagine\Image\Box(736, 1144),
 3 => new Imagine\Image\Box(1048, 1492),
 4 => new Imagine\Image\Box(992, 1432),
-5 => new Imagine\Image\Box(1056, 1580),
+/*5 => new Imagine\Image\Box(1056, 1580),
 6 => new Imagine\Image\Box(1072, 1584),
 7 => new Imagine\Image\Box(1196, 1624),
 8 => new Imagine\Image\Box(1180, 1636),
@@ -52,7 +52,7 @@ $radne_velicine = array(
 21 => new Imagine\Image\Box(1248, 1708),
 22 => new Imagine\Image\Box(1288, 1632),
 23 => new Imagine\Image\Box(1164, 1692),
-24 => new Imagine\Image\Box(976, 1324),
+24 => new Imagine\Image\Box(976, 1324), */
 );
 
 function rotiraj_za_90($box) {