log failed

Makefile

@@ -58,12 +58,12 @@ JIR_OUT = $(patsubst %, $(OUT_DIR)/%, $(JIR_PRG))
 
 ## FLAGS ###############################
 
-DFLAGS = -O2 -DDISABLE_LOG
+#DFLAGS = -O2 -DDISABLE_LOG
-#DFLAGS = -g -Wall
+DFLAGS = -g -Wall
 
 IFLAGS = $(DFLAGS) -MMD -I$(HPP_DIR) -std=c++11
 
-LFLAGS = -L$(LIB_DIR) -Bstatic -lstdc++ -lcurl -lcrypto -lboost_system -lboost_program_options -lboost_filesystem
+LFLAGS = -L$(LIB_DIR) -lboost_system -lboost_program_options -lboost_filesystem -lcurl -lcrypto -lstdc++
 CC = g++
 
 ## RULES ###############################

src/Jirafeau/f.php

@@ -95,14 +95,15 @@ if (!empty($delete_code) && $delete_code == $link['link_code']) {
             <legend> <?php echo t('CONFIRM_DEL') ?> </legend>
             <table>
             <tr><td>
-             <?php echo t('GONNA_DEL') . ' "' . jirafeau_escape($link['file_name']) . '" (' . jirafeau_human_size($link['file_size']) . ').' ?>
+<?php echo t('GONNA_DEL') . ' "' . jirafeau_escape($link['file_name']) . '" (' . jirafeau_human_size($link['file_size']) . ').' ?>
             </td></tr>
                   <tr><td>
-                <?php echo t('USING_SERVICE'). ' <a href="tos.php" target="_blank" rel="noopener noreferrer">' . t('TOS') . '</a>.' ?>
+<?php echo t('USING_SERVICE'). ' <a href="tos.php" target="_blank" rel="noopener noreferrer">' . t('TOS') . '</a>.' ?>
                   </td></tr>
                         <tr><td>
-                <input type="submit" id="submit_delete"  value="<?php echo t('DELETE'); ?>" <?php $action_delete="'f.php?h=' . $link_name . '&amp;d=' . $delete_code'; document.getElementById('submit_delete').submit ();"; ?>
+                        <input type="submit" id="submit_delete"  value="<?php echo t('DELETE'); ?>"
-                onclick="document.getElementById('submit_delete_post').action='<?php echo $action_delete; ?>"/>
+                        <?php $action_delete="'f.php?h=' . $link_name . '&amp;d=' . $delete_code'; document.getElementById('submit_delete').submit ();"; ?>
+                        onclick="document.getElementById('submit_delete_post').action='<?php echo $action_delete; ?>" />
                                </td></tr>
                                </table>
                                </fieldset></form></div><?php
@@ -288,3 +289,4 @@ if ($link['onetime'] == 'O') {
 exit;
 
 ?>
+

src/bash/filter.sh

@@ -48,11 +48,12 @@ EX_TEMPFAIL=75
 EX_UNAVAILABLE=69
 EX_TOO_LARGE=552
 INSPECT_DIR=/var/spool/filter
-FIC_LOG=/var/log/mail/filter.log
+DIR_LOG=/var/log/mail
+FIC_LOG=${DIR_LOG}/filter.log
 SENDMAIL="/usr/sbin/sendmail -G -i"
 MAILS=/tmp/FILTER
-MAX_KEEP_IN_MAIL=24ki
+MAX_KEEP_IN_MAIL=5ki
-MAX_UPLOAD_SIZE=100Mi
+MAX_UPLOAD_SIZE=1Gi
 SHRINK_CMD=/home/filter/eMailShrinker
 JIRAFEAU_CMD=/home/filter/jirafeauAPI
 JIRAFEAU_URL=https://depot.${DOMAINNAME:-"kaz.bzh"}
@@ -60,23 +61,68 @@ JIRAFEAU_LOCAL=http://depot
 JIRAFEAU_TIME=month
 MD5_CMD=/usr/bin/md5sum
 DISCLAMER_CMD=altermime
-MAX_FINAL_SIZE=204800 # 200ki
+MAX_FINAL_SIZE=307200 # 300ki
+ARCHIVE_TITLE="archive_content"
+ARCHIVE_MIME="text/kaz_email_archive"
+
+KEEP_FAILED=true
 
 ####################  FONCTIONS ############################################
+BOLD=''
+RED=''
+GREEN=''
+YELLOW=''
+BLUE=''
+MAGENTA=''
+CYAN=''
+NC='' # No Color
+NL='
+'
+
 #--------------------- Fichier de LOG -------------------
-LOG_FIC() {
+LOG_FIC () {
-    echo "$(date +%d-%m-%Y-%H-%M-%S) : $*" >> "${FIC_LOG}"
+    echo "${BLUE}$(date +%d-%m-%Y-%H-%M-%S)${NC} : $*" >> "${FIC_LOG}"
+}
+
+quitFilter () {
+    LOG_FIC "${GREEN}######################################## filter stop${NC}"
+    exit $1
+}
+
+keepFailed () {
+    [ -z "${KEEP_FAILED}"  ] && return
+    mkdir -p "${DIR_LOG}/pb/"
+    cp "$1" "${DIR_LOG}/pb/"
 }
 
 ####################  MAIN #################################################
-LOG_FIC "------------------------------------------------------"
+echo "${NL}" >> "${FIC_LOG}"
-LOG_FIC "--------------- debut de programme -------------------"
+LOG_FIC "${GREEN}######################################## filter start${NC}"
 
-mkdir -p "${MAILS}" || { LOG_FIC "impossible de creer ce dossier"; exit "${EX_UNAVAILABLE}"; }
+if ! mkdir -p "${MAILS}"; then
+    LOG_FIC "${RED}Can't mkdir ${MAILS} ${NC}"
+    quitFilter "${EX_UNAVAILABLE}"
+fi
 MAIL_SOURCE=$(echo $@ | awk 'BEGIN{FS=" "} {print $2}')
 DATE_TEMPS=$(date "+%Y-%m-%d-%H:%M:%S")
-REP_PIECE_JOINTE=$(echo "${MAILS}/${DATE_TEMPS}_${MAIL_SOURCE}_$$")
+REP_PIECE_JOINTE="${MAILS}/${DATE_TEMPS}_${MAIL_SOURCE}_$$"
-cd "${INSPECT_DIR}" || { echo "${INSPECT_DIR} does not exist"; exit "${EX_TEMPFAIL}"; }
+TRACK=$(curl "${JIRAFEAU_LOCAL}/a.php?r=${MAIL_SOURCE}" 2>/dev/null)
+PERIOD=$(curl "${JIRAFEAU_LOCAL}/a.php?p=${MAIL_SOURCE}" 2>/dev/null)
+if [ -n "$(echo "${PERIOD}" | grep -e minute -e hour -e day -e week -e month -e quarter 2>/dev/null)" ]; then
+    JIRAFEAU_TIME="${PERIOD}"
+fi
+
+LOG_FIC "\n" \
+	"    MAIL_SOURCE  : ${YELLOW}${MAIL_SOURCE}${NC}\n" \
+	"    DATE_TEMPS   : ${YELLOW}${DATE_TEMPS=}${NC}\n" \
+	"    TRACK        : ${YELLOW}${TRACK}${NC}\n" \
+	"    PERIOD       : ${YELLOW}${PERIOD}${NC}\n" \
+	"    JIRAFEAU_TIME: ${YELLOW}${JIRAFEAU_TIME}${NC}"
+
+if ! cd "${INSPECT_DIR}"; then
+    echo "${INSPECT_DIR} does not exist"
+    quitFilter "${EX_TEMPFAIL}"
+fi
 
 # lien renvoyé par le téléverssement
 ONE_LINK="${REP_PIECE_JOINTE}/one.txt"
@@ -84,11 +130,18 @@ ONE_LINK="${REP_PIECE_JOINTE}/one.txt"
 OLD_LINKS="${REP_PIECE_JOINTE}/url-to-refresh.txt"
 # contenu de l'archive
 ARCHIVE_CONTENT="${REP_PIECE_JOINTE}/archive-content.txt"
+# create if error
+JIRAFEAU_ERROR="${REP_PIECE_JOINTE}/jirafeau-error.txt"
 
 # Clean up when done or when aborting.
 trap "rm -rf in.$$ in.$$.altered ${REP_PIECE_JOINTE}" 0 1 2 3 15
 
-cat > "in.$$" || { LOG_FIC "Cannot save mail to file"; exit "${EX_TEMPFAIL}"; }
+if ! cat > "in.$$"; then
+    LOG_FIC "${RED}Cannot save mail to file${NC}"
+    quitFilter "${EX_TEMPFAIL}"
+fi
+LOG_FIC "\n" \
+	"             size: ${YELLOW}$(wc -c < "${INSPECT_DIR}/in.$$")${NC}"
 # XXX trace
 # cp "${INSPECT_DIR}/in.$$" "${INSPECT_DIR}/in.$$.bak"
 
@@ -97,11 +150,10 @@ mkdir -p "${REP_PIECE_JOINTE}/"
 >"${ARCHIVE_CONTENT}"
 
 # Etape de rafraichissement des anciens fichiers inclus
-cat > "${ARCHIVE_CONTENT}" <<EOF
+echo "time: ${DATE_TEMPS}\nid: $(date +%s)" > "${ARCHIVE_CONTENT}"
-src: ${MAIL_SOURCE}
+[ -n "${TRACK}" ] && echo "sender: ${MAIL_SOURCE}" >> "${ARCHIVE_CONTENT}"
-time: ${DATE_TEMPS}
+
-EOF
+LOG_FIC "${CYAN}${SHRINK_CMD} -u \"${INSPECT_DIR}/in.$$\" 2>> \"${FIC_LOG}\" > \"${OLD_LINKS}\"${NC}"
-LOG_FIC "${SHRINK_CMD} -u \"${INSPECT_DIR}/in.$$\" 2>> \"${FIC_LOG}\" > \"${OLD_LINKS}\""
 "${SHRINK_CMD}" -u "${INSPECT_DIR}/in.$$" 2>> "${FIC_LOG}" > "${OLD_LINKS}"
 
 cat "${OLD_LINKS}" | grep "${JIRAFEAU_URL}" | while read REMOTE_LINK
@@ -110,14 +162,14 @@ do
     [ -z "${REMOTE_REF}" ] && continue
     REMOTE_KEY=$(echo "${REMOTE_LINK}" | grep "k=" | sed 's%.*k=\([^&]*\).*%\1%')
     # update periode for download
-    LOG_FIC " - \"${JIRAFEAU_CMD}\" -f \"${JIRAFEAU_LOCAL}\" -t \"${JIRAFEAU_TIME}\" update \"${REMOTE_REF}\" 2>&1 >> \"${FIC_LOG}\""
+    LOG_FIC " - ${CYAN}\"${JIRAFEAU_CMD}\" -f \"${JIRAFEAU_LOCAL}\" -t \"${JIRAFEAU_TIME}\" update \"${REMOTE_REF}\" 2>&1 >> \"${FIC_LOG}\"${NC}"
     "${JIRAFEAU_CMD}" -f "${JIRAFEAU_LOCAL}" -t "${JIRAFEAU_TIME}" update "${REMOTE_REF}" 2>&1 >> "${FIC_LOG}"
     echo "old: ${REMOTE_REF} ${REMOTE_KEY}" >> "${ARCHIVE_CONTENT}"
 done
-LOG_FIC " - archive starts with: $(cat ${ARCHIVE_CONTENT})"
+LOG_FIC " - archive starts with: ${NL}${YELLOW}$(cat ${ARCHIVE_CONTENT})${NC}"
 
 # Etape extraction des pieces jointes
-LOG_FIC "${SHRINK_CMD} -s ${MAX_KEEP_IN_MAIL} -d ${REP_PIECE_JOINTE} ${INSPECT_DIR}/in.$$"
+LOG_FIC "${CYAN}${SHRINK_CMD} -s ${MAX_KEEP_IN_MAIL} -d ${REP_PIECE_JOINTE} ${INSPECT_DIR}/in.$$ ${NC}"
 "${SHRINK_CMD}" -s "${MAX_KEEP_IN_MAIL}" -d "${REP_PIECE_JOINTE}" "${INSPECT_DIR}/in.$$"  2>> "${FIC_LOG}" | {
     while read ATTACH_TMP_NAME
     do
@@ -127,86 +179,101 @@ LOG_FIC "${SHRINK_CMD} -s ${MAX_KEEP_IN_MAIL} -d ${REP_PIECE_JOINTE} ${INSPECT_D
 	    ATTACH_NAME=$(grep "^Name: " "${ATTACH_TMP_NAME}/meta" | cut -c 7- )
 	    ATTACH_CONTENT_TYPE=$(grep "^Content-Type: " "${ATTACH_TMP_NAME}/meta" | cut -c 15- )
 	else
+	    LOG_FIC " - ${RED}no ATTACH_TMP_NAME (${ATTACH_TMP_NAME}) ${NC}"
 	    # XXX error
 	    continue
 	fi
 	# Etape de televersement des pieces jointes
 	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 \"${ATTACH_CONTENT_TYPE}\" -n \"${ATTACH_NAME}\" send \"${ATTACH_MEDIA}\" \"${PASSWORD}\" 2>> \"${FIC_LOG}\" > \"${ONE_LINK}\""
+	LOG_FIC " - ${CYAN}\"${JIRAFEAU_CMD}\" -f \"${JIRAFEAU_LOCAL}\" -t \"${JIRAFEAU_TIME}\" -s \"${MAX_UPLOAD_SIZE}\" -c \"${ATTACH_CONTENT_TYPE}\" -n \"${ATTACH_NAME}\" send \"${ATTACH_MEDIA}\" \"${PASSWORD}\" 2>> \"${FIC_LOG}\" > \"${ONE_LINK}\"${NC}"
-	"${JIRAFEAU_CMD}" -f "${JIRAFEAU_LOCAL}" -s "${MAX_UPLOAD_SIZE}" -c "${ATTACH_CONTENT_TYPE}" -n "${ATTACH_NAME}" send "${ATTACH_MEDIA}" "${PASSWORD}" 2>> "${FIC_LOG}" > "${ONE_LINK}"
+	"${JIRAFEAU_CMD}" -f "${JIRAFEAU_LOCAL}" -t "${JIRAFEAU_TIME}" -s "${MAX_UPLOAD_SIZE}" -c "${ATTACH_CONTENT_TYPE}" -n "${ATTACH_NAME}" send "${ATTACH_MEDIA}" "${PASSWORD}" 2>> "${FIC_LOG}" > "${ONE_LINK}"
 	cat "${ONE_LINK}"  | {
 	    read JIR_TOKEN
 	    read JIR_CODE
-	    LOG_FIC " - Jirafeau retourne ${JIR_TOKEN} et ${JIR_CODE}"
+	    LOG_FIC " - return code ${YELLOW}${JIR_TOKEN}${NC} / ${YELLOW}${JIR_CODE}${NC}"
 	    case "${JIR_TOKEN}" in
 		"" | no | *Error* | \<* )
-		    LOG_FIC " - impossible de televerser ${ATTACH_TMP_FILE} (${JIR_TOKEN}), il ne sera pas remplace dans le message"
+		    LOG_FIC " - ${RED}Can't upload <${ATTACH_NAME}> <${ATTACH_CONTENT_TYPE}> <$(wc -c < "${ATTACH_MEDIA}")> (${JIR_TOKEN}) <in.$$.bak>. It will be not change in e-mail.${NC}"
 		    echo "new:"
+		    keepFailed "${INSPECT_DIR}/in.$$"
+		    echo "UPLOAD_FAIL" >> "${JIRAFEAU_ERROR}"
 		    ;;
 		* )
-		    LOG_FIC " - substitution par ${JIRAFEAU_URL}/f.php?d=1&h=${JIR_TOKEN}&k=${PASSWORD_MD5}"
+		    LOG_FIC " - change by link ${YELLOW}${JIRAFEAU_URL}/f.php?d=1&h=${JIR_TOKEN}&k=${PASSWORD_MD5}${NC}"
 		    echo "url: ${JIRAFEAU_URL}/f.php?d=1&h=${JIR_TOKEN}&k=${PASSWORD_MD5}"
 		    echo "new: ${JIR_TOKEN} ${PASSWORD_MD5}" >> "${ARCHIVE_CONTENT}"
 		    ;;
 	    esac
 	}
-	LOG_FIC " - supprimer l'extraction ${ATTACH_TMP_FILE}"
-	rm -f "${ATTACH_TMP_FILE}"
     done
     # Création de l'archive
-    if [ "$(wc -l < "${ARCHIVE_CONTENT}")" -ge 4 ]; then
+    NB_ATTACH=$(grep -e "^old: " -e "^new: " "${ARCHIVE_CONTENT}" | wc -l)
+    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 \"text/plain\" -n \"archive_content\" send \"${ARCHIVE_CONTENT}\" \"${PASSWORD}\" 2>> \"${FIC_LOG}\" > \"${ONE_LINK}\""
+	LOG_FIC " - ${MAGENTA}upload archive${NC}"
-	"${JIRAFEAU_CMD}" -f "${JIRAFEAU_LOCAL}" -s "${MAX_UPLOAD_SIZE}" -c "text/plain" -n "archive_content" send "${ARCHIVE_CONTENT}" "${PASSWORD}" 2>> "${FIC_LOG}" > "${ONE_LINK}"
+	LOG_FIC " - ${CYAN}\"${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}\"${NC}"
+	"${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
+    LOG_FIC " - final archive content: ${NL}${YELLOW}$(cat ${ARCHIVE_CONTENT})${NC}"
+    if  [ "${NB_ATTACH}" -gt 1 ]; then
 	cat "${ONE_LINK}"  | {
 	    read JIR_TOKEN
 	    read JIR_CODE
-	    LOG_FIC " - Jirafeau retourne ${JIR_TOKEN} et ${JIR_CODE}"
+	    LOG_FIC " - return code ${YELLOW}${JIR_TOKEN}${NC} / ${YELLOW}${JIR_CODE}${NC}"
 	    case "${JIR_TOKEN}" in
 		"" | no | *Error* | \<* )
-		    LOG_FIC " - impossible de televerser l'archive (${JIR_TOKEN}), il ne sera pas remplace dans le message"
+		    LOG_FIC " - ${RED}can't upload archive (${JIR_TOKEN}) <in.$$.bak>, substitution couldn't be done${NC}"
 		    echo "arch: bad"
+		    keepFailed "${INSPECT_DIR}/in.$$"
+		    echo "ARCHIVE_FAIL" >> "${JIRAFEAU_ERROR}"
 		    ;;
 		* )
-		    LOG_FIC " - ajoute de l'archive ${JIRAFEAU_URL}/a.php?g=${JIR_TOKEN}~${PASSWORD_MD5}"
+		    LOG_FIC " - add archive ${YELLOW}${JIRAFEAU_URL}/a.php?g=${JIR_TOKEN}~${PASSWORD_MD5}${NC}"
 		    echo "arch: ${JIRAFEAU_URL}/a.php?g=${JIR_TOKEN}~${PASSWORD_MD5}"
 		    ;;
 	    esac
 	}
     else
