Merge remote-tracking branch 'origin/master'

[jirafeau_mojo42.git] / lib / functions.js.php

diff --git a/lib/functions.js.php b/lib/functions.js.php
index 989b7884afad87f33641fc63baf20ec48886ccc4..0c9a0201a65f4a6299c71355d2bc3a8d035f91e8 100644 (file)
--- a/lib/functions.js.php
+++ b/lib/functions.js.php
@@ -35,6 +35,84 @@ function translate (expr)
     return expr;
 }
 
     return expr;
 }
 

+function isEmpty(str) {
+    return (!str || 0 === str.length);
+}
+
+// Extend date object with format method
+Date.prototype.format = function(format) {
+    format = format || 'YYYY-MM-DD hh:mm';
+
+    var zeropad = function(number, length) {
+        number = number.toString();
+        length = length || 2;
+        while(number.length < length)
+            number = '0' + number;
+        return number;
+    },
+    formats = {
+        YYYY: this.getFullYear(),
+        MM: zeropad(this.getMonth() + 1),
+        DD: zeropad(this.getDate()),
+        hh: zeropad(this.getHours()),
+        mm: zeropad(this.getMinutes()),
+        O: (function() {
+            localDate = new Date;
+            sign = (localDate.getTimezoneOffset() > 0) ? '-' : '+';
+            offset = Math.abs(localDate.getTimezoneOffset());
+            hours = zeropad(Math.floor(offset / 60));
+            minutes = zeropad(offset % 60);
+            return sign + hours + ":" + minutes;
+        })()
+    },
+    pattern = '(' + Object.keys(formats).join(')|(') + ')';
+
+    return format.replace(new RegExp(pattern, 'g'), function(match) {
+        return formats[match];
+    });
+};
+
+function dateFromUtcString(datestring) {
+    // matches »YYYY-MM-DD hh:mm«
+    var m = datestring.match(/(\d+)-(\d+)-(\d+)\s+(\d+):(\d+)/);
+    return new Date(Date.UTC(+m[1], +m[2] - 1, +m[3], +m[4], +m[5], 0));
+}
+
+function dateFromUtcTimestamp(datetimestamp) {
+    return new Date(parseInt(datetimestamp) * 1000)
+}
+
+function dateToUtcString(datelocal) {
+    return new Date(
+        datelocal.getUTCFullYear(),
+        datelocal.getUTCMonth(),
+        datelocal.getUTCDate(),
+        datelocal.getUTCHours(),
+        datelocal.getUTCMinutes(),
+        datelocal.getUTCSeconds()
+    ).format();
+}
+
+function dateToUtcTimestamp(datelocal) {
+    return (Date.UTC(
+        datelocal.getUTCFullYear(),
+        datelocal.getUTCMonth(),
+        datelocal.getUTCDate(),
+        datelocal.getUTCHours(),
+        datelocal.getUTCMinutes(),
+        datelocal.getUTCSeconds()
+    ) / 1000);
+}
+
+function convertAllDatetimeFields() {
+    datefields = document.getElementsByClassName('datetime')
+    for(var i=0; i<datefields.length; i++) {
+        dateUTC = datefields[i].getAttribute('data-datetime');
+        datefields[i].setAttribute('title', dateUTC + ' (GMT)');
+        datefields[i].innerHTML = dateFromUtcString(dateUTC).format('YYYY-MM-DD hh:mm (GMT O)');
+    }
+}
+

 function show_link (url, reference, delete_code, crypt_key, date)
 {
     // Upload finished
 function show_link (url, reference, delete_code, crypt_key, date)
 {
     // Upload finished


@@ -61,9 +139,11 @@ function show_link (url, reference, delete_code, crypt_key, date)
     var filename = document.getElementById('file_select').files[0].name;
     var b = encodeURIComponent("Download file \"" + filename + "\":") + "%0D";
     b += encodeURIComponent(download_link_href) + "%0D";
     var filename = document.getElementById('file_select').files[0].name;
     var b = encodeURIComponent("Download file \"" + filename + "\":") + "%0D";
     b += encodeURIComponent(download_link_href) + "%0D";

-    if (date)
-        b += "%0D" + encodeURIComponent("This file will be available until " + date) + "%0D";
-    document.getElementById('upload_link_email').href = "mailto:?body=" + b + "&subject=" + encodeURIComponent(filename);
+    if (false == isEmpty(date))
+    {
+        b += "%0D" + encodeURIComponent("This file will be available until " + date.format('YYYY-MM-DD hh:mm (GMT O)')) + "%0D";
+        document.getElementById('upload_link_email').href = "mailto:?body=" + b + "&subject=" + encodeURIComponent(filename);
+    }

 
     // Delete link
     var delete_link = url + 'f.php?h=' + reference + '&amp;d=' + delete_code;
 
     // Delete link
     var delete_link = url + 'f.php?h=' + reference + '&amp;d=' + delete_code;


@@ -72,13 +152,17 @@ function show_link (url, reference, delete_code, crypt_key, date)
     document.getElementById('delete_link').href = delete_link_href;
 
     // Validity date
     document.getElementById('delete_link').href = delete_link_href;
 
     // Validity date

-    if (date)
+    if (isEmpty(date))

     {
     {

-        document.getElementById('date').innerHTML = date;
+        document.getElementById('validity').style.display = 'none';
+    }
+    else {
+        document.getElementById('date').innerHTML = '<span class="datetime" title="'
+            + dateToUtcString(date) + ' (GMT)">'
+            + date.format('YYYY-MM-DD hh:mm (GMT O)')
+            + '</span>';

         document.getElementById('validity').style.display = '';
     }
         document.getElementById('validity').style.display = '';
     }

-    else
-        document.getElementById('validity').style.display = 'none';

 
     // Preview link (if allowed)
     if (!!document.getElementById('preview_link'))
 
     // Preview link (if allowed)
     if (!!document.getElementById('preview_link'))


@@ -177,12 +261,13 @@ function control_selected_file_size(max_size, error_str)
     }
     else
     {
     }
     else
     {

-        document.getElementById('options').style.display = '';
-        document.getElementById('send').style.display = '';
+        // add class to restyle upload form in next step
+        document.getElementById('upload').setAttribute('class', 'file-selected');
+        // display options
+        document.getElementById('options').style.display = 'block';
+        document.getElementById('send').style.display = 'block';

         document.getElementById('error_pop').style.display = 'none';
         document.getElementById('error_pop').style.display = 'none';

-        document.getElementById('file_select').style.left = 'inherit';
-        document.getElementById('file_select').style.height = 'inherit';
-        document.getElementById('file_select').style.opacity = '1';
+        document.getElementById('send').focus();

     }
 }
 
     }
 }
 


