From 2778c10c2e44c7b851f4873e1cc8a73041bd3903 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois?= <francois@kaz.bzh>
Date: Sun, 20 Feb 2022 19:00:13 +0100
Subject: [PATCH] fix update archive

---
 src/Jirafeau/a.php | 13 +++++--------
 src/bash/filter.sh |  4 ++--
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/Jirafeau/a.php b/src/Jirafeau/a.php
index b9e80e2..d6916d8 100644
--- a/src/Jirafeau/a.php
+++ b/src/Jirafeau/a.php
@@ -64,6 +64,7 @@ define ('M_LOGOUT', 'Deconnecter');
 define ('M_REFRESH', 'Actualiser');
 define ('M_LOGOUT_TOKEN', "Vous n'&ecirc;tes plus connect&eacute;.");
 define ('M_SEND_TOKEN', "<br/><p>Vous allez recevoir un <b>lien d'acc&egrave;s temporaire</b> &agrave; vos donn&eacute;es.</p>");
+define ('M_WELCOME', "<p>Informations concernant le compte : <b>___SENDER___</b><br/>(page actualis&eacute;e &agrave; ___DATE___)</p>");
 define ('M_INCONSISTENT_DATES',
         " (dates incoh&eacute;antes avec ___FILENAME___ : ___DIRTIME___ != ___FILETIME___)");
 
@@ -885,9 +886,7 @@ if (isset ($_REQUEST [A_DELETE])) {
 if ($doLogout || (isset ($_REQUEST [A_ACTION]) && $_REQUEST [A_ACTION] == T_LOGOUT)) {
     rmToken ($sender);
     require (JIRAFEAU_ROOT . 'lib/template/header.php');
-    echo
-        "<p>Informations concernant le compte : <b>".$sender."</b>".
-        " (page actualis&eacute;e &agrave; ".date ("H:i:s")." le ".date ("d/m/Y").").</p>";
+    echo str_replace (["___SENDER___", "___DATE___"], [$sender, jirafeau_get_datetimefield (time ())], M_WELCOME);
     if ($message)
         echo "<p>Info : ".$message."</p>";
     echo M_LOGOUT;
@@ -944,9 +943,7 @@ while ( ($d = array_shift ($stack)) && $d != null) {
     }
 }
 require (JIRAFEAU_ROOT . 'lib/template/header.php');
-echo
-    "<p>Informations concernant le compte : <b>".$sender."</b>".
-    " (page actualis&eacute;e &agrave; ".date ("H:i:s")." le ".date ("d/m/Y").").</p>";
+echo str_replace (["___SENDER___", "___DATE___"], [$sender, jirafeau_get_datetimefield (time ())], M_WELCOME);
 if ($message)
     echo "<p>Info : ".$message."</p>";
 echo '<script type="text/javascript">';
@@ -1074,7 +1071,7 @@ if ($archives) {
                    '<a data-tooltip="voir le lien" href="javascript:showLink (\''.$la.'\', \''.$ka.'\');"> &#128279; </a>';
         foreach ($periodButton as $item => $bt)
             $archEntry .=
-                       '<a data-tooltip="'.$bt[1].'" href="javascript:ajaxUpdate (\''.$la.'\', \''.$ka.'\');"> '.$bt[0].' </a>';
+                       '<a data-tooltip="'.$bt[1].'" href="javascript:ajaxUpdate (\''.$item.'\', \''.$la.'\');"> '.$bt[0].' </a>';
         $archEntry .=
                    '<strong>'.$archiveInfo [T_TIME].' ('.jirafeau_human_size ($contentSize).')</strong>'.
                    '<a data-tooltip="supprimer tous" href="javascript:rmFile (\''.$la.'\');"> &#9850; </a>'.
@@ -1088,7 +1085,7 @@ if ($archives) {
 }
 
 echo
-    '<p>Votre compte occupe '.jirafeau_human_size ($userSise).'.</p>'.
+    '<p>Votre compte occupe <b>'.jirafeau_human_size ($userSise).'</b>.</p>'.
     '<form method="post">'.
     'Je veux me '.
     '<input type="hidden" name="'.A_ACTION.'" value="'.T_LOGOUT.'" />'.
diff --git a/src/bash/filter.sh b/src/bash/filter.sh
index 5957929..ba7045b 100644
--- a/src/bash/filter.sh
+++ b/src/bash/filter.sh
@@ -166,8 +166,8 @@ LOG_FIC "${SHRINK_CMD} -s ${MAX_KEEP_IN_MAIL} -d ${REP_PIECE_JOINTE} ${INSPECT_D
     if [ \( -n "${TRACK}" -a "${NB_ATTACH}" -gt 0 \) -o "${NB_ATTACH}" -gt 1 ]; then
 	PASSWORD=$(apg -n 1 -m 12)
 	PASSWORD_MD5=$(echo -n ${PASSWORD} | ${MD5_CMD} | cut -d \  -f 1)
-	LOG_FIC " - \"${JIRAFEAU_CMD}\" -f \"${JIRAFEAU_LOCAL}\" -s \"${MAX_UPLOAD_SIZE}\" -c \"${ARCHIVE_MIME}\" -n \"${ARCHIVE_TITLE}\" send \"${ARCHIVE_CONTENT}\" \"${PASSWORD}\" 2>> \"${FIC_LOG}\" > \"${ONE_LINK}\""
-	"${JIRAFEAU_CMD}" -f "${JIRAFEAU_LOCAL}" -s "${MAX_UPLOAD_SIZE}" -c "${ARCHIVE_MIME}" -n "${ARCHIVE_TITLE}" send "${ARCHIVE_CONTENT}" "${PASSWORD}" 2>> "${FIC_LOG}" > "${ONE_LINK}"
+	LOG_FIC " - \"${JIRAFEAU_CMD}\" -f \"${JIRAFEAU_LOCAL}\" -t \"${JIRAFEAU_TIME}\" -s \"${MAX_UPLOAD_SIZE}\" -c \"${ARCHIVE_MIME}\" -n \"${ARCHIVE_TITLE}\" send \"${ARCHIVE_CONTENT}\" \"${PASSWORD}\" 2>> \"${FIC_LOG}\" > \"${ONE_LINK}\""
+	"${JIRAFEAU_CMD}" -f "${JIRAFEAU_LOCAL}" -t \"${JIRAFEAU_TIME}\" -s "${MAX_UPLOAD_SIZE}" -c "${ARCHIVE_MIME}" -n "${ARCHIVE_TITLE}" send "${ARCHIVE_CONTENT}" "${PASSWORD}" 2>> "${FIC_LOG}" > "${ONE_LINK}"
     fi
     if  [ "${NB_ATTACH}" -gt 1 ]; then
 	cat "${ONE_LINK}"  | {