-	LOG_FIC " - pas d'archive (moins de 2 PJ)"
+	LOG_FIC " - no archive (less than 2 attach file)"
 	echo "arch: none"
     fi
     # Etape de substitution
-    LOG_FIC "${SHRINK_CMD} -s \"${MAX_KEEP_IN_MAIL}\" \"${INSPECT_DIR}/in.$$\" \"${INSPECT_DIR}/in.$$.altered\" 2>> \"${FIC_LOG}\""
+    LOG_FIC "${CYAN}${SHRINK_CMD} -s \"${MAX_KEEP_IN_MAIL}\" \"${INSPECT_DIR}/in.$$\" \"${INSPECT_DIR}/in.$$.altered\" 2>> \"${FIC_LOG}\"${NC}"
 } | "${SHRINK_CMD}" -s "${MAX_KEEP_IN_MAIL}" "${INSPECT_DIR}/in.$$" "${INSPECT_DIR}/in.$$.altered" 2>> "${FIC_LOG}"
 
 # XXX trace
 # cp "${INSPECT_DIR}/in.$$" "${INSPECT_DIR}/in.$$.altered" /var/mail/tmp/
 
+if [ -s "${JIRAFEAU_ERROR}" ]; then
+    LOG_FIC " - ${RED}upload fail${NC}"
+    quitFilter "${EX_TEMPFAIL}"
+fi
+
 # Etape choix de modification du message d'origine
 if [ "$(wc -l < "${ARCHIVE_CONTENT}")" -ge 3 ]; then
     # verification de taille finale
     actualSize=$(wc -c < "${INSPECT_DIR}/in.$$.altered")
     if [ ${actualSize} -ge $MAX_FINAL_SIZE ]; then
