Merge branch 'rebase_integrate_docker_build_and_publish' into 'next-release'

#2: Build and publish Docker images using GitLab CI.

See merge request jirafeau/Jirafeau!1

diff --git a/index.php b/index.php
index 37dd6778dc84ce3249f14b792d68bcbe9e26005b..b7e2606930e5207e914d6cae4cbb4979cc58478a 100644 (file)
--- a/index.php
+++ b/index.php
@@ -204,7 +204,13 @@ elseif (true === jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg))) {
         <?php
         if ($cfg['one_time_download']) {
             echo '<tr><td>' . t('ONE_TIME_DL') . ':</td>';
-            echo '<td><input type="checkbox" id="one_time_download" /></td></tr>';
+            echo '<td><input type="checkbox" id="one_time_download"';
+            
+            if ($cfg['one_time_download_preselected']) {
+                echo ' checked';
+            }
+
+            echo ' /></td></tr>';
         }
         if ($cfg['download_password_requirement'] === 'generated') {
             echo '<input type="hidden" name="key" id="input_key" value="' . $download_pass .'"/>';

diff --git a/lib/config.original.php b/lib/config.original.php
index bfa76af9c6f4332164799d7b263619a1019e5a5f..d261f682b1083b9b0ca0f30fbcd36fbfc8029ce4 100644 (file)
--- a/lib/config.original.php
+++ b/lib/config.original.php
@@ -152,6 +152,11 @@ $cfg['availability_default'] = 'month';
  */
 $cfg['one_time_download'] = true;
 
+/* When set to "true", the checkbox for deleting the file after the first download
+ * is preselected.
+ */
+$cfg['one_time_download_preselected'] = false;
+
 /* Set maximal upload size expressed in MB.
  * »0« means unlimited upload size.
  */

diff --git a/lib/settings.php b/lib/settings.php
index 2cf7d0f4332e4e9bcc3740a4a95222df1ab04f57..494dfd28f896314022e3a6cfb826835ae8840ea7 100644 (file)
--- a/lib/settings.php
+++ b/lib/settings.php
@@ -41,7 +41,7 @@ if ($cfg['debug'] === true) {
 
 /* Jirafeau package */
 define('JIRAFEAU_PACKAGE', 'Jirafeau');
-define('JIRAFEAU_VERSION', '4.6.0');
+define('JIRAFEAU_VERSION', '4.6.x-dev');
 
 define('JIRAFEAU_WEBSITE', 'https://gitlab.com/jirafeau/Jirafeau');