Overview
Comment: | Envoi d'email perso en utilisant l'adresse expéditrice forcée ou de l'asso, fix [e7539ae31f] |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk | stable |
Files: | files | file ages | folders |
SHA1: |
0c01217ecfb3b381ae96c3e8de7a8368 |
User & Date: | bohwaz on 2018-07-24 22:37:49 |
Other Links: | manifest | tags |
References
2020-12-08
| ||
23:25 | • Wiki page "Changelog/0.9" artifact: b9c916b4d1 user: bohwaz | |
Context
2018-07-27
| ||
12:41 | Corrige cotisations par durée affichées pas à jour, patch suggéré par @daniel check-in: 774d4cee5e user: bohwaz tags: trunk, stable | |
2018-07-26
| ||
13:07 | Ajout queue d'envoi d'emails check-in: fa50a20dd3 user: bohwaz tags: dev | |
2018-07-24
| ||
22:37 | Envoi d'email perso en utilisant l'adresse expéditrice forcée ou de l'asso, fix [e7539ae31f] check-in: 0c01217ecf user: bohwaz tags: trunk, stable | |
12:53 | Correction: on accepte aussi la valeur 'TLS' pour la sécurité du SMTP check-in: f7ca017b90 user: bohwaz tags: trunk, stable | |
Changes
Modified src/config.dist.php from [faf2942110] to [1f09233dd8].
︙ | ︙ | |||
225 226 227 228 229 230 231 | //const SMTP_PASSWORD = 'abcd'; /** * Sécurité du serveur SMTP * * NONE = pas de chiffrement | | > | 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 | //const SMTP_PASSWORD = 'abcd'; /** * Sécurité du serveur SMTP * * NONE = pas de chiffrement * SSL = connexion SSL native * TLS = connexion TLS native (le plus sécurisé) * STARTTLS = utilisation de STARTTLS (moyennement sécurisé) * * Défaut : STARTTLS */ const SMTP_SECURITY = 'STARTTLS'; /** |
︙ | ︙ |
Modified src/include/lib/Garradin/Membres.php from [b6cfd55f6e] to [79cc6c1e41].
︙ | ︙ | |||
471 472 473 474 475 476 477 | /** * @deprecated remplacer par envoyer message à tableau de membres */ public function sendMessageToCategory($dest, $sujet, $message, $subscribed_only = false) { $config = Config::getInstance(); | < < < | 471 472 473 474 475 476 477 478 479 480 481 482 483 484 | /** * @deprecated remplacer par envoyer message à tableau de membres */ public function sendMessageToCategory($dest, $sujet, $message, $subscribed_only = false) { $config = Config::getInstance(); $message .= "\n\n--\n".$config->get('nom_asso')."\n".$config->get('site_asso'); if ($dest == 0) $where = 'id_categorie NOT IN (SELECT id FROM membres_categories WHERE cacher = 1)'; else $where = 'id_categorie = '.(int)$dest; |
︙ | ︙ | |||
499 500 501 502 503 504 505 | $db = DB::getInstance(); $res = $db->query('SELECT email FROM membres WHERE LENGTH(email) > 0 AND '.$where.' ORDER BY id;'); $sujet = '['.$config->get('nom_asso').'] '.$sujet; while ($row = $res->fetchArray(SQLITE3_ASSOC)) { | | | 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 | $db = DB::getInstance(); $res = $db->query('SELECT email FROM membres WHERE LENGTH(email) > 0 AND '.$where.' ORDER BY id;'); $sujet = '['.$config->get('nom_asso').'] '.$sujet; while ($row = $res->fetchArray(SQLITE3_ASSOC)) { Utils::mail($row['email'], $sujet, $message); } return true; } public function searchSQL($query) { |
︙ | ︙ |
Modified src/include/lib/Garradin/Membres/Session.php from [8016f26bf2] to [de1cb46439].
︙ | ︙ | |||
284 285 286 287 288 289 290 | $out['qrcode'] = 'data:image/svg+xml;base64,' . base64_encode($qrcode->toSVG()); return $out; } public function sendMessage($dest, $sujet, $message, $copie = false) { | | | < < < > | 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 | $out['qrcode'] = 'data:image/svg+xml;base64,' . base64_encode($qrcode->toSVG()); return $out; } public function sendMessage($dest, $sujet, $message, $copie = false) { $user = $this->getUser(); $config = Config::getInstance(); $from = sprintf('"%s" <%s>', sprintf('=?UTF-8?B?%s?=', base64_encode($user->identite)), FORCE_EMAIL_FROM ?: $config->get('email_asso')); $message .= "\n\n--\nCe message a été envoyé par un membre de ".$config->get('nom_asso'); $message .= ", merci de contacter ".$config->get('email_asso')." en cas d'abus."; if ($copie) { Utils::mail($from, $sujet, $message); |
︙ | ︙ |
Modified src/include/lib/Garradin/Utils.php from [e112042e84] to [e50ac2ace1].
︙ | ︙ | |||
382 383 384 385 386 387 388 | $content = trim($content); $content = preg_replace("#(?<!\r)\n#si", "\r\n", $content); $config = Config::getInstance(); $headers['Return-Path'] = $config->get('email_asso'); | > > | | | | | | | | | > | 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 | $content = trim($content); $content = preg_replace("#(?<!\r)\n#si", "\r\n", $content); $config = Config::getInstance(); $headers['Return-Path'] = $config->get('email_asso'); if (empty($headers['From'])) { if (FORCE_EMAIL_FROM) { $headers['Reply-To'] = !empty($headers['From']) ? $headers['From'] : $config->get('email_asso'); $headers['From'] = sprintf('"%s" <%s>', sprintf('=?UTF-8?B?%s?=', base64_encode($config->get('nom_asso'))), FORCE_EMAIL_FROM); $headers['Return-Path'] = FORCE_EMAIL_FROM; } else { $headers['From'] = sprintf('"%s" <%s>', sprintf('=?UTF-8?B?%s?=', base64_encode($config->get('nom_asso'))), $config->get('email_asso')); } } $headers['MIME-Version'] = '1.0'; $headers['Content-type'] = 'text/plain; charset=UTF-8'; $hash = sha1(uniqid() . var_export([$headers, $to, $subject, $content], true)); $headers['Message-ID'] = sprintf('%s@%s', $hash, isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : gethostname()); |
︙ | ︙ |