-	LOG_FIC " - message trop gros apres regime ${INSPECT_DIR}/in.$$.altered (${actualSize})"
+	LOG_FIC " - ${RED}too big even after diet ${INSPECT_DIR}/in.$$.altered (${actualSize})${NC}"
-	exit "${EX_TOO_LARGE}";
+	keepFailed "${INSPECT_DIR}/in.$$"
+	quitFilter "${EX_TOO_LARGE}"
     fi
-    LOG_FIC " - envoi de la commande : ${SENDMAIL} $@ ${INSPECT_DIR}/in.$$.altered"
+    LOG_FIC " - ${GREEN}send with : ${SENDMAIL} $@ ${INSPECT_DIR}/in.$$.altered ${NC}"
     ${SENDMAIL} "$@" < "${INSPECT_DIR}/in.$$.altered"
 else
     # verification de taille finale
     actualSize=$(wc -c < "${INSPECT_DIR}/in.$$")
     if [ ${actualSize} -ge $MAX_FINAL_SIZE ]; then
-	LOG_FIC " - message trop gros sans regime ${INSPECT_DIR}/in.$$ (${actualSize})"
+	LOG_FIC " - ${RED}too big without diet ${INSPECT_DIR}/in.$$ (${actualSize}) ${NC}"
-	exit "${EX_TOO_LARGE}";
+	keepFailed "${INSPECT_DIR}/in.$$"
+	quitFilter "${EX_TOO_LARGE}"
     fi
