Implement expiry after a fortnight (2 weeks).

diff --git a/index.php b/index.php
index fb5f1e5384a879a4e1ee6aa4cb9f041d96cf9199..9edb3af0668ead01a07084a923f88d777925b537 100644 (file)
--- a/index.php
+++ b/index.php
@@ -208,6 +208,10 @@ elseif (true === jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg))) {
             'value' => 'week',
             'label' => '1_W'
           ),
             'value' => 'week',
             'label' => '1_W'
           ),

+          array(
+              'value' => 'fortnight',
+              'label' => '2_W'
+          ),

           array(
             'value' => 'month',
             'label' => '1_M'
           array(
             'value' => 'month',
             'label' => '1_M'

diff --git a/lib/config.original.php b/lib/config.original.php
index d8722ac4d228b3785db6d42f3662f6194519fadd..59bad4e51eecbac4545cb1fc874ccf794ad822a7 100644 (file)
--- a/lib/config.original.php
+++ b/lib/config.original.php
@@ -112,8 +112,9 @@ $cfg['admin_http_auth_user'] = '';
  * 'hour': file available for one hour
  * 'day': file available for one day
  * 'week': file available for one week
  * 'hour': file available for one hour
  * 'day': file available for one day
  * 'week': file available for one week

+ * 'fortnight': file is available for two weeks

  * 'month': file is available for one month
  * 'month': file is available for one month

- * 'quarter': file is available for three month
+ * 'quarter': file is available for three months

  * 'year': file available for one year
  * 'none': unlimited availability
  */
  * 'year': file available for one year
  * 'none': unlimited availability
  */


@@ -122,6 +123,7 @@ $cfg['availabilities'] = array(
     'hour' => true,
     'day' => true,
     'week' => true,
     'hour' => true,
     'day' => true,
     'week' => true,

+    'fortnight' => true,

     'month' => true,
     'quarter' => false,
     'year' => false,
     'month' => true,
     'quarter' => false,
     'year' => false,

diff --git a/lib/functions.js.php b/lib/functions.js.php
index 14fad1da5fa98eadc2473c90cba890ad6161cba3..2127dbbb3f6201700b94bfce53545189839a2d62 100644 (file)
--- a/lib/functions.js.php
+++ b/lib/functions.js.php
@@ -321,6 +321,11 @@ function add_time_string_to_date(d, time)
         d.setSeconds (d.getSeconds() + 604800);
         return true;
     }
         d.setSeconds (d.getSeconds() + 604800);
         return true;
     }

+    if (time == 'fortnight')
+    {
+        d.setSeconds (d.getSeconds() + 1209600);
+        return true;
+    }

     if (time == 'month')
     {
                d.setSeconds (d.getSeconds() + 2592000);
     if (time == 'month')
     {
                d.setSeconds (d.getSeconds() + 2592000);

diff --git a/lib/locales/ar.json b/lib/locales/ar.json
index 1c0cbacb6a9358fa7cd84a0f7c9d717aae6ef959..2e68b0827c2c73913b7c8b8f38cad1350d6b7a0a 100644 (file)
--- a/lib/locales/ar.json
+++ b/lib/locales/ar.json
@@ -1,4 +1,5 @@
 {
 {

+    "2_W": "",

     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "حجم البيانات",
     "INCOMPATIBLE_OPTIONS_W": "",
     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "حجم البيانات",
     "INCOMPATIBLE_OPTIONS_W": "",

diff --git a/lib/locales/be.json b/lib/locales/be.json
index 201128dd350c9dde7c03bcd46b3654c9379e1115..2893d8a8cd1552d7f2fb8a308a01fe238ec0d571 100644 (file)
--- a/lib/locales/be.json
+++ b/lib/locales/be.json
@@ -1,4 +1,5 @@
 {
 {

+    "2_W": "",

     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",
     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",

diff --git a/lib/locales/bn_IN.json b/lib/locales/bn_IN.json
index ac7b8e83bb1ceb2e89e073bf803c89c42c39a238..4c4d1dd39b6a619eaeb7d7ad818e992e4219b9f2 100644 (file)
--- a/lib/locales/bn_IN.json
+++ b/lib/locales/bn_IN.json
@@ -1,4 +1,5 @@
 {
 {

+    "2_W": "",

     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",
     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",

diff --git a/lib/locales/bo.json b/lib/locales/bo.json
index aaf4850798244f1146098b378f7fc68a5a547c9c..772777aed7f25405900e7b14fecec51585b5f72f 100644 (file)
--- a/lib/locales/bo.json
+++ b/lib/locales/bo.json
@@ -1,4 +1,5 @@
 {
 {

+    "2_W": "",

     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",
     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",

diff --git a/lib/locales/ca.json b/lib/locales/ca.json
index 8caea3b786bfc75f69837c47a02a22fe091cc905..1f70ecb1c7b4b6803ed84b7f3791412eb0e2d56e 100644 (file)
--- a/lib/locales/ca.json
+++ b/lib/locales/ca.json
@@ -1,4 +1,5 @@
 {
 {

+    "2_W": "Una quincena",

     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",
     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",

diff --git a/lib/locales/cs.json b/lib/locales/cs.json
index 3babc970aec29af3c651b2e84a1b43d15117a75d..737980ba69fdf09bd1477ffcf79adb958cc83348 100644 (file)
--- a/lib/locales/cs.json
+++ b/lib/locales/cs.json
@@ -1,4 +1,5 @@
 {
 {

+    "2_W": "",

     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",
     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",

diff --git a/lib/locales/da.json b/lib/locales/da.json
index b7f1cdfd02822eac7be6a25ac2d0402b106f3c3a..c420396cab71525eecb0cfd3511fb60773ac318e 100644 (file)
--- a/lib/locales/da.json
+++ b/lib/locales/da.json
@@ -1,4 +1,5 @@
 {
 {

+    "2_W": "",

     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",
     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",

diff --git a/lib/locales/de.json b/lib/locales/de.json
index 66970f3a01bd194f2c8cec94ecd1af233ddc7547..1db7f7b253e556d28119b249214babbbae24f053 100644 (file)
--- a/lib/locales/de.json
+++ b/lib/locales/de.json
@@ -1,4 +1,5 @@
 {
 {

+    "2_W": "Zwei Wochen",

     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "Datengröße",
     "INCOMPATIBLE_OPTIONS_W": "Die folgenden Konfigurationsoptionen sind nicht kompatibel:",
     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "Datengröße",
     "INCOMPATIBLE_OPTIONS_W": "Die folgenden Konfigurationsoptionen sind nicht kompatibel:",

diff --git a/lib/locales/el.json b/lib/locales/el.json
index 49c416815581fe1770e2b0ff4942375d50163160..84937c31d866944900efbdb54821e27a0839e301 100644 (file)
--- a/lib/locales/el.json
+++ b/lib/locales/el.json
@@ -1,4 +1,5 @@
 {
 {

+    "2_W": "",

     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",
     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",

diff --git a/lib/locales/en.json b/lib/locales/en.json
index fdf4a65d025254c68644e540d6696f03d62debe1..817c1f4bb90e0afe37a09adea09cd62a121d4662 100644 (file)
--- a/lib/locales/en.json
+++ b/lib/locales/en.json
@@ -19,6 +19,7 @@
     "1_H": "One hour",
     "1_D": "One day",
     "1_W": "One week",
     "1_H": "One hour",
     "1_D": "One day",
     "1_W": "One week",

+    "2_W": "One fortnight",

     "1_M": "One month",
     "1_Q": "One quarter",
     "1_Y": "One year",
     "1_M": "One month",
     "1_Q": "One quarter",
     "1_Y": "One year",

diff --git a/lib/locales/es.json b/lib/locales/es.json
index a8255df4e6d4929abfe1bd10ca141278b270afb1..b7cff2f51e2c75fb78a50c9735671090635543bf 100644 (file)
--- a/lib/locales/es.json
+++ b/lib/locales/es.json
@@ -1,4 +1,5 @@
 {
 {

+    "2_W": "Una quincena",

     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",
     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",

diff --git a/lib/locales/et.json b/lib/locales/et.json
index 41966932f934394e1398817f157489fda88f6966..b62d93f5c994a2167a9ef87b4c6e535fa390c071 100644 (file)
--- a/lib/locales/et.json
+++ b/lib/locales/et.json
@@ -1,4 +1,5 @@
 {
 {

+    "2_W": "",

     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",
     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",

diff --git a/lib/locales/fi.json b/lib/locales/fi.json
index 0c427d70d9e74340c17f2091c908831178464843..960c41725436f75a12bfbb0106025e9c01f03747 100644 (file)
--- a/lib/locales/fi.json
+++ b/lib/locales/fi.json
@@ -1,4 +1,5 @@
 {
 {

+    "2_W": "",

     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",
     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",

diff --git a/lib/locales/fr.json b/lib/locales/fr.json
index 2450de52eee79e59c3377d0ff2cd253542efb1be..73aab8910cf43d08f82330b230816ed027dcd07b 100644 (file)
--- a/lib/locales/fr.json
+++ b/lib/locales/fr.json
@@ -1,4 +1,5 @@
 {
 {

+    "2_W": "Deux semaines",

     "REPORTING_AN_ISSUE": "Rapporter un bogue",
     "SIZE_DATA": "Volume de données",
     "INCOMPATIBLE_OPTIONS_W": "Les options de configuration suivantes sont incompatibles :",
     "REPORTING_AN_ISSUE": "Rapporter un bogue",
     "SIZE_DATA": "Volume de données",
     "INCOMPATIBLE_OPTIONS_W": "Les options de configuration suivantes sont incompatibles :",

diff --git a/lib/locales/he.json b/lib/locales/he.json
index edc63762a3ad18fb168864b29ea23caa124971b4..8f711a9654381284098b1a589b5f2e92a7bbf803 100644 (file)
--- a/lib/locales/he.json
+++ b/lib/locales/he.json
@@ -1,4 +1,5 @@
 {
 {

+    "2_W": "",

     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "גודל הנתונים",
     "INCOMPATIBLE_OPTIONS_W": "אפשרויות ההגדרה הבאות אינן תואמות:",
     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "גודל הנתונים",
     "INCOMPATIBLE_OPTIONS_W": "אפשרויות ההגדרה הבאות אינן תואמות:",

diff --git a/lib/locales/hi.json b/lib/locales/hi.json
index 5c8e5ff8acee8e6ea2ed785a0c1aefb0fea17fbd..0831b2088f4d0f0e60e4717201c3605375d7f783 100644 (file)
--- a/lib/locales/hi.json
+++ b/lib/locales/hi.json
@@ -1,4 +1,5 @@
 {
 {

+    "2_W": "",

     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",
     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",

diff --git a/lib/locales/hr.json b/lib/locales/hr.json
index 9b07fc4dddd33e322deb3239b46f9bdf0fe11341..bf4a83b768477eda812608bd61b3f8210e9e0586 100644 (file)
--- a/lib/locales/hr.json
+++ b/lib/locales/hr.json
@@ -1,4 +1,5 @@
 {
 {

+    "2_W": "",

     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "Veličina podataka",
     "INCOMPATIBLE_OPTIONS_W": "Sljedeće opcije konfiguracije su nekompatibilne:",
     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "Veličina podataka",
     "INCOMPATIBLE_OPTIONS_W": "Sljedeće opcije konfiguracije su nekompatibilne:",

diff --git a/lib/locales/hu.json b/lib/locales/hu.json
index 6e649fdb69ff6011c181678e0ff186abba139885..d45f07862846bcbb447ee17308668038eb34003e 100644 (file)
--- a/lib/locales/hu.json
+++ b/lib/locales/hu.json
@@ -1,4 +1,5 @@
 {
 {

+    "2_W": "",

     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",
     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",

diff --git a/lib/locales/id.json b/lib/locales/id.json
index aaf4850798244f1146098b378f7fc68a5a547c9c..772777aed7f25405900e7b14fecec51585b5f72f 100644 (file)
--- a/lib/locales/id.json
+++ b/lib/locales/id.json
@@ -1,4 +1,5 @@
 {
 {

+    "2_W": "",

     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",
     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",

diff --git a/lib/locales/it.json b/lib/locales/it.json
index 01e5723e25c601afa9a4d7eff050b068c95df33a..81e662b70e129278ca2bf0d32ec92a63d88e7624 100644 (file)
--- a/lib/locales/it.json
+++ b/lib/locales/it.json
@@ -1,4 +1,5 @@
 {
 {

+    "2_W": "Due settimane",

     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "Dimensione dei dati",
     "INCOMPATIBLE_OPTIONS_W": "Le seguenti opzioni di configurazione sono incompatibili:",
     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "Dimensione dei dati",
     "INCOMPATIBLE_OPTIONS_W": "Le seguenti opzioni di configurazione sono incompatibili:",

diff --git a/lib/locales/ja.json b/lib/locales/ja.json
index c44738a74243548a0529c2ce4634c414d80b0c0b..3f0cd79fa227322a539dfd6253afe8db842292a0 100644 (file)
--- a/lib/locales/ja.json
+++ b/lib/locales/ja.json
@@ -1,4 +1,5 @@
 {
 {

+    "2_W": "",

     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",
     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",

diff --git a/lib/locales/ko.json b/lib/locales/ko.json
index 5c8e5ff8acee8e6ea2ed785a0c1aefb0fea17fbd..0831b2088f4d0f0e60e4717201c3605375d7f783 100644 (file)
--- a/lib/locales/ko.json
+++ b/lib/locales/ko.json
@@ -1,4 +1,5 @@
 {
 {

+    "2_W": "",

     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",
     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",

diff --git a/lib/locales/ku.json b/lib/locales/ku.json
index 41966932f934394e1398817f157489fda88f6966..b62d93f5c994a2167a9ef87b4c6e535fa390c071 100644 (file)
--- a/lib/locales/ku.json
+++ b/lib/locales/ku.json
@@ -1,4 +1,5 @@
 {
 {

+    "2_W": "",

     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",
     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",

diff --git a/lib/locales/la.json b/lib/locales/la.json
index ca1d56abf7a98b5d8d66db7565369485c3b11093..95e226b7e3935f84bb64f628217cfba4368b66b2 100644 (file)
--- a/lib/locales/la.json
+++ b/lib/locales/la.json
@@ -1,4 +1,5 @@
 {
 {

+    "2_W": "",

     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",
     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",

diff --git a/lib/locales/mfe.json b/lib/locales/mfe.json
index 41966932f934394e1398817f157489fda88f6966..b62d93f5c994a2167a9ef87b4c6e535fa390c071 100644 (file)
--- a/lib/locales/mfe.json
+++ b/lib/locales/mfe.json
@@ -1,4 +1,5 @@
 {
 {

+    "2_W": "",

     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",
     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",

diff --git a/lib/locales/ms.json b/lib/locales/ms.json
index aaf4850798244f1146098b378f7fc68a5a547c9c..772777aed7f25405900e7b14fecec51585b5f72f 100644 (file)
--- a/lib/locales/ms.json
+++ b/lib/locales/ms.json
@@ -1,4 +1,5 @@
 {
 {

+    "2_W": "",

     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",
     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",

diff --git a/lib/locales/nb_NO.json b/lib/locales/nb_NO.json
index 41fb695d534c7fd6423fbc8ea6246f60f805a955..d05dd010c077a14f34eb4aa2215b9742d944cfde 100644 (file)
--- a/lib/locales/nb_NO.json
+++ b/lib/locales/nb_NO.json
@@ -1,4 +1,5 @@
 {
 {

+    "2_W": "To uker",

     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "Datastørrelse",
     "INCOMPATIBLE_OPTIONS_W": "Følgende oppsettsvalg er ikke kompatible:",
     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "Datastørrelse",
     "INCOMPATIBLE_OPTIONS_W": "Følgende oppsettsvalg er ikke kompatible:",

diff --git a/lib/locales/nl.json b/lib/locales/nl.json
index 8e5a4a05423b43692897014e9fee931416c77083..21aaf269b00dda8ca9ef5dd14e123104dd060c46 100644 (file)
--- a/lib/locales/nl.json
+++ b/lib/locales/nl.json
@@ -1,4 +1,5 @@
 {
 {

+    "2_W": "Twee weken",

     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",
     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",

diff --git a/lib/locales/pl.json b/lib/locales/pl.json
index cc24edaebb7fa1aa475e15b57a6f07c6a6c44d53..d5a27426594f83c6f37fda4ffc9f62572090fb35 100644 (file)
--- a/lib/locales/pl.json
+++ b/lib/locales/pl.json
@@ -1,4 +1,5 @@
 {
 {

+    "2_W": "",

     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "Rozmiar danych",
     "INCOMPATIBLE_OPTIONS_W": "Następujące opcje konfiguracji są niezgodne:",
     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "Rozmiar danych",
     "INCOMPATIBLE_OPTIONS_W": "Następujące opcje konfiguracji są niezgodne:",

diff --git a/lib/locales/ps.json b/lib/locales/ps.json
index 41966932f934394e1398817f157489fda88f6966..b62d93f5c994a2167a9ef87b4c6e535fa390c071 100644 (file)
--- a/lib/locales/ps.json
+++ b/lib/locales/ps.json
@@ -1,4 +1,5 @@
 {
 {

+    "2_W": "",

     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",
     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",

diff --git a/lib/locales/pt.json b/lib/locales/pt.json
index 6ecd828d7c92fc6802a69f9a79fa9f7e4f4239d5..bcb7a493681ac33203c84cd6afd9b7d953a84f04 100644 (file)
--- a/lib/locales/pt.json
+++ b/lib/locales/pt.json
@@ -1,4 +1,5 @@
 {
 {

+    "2_W": "Uma quinzena",

     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "Tamanho dos dados",
     "NO_BROWSER_SUPPORT": "O seu navegador pode não suportar HTML5, então o tamanho máximo do ficheiro é ",
     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "Tamanho dos dados",
     "NO_BROWSER_SUPPORT": "O seu navegador pode não suportar HTML5, então o tamanho máximo do ficheiro é ",

diff --git a/lib/locales/pt_BR.json b/lib/locales/pt_BR.json
index 032a7dc5367e6f12fe3c15b29f92548668948c69..fabff5a6213faa683abf6a9c2165bac60188d5dd 100644 (file)
--- a/lib/locales/pt_BR.json
+++ b/lib/locales/pt_BR.json
@@ -1,4 +1,5 @@
 {
 {

+    "2_W": "Uma quinzena",

     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",
     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",

diff --git a/lib/locales/ro.json b/lib/locales/ro.json
index 2c63ef7c82552c96b5acef039e957c9f7599277b..3edb71c29a75eae81d50175551d7df076f032628 100644 (file)
--- a/lib/locales/ro.json
+++ b/lib/locales/ro.json
@@ -1,4 +1,5 @@
 {
 {

+    "2_W": "",

     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "Mărime date",
     "INCOMPATIBLE_OPTIONS_W": "Următoarele opţiuni de configurare sunt incompatibile:",
     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "Mărime date",
     "INCOMPATIBLE_OPTIONS_W": "Următoarele opţiuni de configurare sunt incompatibile:",

diff --git a/lib/locales/ru.json b/lib/locales/ru.json
index ebc13f3fa20a7311cb6542ee09243d93661e8ca6..8087478cf7ac275d08f6cc776672d336624fb156 100644 (file)
--- a/lib/locales/ru.json
+++ b/lib/locales/ru.json
@@ -1,4 +1,5 @@
 {
 {

+    "2_W": "",

     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",
     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",

diff --git a/lib/locales/sh.json b/lib/locales/sh.json
index 41966932f934394e1398817f157489fda88f6966..b62d93f5c994a2167a9ef87b4c6e535fa390c071 100644 (file)
--- a/lib/locales/sh.json
+++ b/lib/locales/sh.json
@@ -1,4 +1,5 @@
 {
 {

+    "2_W": "",

     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",
     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",

diff --git a/lib/locales/sk.json b/lib/locales/sk.json
index e942ba6c51294caa979529ac986c17e89f067f0c..c38d159ec40fcf12cc2779811de8185f74139da0 100644 (file)
--- a/lib/locales/sk.json
+++ b/lib/locales/sk.json
@@ -1,4 +1,5 @@
 {
 {

+    "2_W": "",

     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",
     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",

diff --git a/lib/locales/sl.json b/lib/locales/sl.json
index 41966932f934394e1398817f157489fda88f6966..b62d93f5c994a2167a9ef87b4c6e535fa390c071 100644 (file)
--- a/lib/locales/sl.json
+++ b/lib/locales/sl.json
@@ -1,4 +1,5 @@
 {
 {

+    "2_W": "",

     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",
     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",

diff --git a/lib/locales/sq.json b/lib/locales/sq.json
index 41966932f934394e1398817f157489fda88f6966..b62d93f5c994a2167a9ef87b4c6e535fa390c071 100644 (file)
--- a/lib/locales/sq.json
+++ b/lib/locales/sq.json
@@ -1,4 +1,5 @@
 {
 {

+    "2_W": "",

     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",
     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",

diff --git a/lib/locales/sr.json b/lib/locales/sr.json
index 09781a9f22f5af8af54c60c1e645824b12f75e77..b22674a891eae4ab6982a922c4d6049bacc80e0b 100644 (file)
--- a/lib/locales/sr.json
+++ b/lib/locales/sr.json
@@ -1,4 +1,5 @@
 {
 {

+    "2_W": "",

     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",
     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",

diff --git a/lib/locales/sv.json b/lib/locales/sv.json
index 7dbea8c783fceb2df961fa3823ec705ab81659a3..6d842da82e2c178f265e9d7133215a9d6376d5f8 100644 (file)
--- a/lib/locales/sv.json
+++ b/lib/locales/sv.json
@@ -1,4 +1,5 @@
 {
 {

+    "2_W": "Två veckor",

     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "Data storlek",
     "INCOMPATIBLE_OPTIONS_W": "Följande inställningar är inkompatibla:",
     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "Data storlek",
     "INCOMPATIBLE_OPTIONS_W": "Följande inställningar är inkompatibla:",

diff --git a/lib/locales/ta.json b/lib/locales/ta.json
index 2d8fdfba9eb812e05af4ce4c42e5ed24a83e2ba4..74f3a493772b4d413f5401d558b1bb328b6fb456 100644 (file)
--- a/lib/locales/ta.json
+++ b/lib/locales/ta.json
@@ -1,4 +1,5 @@
 {
 {

+    "2_W": "",

     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",
     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",

diff --git a/lib/locales/template.json b/lib/locales/template.json
index 283ba93c68bd1bddbef080df535b488212886e32..4ceb49837ef187608db2d3cceba41a1bdf5b620a 100644 (file)
--- a/lib/locales/template.json
+++ b/lib/locales/template.json
@@ -1,4 +1,5 @@
 {
 {

+    "2_W": "",

     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",
     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",

diff --git a/lib/locales/th.json b/lib/locales/th.json
index 41966932f934394e1398817f157489fda88f6966..b62d93f5c994a2167a9ef87b4c6e535fa390c071 100644 (file)
--- a/lib/locales/th.json
+++ b/lib/locales/th.json
@@ -1,4 +1,5 @@
 {
 {

+    "2_W": "",

     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",
     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",

diff --git a/lib/locales/tr.json b/lib/locales/tr.json
index 77168b27819c7858433130d700b57f5b135c753b..ef253a2a0f3d80983543dceab4f86359a6113929 100644 (file)
--- a/lib/locales/tr.json
+++ b/lib/locales/tr.json
@@ -1,4 +1,5 @@
 {
 {

+    "2_W": "İki hafta",

     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "Veri boyutu",
     "INCOMPATIBLE_OPTIONS_W": "Aşağıdaki yapılandırma seçenekleri uyumsuz:",
     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "Veri boyutu",
     "INCOMPATIBLE_OPTIONS_W": "Aşağıdaki yapılandırma seçenekleri uyumsuz:",


@@ -20,7 +21,7 @@
     "1_D": "Bir gün",
     "1_W": "Bir hafta",
     "1_M": "Bir ay",
     "1_D": "Bir gün",
     "1_W": "Bir hafta",
     "1_M": "Bir ay",

-    "1_Q": "15 dakika",
+    "1_Q": "Üç ay",

     "1_Y": "Bir yıl",
     "NONE": "Hiçbiri",
     "UP_PSW": "Yükleme şifresi",
     "1_Y": "Bir yıl",
     "NONE": "Hiçbiri",
     "UP_PSW": "Yükleme şifresi",

diff --git a/lib/locales/uk.json b/lib/locales/uk.json
index 8dad8a198c828098497c04d14aa3031024b5c89d..c90655ee7eb2632d5c6bde79c1b8701997c95fd4 100644 (file)
--- a/lib/locales/uk.json
+++ b/lib/locales/uk.json
@@ -1,4 +1,5 @@
 {
 {

+    "2_W": "",

     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "Розмір даних",
     "NO_BROWSER_SUPPORT": "Ваш веб-переглядач може не підтримує HTML5, тому найбільший розмір файлу - це ",
     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "Розмір даних",
     "NO_BROWSER_SUPPORT": "Ваш веб-переглядач може не підтримує HTML5, тому найбільший розмір файлу - це ",

diff --git a/lib/locales/vi.json b/lib/locales/vi.json
index c44738a74243548a0529c2ce4634c414d80b0c0b..3f0cd79fa227322a539dfd6253afe8db842292a0 100644 (file)
--- a/lib/locales/vi.json
+++ b/lib/locales/vi.json
@@ -1,4 +1,5 @@
 {
 {

+    "2_W": "",

     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",
     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",

diff --git a/lib/locales/zh.json b/lib/locales/zh.json
index 5b7373a082bc42a040d3cd60eae5401fe01631e4..abb9ee6fa01c1a2c7f4387a9485ed8f582b55349 100644 (file)
--- a/lib/locales/zh.json
+++ b/lib/locales/zh.json
@@ -1,4 +1,5 @@
 {
 {

+    "2_W": "",

     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",
     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",

diff --git a/lib/locales/zh_TW.json b/lib/locales/zh_TW.json
index a73ab7c7b925d16c2f0354a5f1b4aaa1c0782f98..20b3ab40dd3adcd2b9a600b0cb228788c6cb61c8 100644 (file)
--- a/lib/locales/zh_TW.json
+++ b/lib/locales/zh_TW.json
@@ -1,4 +1,5 @@
 {
 {

+    "2_W": "",

     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",
     "REPORTING_AN_ISSUE": "",
     "SIZE_DATA": "",
     "INCOMPATIBLE_OPTIONS_W": "",

diff --git a/lib/settings.php b/lib/settings.php
index ecdcf5dce67d5100154ea958e09882a1c556789a..6efc8b73df1b18ea3b99691cb37eff16b237fb8a 100644 (file)
--- a/lib/settings.php
+++ b/lib/settings.php
@@ -70,6 +70,7 @@ define('JIRAFEAU_MINUTE', 60); // 60
 define('JIRAFEAU_HOUR', 3600); // JIRAFEAU_MINUTE * 60
 define('JIRAFEAU_DAY', 86400); // JIRAFEAU_HOUR * 24
 define('JIRAFEAU_WEEK', 604800); // JIRAFEAU_DAY * 7
 define('JIRAFEAU_HOUR', 3600); // JIRAFEAU_MINUTE * 60
 define('JIRAFEAU_DAY', 86400); // JIRAFEAU_HOUR * 24
 define('JIRAFEAU_WEEK', 604800); // JIRAFEAU_DAY * 7

+define('JIRAFEAU_FORTNIGHT', 1209600); // JIRAFEAU_WEEK * 2

 define('JIRAFEAU_MONTH', 2592000); // JIRAFEAU_DAY * 30
 define('JIRAFEAU_QUARTER', 7776000); // JIRAFEAU_DAY * 90
 define('JIRAFEAU_YEAR', 31536000); // JIRAFEAU_DAY * 365
 define('JIRAFEAU_MONTH', 2592000); // JIRAFEAU_DAY * 30
 define('JIRAFEAU_QUARTER', 7776000); // JIRAFEAU_DAY * 90
 define('JIRAFEAU_YEAR', 31536000); // JIRAFEAU_DAY * 365

diff --git a/script.php b/script.php
index d31ce78ec7d708010b6fb952cc81b48e452f7bf4..4926a1cb64a1ce60e8f6d106b7ef86d531e1a699 100644 (file)
--- a/script.php
+++ b/script.php
@@ -99,6 +99,9 @@ if (isset($_FILES['file']) && is_writable(VAR_FILES)
             case 'week':
                 $time += JIRAFEAU_WEEK;
                 break;
             case 'week':
                 $time += JIRAFEAU_WEEK;
                 break;

+            case 'fortnight':
+                $time += JIRAFEAU_FORTNIGHT;
+                break;

             case 'month':
                 $time += JIRAFEAU_MONTH;
                 break;
             case 'month':
                 $time += JIRAFEAU_MONTH;
                 break;


@@ -292,7 +295,7 @@ if [ -z "$2" ]; then
     echo "Global variables to export:"
     echo "    JIRAFEAU_PROXY: Domain and port of proxy server, eg. »proxysever.example.com:3128«"
     echo "    JIRAFEAU_URL : URI to Jirafeau installation with trailing slash, eg. »https://example.com/jirafeau/«"
     echo "Global variables to export:"
     echo "    JIRAFEAU_PROXY: Domain and port of proxy server, eg. »proxysever.example.com:3128«"
     echo "    JIRAFEAU_URL : URI to Jirafeau installation with trailing slash, eg. »https://example.com/jirafeau/«"

-    echo "    JIRAFEAU_TIME : expiration time, eg. »minute«, »hour«, »day«, »week«, »month«, »quarter«, »year« or »none«"
+    echo "    JIRAFEAU_TIME : expiration time, eg. »minute«, »hour«, »day«, »week«, fortnight, »month«, »quarter«, »year« or »none«"

     echo "    JIRAFEAU_ONE_TIME : self-destroy after first download, eg. »1« to enable or »« (empty) to disable"
     echo "    JIRAFEAU_CURL : alternative path to curl binary"
     echo "    JIRAFEAU_UPLOAD_PASSWD : upload password"
     echo "    JIRAFEAU_ONE_TIME : self-destroy after first download, eg. »1« to enable or »« (empty) to disable"
     echo "    JIRAFEAU_CURL : alternative path to curl binary"
     echo "    JIRAFEAU_UPLOAD_PASSWD : upload password"


@@ -453,6 +456,9 @@ elseif (isset($_GET['init_async'])) {
             case 'week':
                 $time += JIRAFEAU_WEEK;
                 break;
             case 'week':
                 $time += JIRAFEAU_WEEK;
                 break;

+            case 'fortnight':
+                $time += JIRAFEAU_FORTNIGHT;
+                break;

             case 'month':
                 $time += JIRAFEAU_MONTH;
                 break;
             case 'month':
                 $time += JIRAFEAU_MONTH;
                 break;