From: Patrick Canterino <patrick@patrick-canterino.de>
Date: Sun, 18 Aug 2024 14:01:58 +0000 (+0000)
Subject: Merge branch 'rebase_integrate_docker_build_and_publish' into 'next-release'
X-Git-Url: https://git.p6c8.net/jirafeau.git/commitdiff_plain/d35f5d4eb87c1a74fd198be589fcdf51e9631ba9?hp=-c

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
---

d35f5d4eb87c1a74fd198be589fcdf51e9631ba9
diff --combined index.php
index 662f157,37dd677..b7e2606
--- a/index.php
+++ b/index.php
@@@ -25,7 -25,7 +25,7 @@@ require(JIRAFEAU_ROOT . 'lib/settings.p
  require(JIRAFEAU_ROOT . 'lib/functions.php');
  require(JIRAFEAU_ROOT . 'lib/lang.php');
  
- if ($cfg['download_password_requirement'] === "generated"){
+ if ($cfg['download_password_requirement'] === "generated") {
      $download_pass = jirafeau_gen_download_pass($cfg['download_password_gen_len'], $cfg['download_password_gen_chars']);
  }
  
@@@ -114,8 -114,8 +114,8 @@@ elseif (true === jirafeau_challenge_upl
      </p>
      </div>
  
-     <?php if ($cfg['download_password_requirement'] === "generated"){
-     ?>
+     <?php if ($cfg['download_password_requirement'] === "generated") {
+         ?>
      <div id="show_password">
      <p><?php echo t('PSW') ?></p>
  
@@@ -204,23 -204,17 +204,23 @@@
          <?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'){
+         if ($cfg['download_password_requirement'] === 'generated') {
              echo '<input type="hidden" name="key" id="input_key" value="' . $download_pass .'"/>';
-         }else{
+         } else {
              echo '<tr><td><label for="input_key">' . t('PSW') . ':' . '</label></td>';
              echo '<td><input type="password" name="key" id="input_key" autocomplete = "new-password"';
-             if ($cfg['download_password_policy'] === 'regex'){
+             if ($cfg['download_password_policy'] === 'regex') {
                  echo ' pattern="' . substr($cfg['download_password_policy_regex'], 1, strlen($cfg['download_password_policy_regex']) - 2) . '"'; //remove php delimiters
              }
-             if ($cfg['download_password_requirement'] === 'required'){
+             if ($cfg['download_password_requirement'] === 'required') {
                  echo ' required';
              }
              echo '/></td></tr>';