-    LOG_FIC " - pas de piece jointe"
+    LOG_FIC " - ${GREEN}send without attach file${NC}"
     ${SENDMAIL} "$@" < "in.$$"
 fi
 
-exit 0
+quitFilter 0
 
 ##########################################################################

src/cpp/MainAttachment.cpp

@@ -163,7 +163,7 @@ void
 MainAttachment::addLink (string &plain, string &html, const string &url, const string &name) const {
   string plainNewOneLink (templatePlainAddLink);
   replaceAll (plainNewOneLink, TMPL_DOWNLOAD, url);
-  replaceAll (plainNewOneLink, TMPL_FILENAME, name);
+  replaceAll (plainNewOneLink, TMPL_FILENAME, "\""+name+"\"");
   plain += plainNewOneLink;
   string htmlNewOneLink (templateHtmlAddLink);
   string codedUrl (url);
@@ -211,7 +211,7 @@ MainAttachment::getDisclaim (string &plain, string &html) const {
   plain = "\r\n"+KAZ_PLAIN_START+"\r\n"+KAZ_PLAIN_HR+"\r\n"+KAZ_PLAIN_DONT_TOUCH+"\r\n\r\n"+KAZ_PLAIN_WARNING+"\r\n\r\n"+KAZ_PLAIN_DOWLOAD_ONE+"\r\n"+plainNewLinks;
   html = templateHtmlHeader+htmlNewLinks;
   if (previousLinks.size ()) {
-    plain += KAZ_PLAIN_DOWLOAD_OTHER+"\r\n"+plainOldLinks;
+    plain += "\r\n"+KAZ_PLAIN_DOWLOAD_OTHER+"\r\n"+plainOldLinks;
     html += templateHtmlOtherLink+htmlOldLinks;
   }
   if (linkCount > 1 && archiveDownloadURL.length ()) {
@@ -239,7 +239,7 @@ MainAttachment::addPrevious (const string &href, const string &name, const bool
   if (oldVal.length () && name.length () && !trust)
     return;
   previousLinks.erase (href);
-  previousLinks [href] = name;
+  previousLinks [href] = regex_replace (name, regex (R"([\t\r\n\"]+|(\\\")|(>\s*))"), "");
   LOG ("inserted: " << href << ": " << previousLinks[href]);
 }
 
@@ -255,7 +255,7 @@ MainAttachment::extractLinks (const string &extractedPlainKAZ) {
     const string href (extractedPlainKAZ.substr (startPos, stopPos-startPos));
     LOG ("plain href: " << href);
 
-    if (extractedPlainKAZ [stopPos] && extractedPlainKAZ [stopPos] != '\n')
+    if (extractedPlainKAZ [stopPos])
       ++stopPos;
     startPos = stopPos;
     // get all href but KAZ_WEB_SITE
@@ -266,11 +266,11 @@ MainAttachment::extractLinks (const string &extractedPlainKAZ) {
     string::size_type nextPos = extractedPlainKAZ.find ("http", startPos);
     string name (extractedPlainKAZ, startPos, (nextPos == string::npos ? extractedPlainKAZ.length () : nextPos) - startPos);
     // skip [> \r\n\t]
-    nextPos = name.find_first_not_of ("[> \t\r\n]");
+    nextPos = name.find_first_not_of ("[> \t\r\n\"]");
     if (nextPos != string::npos)
       name.erase (0, nextPos);
     // stop before [>\r\n\t]
-    nextPos = name.find_first_of ("[>\t\r\n]");
+    nextPos = name.find_first_of ("[\"]");
     if (nextPos != string::npos)
       name.erase (nextPos);
     LOG ("plain name: " << name);
@@ -354,7 +354,8 @@ void
 MainAttachment::removePreviousArchive () {
   vector<string> toRemove;
   for (map <string, string>::const_iterator it = previousLinks.begin (); it != previousLinks.end (); ++it)
-    if (it->first.find ("&l=/") != string::npos)
+    if (it->first.find ("&g=") != string::npos ||
+	it->first.find ("&l=/") != string::npos) // v1 compatibility
       toRemove.push_back (it->first);
   for (string old : toRemove)
     previousLinks.erase (old);

src/cpp/jirafeauAPI.cpp

@@ -122,8 +122,8 @@ main (int argc, char** argv) {
     contentType,
     attachName,
     urlBase ("http://file.kaz.bzh"),
-    apiPage ("/script.php"),
+    uploadPage ("/a.php"),
-    downloadPage ("/f.php"),
+    updatePage ("/a.php"),
     minimumAvailability ("month"),
     proxy;
 
@@ -144,8 +144,8 @@ main (int argc, char** argv) {
       ("useTheForceLuke", bool_switch (&useTheForceLuke), "display hidded options")
       ("debug,g", bool_switch (&debugFlag), "debug mode")
       ("proxy,p", value<string> (&proxy)->default_value (proxy), "set proxy (proxy-host.org:8080)")
-      ("uploadPage,u", value<string> (&apiPage)->default_value (apiPage), "upload page")
+      ("uploadPage,u", value<string> (&uploadPage)->default_value (uploadPage), "upload page")
-      ("downloadPage,d", value<string> (&downloadPage)->default_value (downloadPage), "download page")
+      ("updatePage,v", value<string> (&updatePage)->default_value (updatePage), "update page")
       ;
 
     options_description cmd ("All options");
@@ -220,8 +220,8 @@ main (int argc, char** argv) {
 
   switch (jirCmd) {
   case SEND: {
-    LOG ("SEND: " << (urlBase+apiPage));
+    LOG ("SEND: " << (urlBase+uploadPage));
-    curl_easy_setopt (easyhandle, CURLOPT_URL, (urlBase+apiPage).c_str ());
+    curl_easy_setopt (easyhandle, CURLOPT_URL, (urlBase+uploadPage).c_str ());
 
     LOG ("maxUploadSize: " << maxUploadSize);
     long uploadsize = (size_t) maxUploadSize;
@@ -264,8 +264,8 @@ main (int argc, char** argv) {
     break;
 
   case UPDATE: {
-    LOG ("UPDATE: " << (urlBase+downloadPage));
+    LOG ("UPDATE: " << (urlBase+updatePage));
-    curl_easy_setopt (easyhandle, CURLOPT_URL, (urlBase+downloadPage).c_str ());
+    curl_easy_setopt (easyhandle, CURLOPT_URL, (urlBase+updatePage).c_str ());
 
     LOG ("h: " << inputFileName);
     part = curl_mime_addpart (multipart);