@@ -268,15 +353,20 @@ function classic_upload (url, file, time, password, one_time, upload_password)
             }
 
             res = res.split ("\n");
             }
 
             res = res.split ("\n");

+            var expiryDate = '';

             if (time != 'none')
             {
             if (time != 'none')
             {

-                var d = new Date();
-                if(!add_time_string_to_date(d, time))
+                // convert time (local time + selected expiry date)
+                var localDatetime = new Date();
+                if(!add_time_string_to_date(localDatetime, time))
+                {
+                    pop_failure ('Error: Date can not be parsed');

                     return;
                     return;

-                show_link (url, res[0], res[1], res[2], d.toString());
+                }
+                expiryDate = localDatetime;

             }
             }

-            else
-                show_link (url, res[0], res[1], res[2]);
+
+            show_link (url, res[0], res[1], res[2], expiryDate);

         }
     }
     req.open ("POST", url + 'script.php' , true);
         }
     }
     req.open ("POST", url + 'script.php' , true);


@@ -443,15 +533,19 @@ function async_upload_end (code)
             }
 
             res = res.split ("\n");
             }
 
             res = res.split ("\n");

+            var expiryDate = '';

             if (async_global_time != 'none')
             {
             if (async_global_time != 'none')
             {

-                var d = new Date();
-                if(!add_time_string_to_date(d, async_global_time))
-                    return;
-                show_link (async_global_url, res[0], res[1], res[2], d.toString());
+              // convert time (local time + selected expiry date)
+              var localDatetime = new Date();
+              if(!add_time_string_to_date(localDatetime, async_global_time)) {
+                pop_failure ('Error: Date can not be parsed');
+                return;
+              }
+              expiryDate = localDatetime;

             }
             }

-            else
-                show_link (async_global_url, res[0], res[1], res[2]);
+
+            show_link (async_global_url, res[0], res[1], res[2], expiryDate);

         }
     }
     req.open ("POST", async_global_url + 'script.php?end_async' , true);
         }
     }
     req.open ("POST", async_global_url + 'script.php?end_async' , true);


@@ -624,3 +718,9 @@ function upload_speed_refresh_limiter(speed_str)
     }
     return upload_speed_refresh_limiter_last_value;
 }
     }
     return upload_speed_refresh_limiter_last_value;
 }

+
+// document.ready()
+document.addEventListener('DOMContentLoaded', function(event) {
+    // Search for all datetime fields and convert the time to local timezone
+    convertAllDatetimeFields();
+});