From 3276ea6aaf55822710fe6940d8a094e63236ad0a Mon Sep 17 00:00:00 2001
From: Hyleus <Hyleus@tuta.io>
Date: Fri, 22 Dec 2017 22:35:16 +0100
Subject: [PATCH] Improve global freeleech implementation

---
 config/other.php                         |  2 ++
 resources/views/layout/default.blade.php | 19 ++++++++++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/config/other.php b/config/other.php
index aba2dadcaa..097fbc6546 100755
--- a/config/other.php
+++ b/config/other.php
@@ -77,6 +77,8 @@
     */
     'freeleech' => false,
 
+    'freeleech_until' => '12/23/2017 3:00 PM EST',
+
     /*
     |--------------------------------------------------------------------------
     | Double Upload State
diff --git a/resources/views/layout/default.blade.php b/resources/views/layout/default.blade.php
index a7900476d6..1763c5535c 100755
--- a/resources/views/layout/default.blade.php
+++ b/resources/views/layout/default.blade.php
@@ -404,7 +404,7 @@
 
       @if (config('other.freeleech') == true || config('other.invite-only') == false || config('other.doubleup') == true)
       <script type="text/javascript">
-        CountDownTimer('12/01/2017 3:00 PM EST', 'promotions');
+        CountDownTimer('{{config('other.freeleech_until')}}', 'promotions');
 
         function CountDownTimer(dt, id) {
           var end = new Date(dt);
@@ -415,6 +415,15 @@ function CountDownTimer(dt, id) {
           var _day = _hour * 24;
           var timer;
 
+          function formatUnit(text, v) {
+              console.log(v);
+              let suffix = "s";
+              if (v === 1) {
+                  suffix = "";
+              }
+              return  v + " " + text + suffix;
+          }
+
           function showRemaining() {
             var now = new Date();
             var distance = end - now;
@@ -430,10 +439,10 @@ function showRemaining() {
             var minutes = Math.floor((distance % _hour) / _minute);
             var seconds = Math.floor((distance % _minute) / _second);
 
-            document.getElementById(id).innerHTML = days + 'day(s)';
-            document.getElementById(id).innerHTML += hours + 'hour(s)';
-            document.getElementById(id).innerHTML += minutes + 'minute(s)';
-            document.getElementById(id).innerHTML += seconds + 'second(s)';
+            document.getElementById(id).innerHTML = formatUnit("day", days) + ", ";
+            document.getElementById(id).innerHTML += formatUnit('hour', hours) + ", ";
+            document.getElementById(id).innerHTML += formatUnit('minute', minutes) + ", ";
+            document.getElementById(id).innerHTML += formatUnit('second', seconds);
           }
 
           timer = setInterval(showRemaining, 1000);