KAZ/depollueur
3
1
Fork 0
Code Issues Pull Requests Projects Releases Activity

fix no content-type in source mbox

Browse Source
This commit is contained in:
François 2022-12-27 14:48:12 +01:00
parent 18d1214681
commit c9ab7d4f49
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/bash/filter.sh Executable file → Normal file
View File

@ -119,8 +119,11 @@ curlJirafeauSend () {
# $3: content-type # $3: content-type
# $4: name # $4: name
# $5: password # $5: password
LOG_FIC " - curl -X POST -F \"time=$1\" -F \"key=$5\" -F \"file=@$2;type=$3;filename=$4\" \"${JIRAFEAU_LOCAL}/a.php\""
curl -X POST -F "time=$1" -F "key=$5" -F "file=@$2;type=$3;filename=$4" "${JIRAFEAU_LOCAL}/a.php" type=$3
[ -z "${type}" ] && type="text/plain"
LOG_FIC " - curl -X POST -F \"time=$1\" -F \"key=$5\" -F \"file=@$2;type=${type};filename=$4\" \"${JIRAFEAU_LOCAL}/a.php\""
curl -X POST -F "time=$1" -F "key=$5" -F "file=@$2;type=${type};filename=$4" "${JIRAFEAU_LOCAL}/a.php"
} }
#################### MAIN ################################################# #################### MAIN #################################################

6
src/bash/filterTest.sh Executable file → Normal file
View File

@ -110,8 +110,10 @@ curlJirafeauSend () {
# $4: name # $4: name
# $5: password # $5: password
curl -X POST -F "time=$1" -F "key=$5" -F "file=@$2;type=$3;filename=$4" "${JIRAFEAU_LOCAL}/a.php" type=$3
#"${jirafeauAPI}" -f "${JIRAFEAU_LOCAL}" -t "$1" -s "1Gi" -c "$3" -n "$4" send "$2" "$5" [ -z "${type}" ] && type="text/plain"
curl -X POST -F "time=$1" -F "key=$5" -F "file=@$2;type=${type};filename=$4" "${JIRAFEAU_LOCAL}/a.php"
#"${jirafeauAPI}" -f "${JIRAFEAU_LOCAL}" -t "$1" -s "1Gi" -c "${type}" -n "$4" send "$2" "$5"
} }
######################################## ########################################

2
src/cpp/MainAttachment.cpp
View File

@ -491,6 +491,8 @@ void MainAttachment::rewriteHeaders (ifstream &mbox, ofstream &outbox, const Hea
boundary = "--"+boundary+"--"; boundary = "--"+boundary+"--";
boundaryMiddleSize = boundary.length () - 2; boundaryMiddleSize = boundary.length () - 2;
} }
if (startPos >= mime.length ())
startPos = mime.length ()-1;
mime.insert (startPos, contentType); mime.insert (startPos, contentType);
outbox << mime << flush; outbox << mime << flush;
} }

2
src/cpp/eMailShrinker.cpp
View File

@ -33,7 +33,7 @@
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
#include "version.hpp" #include "version.hpp"
const std::string kaz::LAST_VERSION_NUM ("2.11"); const std::string kaz::LAST_VERSION_NUM ("2.12");
const std::string kaz::LAST_VERSION_DATE ("2022-12-27"); const std::string kaz::LAST_VERSION_DATE ("2022-12-27");
const std::string kaz::LAST_VERSION (LAST_VERSION_NUM+" "+LAST_VERSION_DATE+" eMailShrinker"); const std::string kaz::LAST_VERSION (LAST_VERSION_NUM+" "+LAST_VERSION_DATE+" eMailShrinker");