X-Git-Url: https://git.p6c8.net/jirafeau_mojo42.git/blobdiff_plain/28606cf6b85459d37b0b4e45a6114eced94fcf4c..ea78557b0c3dc4eaaaefc9abbaf8c2e476f64a78:/lib/functions.js.php diff --git a/lib/functions.js.php b/lib/functions.js.php index 7a1c5af..3b39c6d 100644 --- a/lib/functions.js.php +++ b/lib/functions.js.php @@ -20,21 +20,25 @@ header('Content-Type: text/javascript'); -define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/../'); -require (JIRAFEAU_ROOT . 'lib/config.original.php'); -require (JIRAFEAU_ROOT . 'lib/settings.php'); -require (JIRAFEAU_ROOT . 'lib/functions.php'); -require (JIRAFEAU_ROOT . 'lib/lang.php'); +define('JIRAFEAU_ROOT', dirname(__FILE__) . '/../'); + +require(JIRAFEAU_ROOT . 'lib/settings.php'); +require(JIRAFEAU_ROOT . 'lib/functions.php'); +require(JIRAFEAU_ROOT . 'lib/lang.php'); ?> function translate (expr) { - var lang_array = ; + var lang_array = ; if (lang_array.hasOwnProperty(expr)) return lang_array[expr]; return expr; } +function isEmpty(str) { + return (!str || 0 === str.length); +} + function show_link (url, reference, delete_code, crypt_key, date) { // Upload finished @@ -61,9 +65,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"; - 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.toString()) + "%0D"; + document.getElementById('upload_link_email').href = "mailto:?body=" + b + "&subject=" + encodeURIComponent(filename); + } // Delete link var delete_link = url + 'f.php?h=' + reference + '&d=' + delete_code; @@ -72,13 +78,14 @@ function show_link (url, reference, delete_code, crypt_key, 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 = date.toString(); document.getElementById('validity').style.display = ''; } - else - document.getElementById('validity').style.display = 'none'; // Preview link (if allowed) if (!!document.getElementById('preview_link')) @@ -259,21 +266,29 @@ function classic_upload (url, file, time, password, one_time, upload_password) if (req.readyState == 4 && req.status == 200) { var res = req.responseText; - if (res == "Error") + + // if response starts with "Error" then show a failure + if (/^Error/.test(res)) { - pop_failure (); + pop_failure (res); return; } + res = res.split ("\n"); + var expiryDate = ''; 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; - 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); @@ -321,11 +336,13 @@ function async_upload_start (url, max_size, file, time, password, one_time, uplo if (req.readyState == 4 && req.status == 200) { var res = req.responseText; - if (res == "Error") + + if (/^Error/.test(res)) { - pop_failure (); + pop_failure (res); return; } + res = res.split ("\n"); async_global_ref = res[0]; var code = res[1]; @@ -390,11 +407,13 @@ function async_upload_push (code) if (req.readyState == 4 && req.status == 200) { var res = req.responseText; - if (res == "Error") + + if (/^Error/.test(res)) { - pop_failure (); + pop_failure (res); return; } + res = res.split ("\n"); var code = res[0] async_global_transfered = async_global_transfering; @@ -428,21 +447,27 @@ function async_upload_end (code) if (req.readyState == 4 && req.status == 200) { var res = req.responseText; - if (res == "Error") + + if (/^Error/.test(res)) { - pop_failure (); + pop_failure (res); return; } + res = res.split ("\n"); + var expiryDate = ''; 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);