From 33865ad9f4e4747a77aea2abadd0250bc47a9176 Mon Sep 17 00:00:00 2001
From: Maxim Stewart <maximstewart1@gmail.com>
Date: Fri, 12 Apr 2019 15:01:12 -0500
Subject: [PATCH] Changed locking strategy.

---
 resources/php/config.php        |  2 --
 resources/php/lockedFolders.php | 10 +++++-----
 resources/php/sse.php           |  4 ----
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/resources/php/config.php b/resources/php/config.php
index 252784c..a4120bd 100644
--- a/resources/php/config.php
+++ b/resources/php/config.php
@@ -9,8 +9,6 @@
     $FILEMANAGER     = "spacefm";
     $LOCKPASSWORD    = "1234";
     $TMPFOLDERSIZE   = 8000; // tmp folder size check for cleanup if above 8GB used.
-    $UNLOCKTIME      = 80;  // Every ~3 sec this ticks down
-                            // Ex: 3*60 == 180 sec or 3 minutes
     // NOTE:  Split folders with ::::
     $LOCKEDFOLDERS   = "./dirLockCheck/";
 
diff --git a/resources/php/lockedFolders.php b/resources/php/lockedFolders.php
index 88c152e..e0c044a 100644
--- a/resources/php/lockedFolders.php
+++ b/resources/php/lockedFolders.php
@@ -6,14 +6,14 @@
         $LOCKS = explode("::::", $LOCKEDFOLDERS);
         $size  = sizeof($LOCKS);
 
-        if (isset($_SESSION["unlockTime"]) && $_SESSION["unlockTime"] > 0) {
+        if (isset($_SESSION["unlockState"]) && $_SESSION["unlockState"] == true) {
             return false;
         }
 
         for ($i = 0; $i < $size; $i++) {
             if (strpos($NEWPATH, $LOCKS[$i]) !== false) {
                 if ($PASSWD === $LOCKPASSWORD) {
-                    $_SESSION["unlockTime"] = $UNLOCKTIME;
+                    $_SESSION["unlockState"] = true;
                     return false;
                 } else {
                     return true;
@@ -27,13 +27,13 @@
         session_start();
         include 'serverMessenger.php';
 
-        if (isset($_SESSION["unlockTime"]) && $_SESSION["unlockTime"] > 0) {
-            $_SESSION["unlockTime"] = -1;
+        if (isset($_SESSION["unlockState"]) && $_SESSION["unlockState"] == true) {
+            $_SESSION["unlockState"] = false;
             $message = "Server: [Success] --> Folders unlocked!";
             serverMessage("success", $message);
         } else {
             $message = "Server: [Warning] --> Folders aren't unlocked!"
-                     . "\n" . $_SESSION["unlockTime"];
+                     . "\n" . $_SESSION["unlockState"];
             serverMessage("warning", $message);
         }
     }
diff --git a/resources/php/sse.php b/resources/php/sse.php
index 1c51ed3..4d8867d 100644
--- a/resources/php/sse.php
+++ b/resources/php/sse.php
@@ -7,10 +7,6 @@
         $_SESSION["refreshState"] = "none";
     }
 
-    if (isset($_SESSION["unlockTime"]) && $_SESSION["unlockTime"] >= 0) {
-        $_SESSION["unlockTime"] -= 1;
-    }
-
     header('Content-Type: text/event-stream');
     header('Cache-Control: no-cache');
     echo "data:" . $_SESSION["refreshState"] . "\n\n";