9 Commits

Author SHA1 Message Date
Troy grunt
97c21a4894 gitea stuff 2025-12-31 01:47:32 +01:00
electronicfreak
560ef6589c add troy api 2024-04-04 19:53:41 +02:00
troy
e4a21f4d7c mail absender 2022-12-18 19:29:34 +01:00
troy
c2e488c8e7 added functional php mail 2022-12-18 19:04:18 +01:00
troy
59b5ffc82f mail return werte gesetzt 2022-11-12 11:25:42 +01:00
troy
2913f3f032 mail boundary auskommentiert 2022-11-12 11:22:56 +01:00
67a39afe0f Merge pull request 'feature/better-email' (#2) from feature/better-email into master
Reviewed-on: #2
2022-11-12 11:13:39 +01:00
troy
49ad1f2438 phpMailer eingebaut
also minimal
2022-11-12 11:10:59 +01:00
troy
7a596597da ungetestet, mail funktion verbessert 2022-11-11 14:41:11 +01:00
6 changed files with 6595 additions and 12 deletions

View File

@@ -6,5 +6,6 @@ include_once ('string.php');
include_once ('numbers.php'); include_once ('numbers.php');
include_once ('mail.php'); include_once ('mail.php');
include_once ('debug.php'); include_once ('debug.php');
include_once ('troy-api.php');
// include_once ('markdown.php'); // include_once ('markdown.php');
?> ?>

View File

@@ -1,10 +1,15 @@
<?php <?php
function send_mail($an, $betreff, $text, $ok = '', $error = '') { function send_mail($an, $betreff, $text, $ok = '', $error = '') {
include 'secret.php'; global $absender;
$sender = 'noreply@troy-grunt.de'; $sender = 'noreply@troy-grunt.de';
if(isset($absender) && $absender) {
$sender = $absender;
}else{
include 'secret.php';
if (isset ( $_sendermail )) { if (isset ( $_sendermail )) {
$sender = $_sendermail; $sender = $_sendermail;
} }
}
$header = 'From: ' . $sender . "\r\n"; $header = 'From: ' . $sender . "\r\n";
$header .= 'To: ' . $an . "\r\n"; $header .= 'To: ' . $an . "\r\n";
$header .= 'Content-Type:text/html' . "\r\n"; $header .= 'Content-Type:text/html' . "\r\n";
@@ -19,12 +24,18 @@ function send_mail($an, $betreff, $text, $ok = '', $error = '') {
} }
function send_html_mail($an, $betreff, $text, $ok = '', $error = '') { function send_html_mail($an, $betreff, $text, $ok = '', $error = '') {
$boundary = md5($an.$betreff.$text.time()); global $absender;
include 'secret.php';
$sender = 'noreply@troy-grunt.de'; $sender = 'noreply@troy-grunt.de';
if(isset($absender) && $absender) {
$sender = $absender;
}else{
include 'secret.php';
if (isset ( $_sendermail )) { if (isset ( $_sendermail )) {
$sender = $_sendermail; $sender = $_sendermail;
} }
}
$boundary = md5($an.$betreff.$text.time());
$header = 'From: ' . $sender . "\n"; $header = 'From: ' . $sender . "\n";
$header .= 'To: ' . $an . "\n"; $header .= 'To: ' . $an . "\n";
$header .= 'Content-Type:multipart/alternative;boundary='.$boundary . "\n"; $header .= 'Content-Type:multipart/alternative;boundary='.$boundary . "\n";
@@ -46,4 +57,25 @@ function send_html_mail($an, $betreff, $text, $ok = '', $error = '') {
} }
} }
function send_php_mail($an, $betreff, $text, $ok = '', $error = '') {
global $_sendermail;
$sender = 'noreply@troy-grunt.de';
if (isset ( $_sendermail )) {
$sender = $_sendermail;
}
include 'php-mailer/PHPMailer.php';
$mail = new PHPMailer();
$mail->setFrom($sender);
$mail->addAddress($an);
$mail->Subject = $betreff;
$mail->msgHTML($text, __DIR__);
$mail->AltBody = strip_tags($text);
if (!$mail->send()) {
echo 'Mailer Error: ' . $mail->ErrorInfo;
} else {
echo 'Message sent!';
}
}
?> ?>

5058
php-mailer/PHPMailer.php Normal file

File diff suppressed because it is too large Load Diff

1456
php-mailer/SMTP.php Normal file

File diff suppressed because it is too large Load Diff

View File

@@ -5,8 +5,11 @@ $_m['host'] = 'localhost';
$_m['user'] = ''; $_m['user'] = '';
$_m['pass'] = ''; $_m['pass'] = '';
$_m['data'] = ''; $_m['data'] = '';
$_m['pre'] = 'efcms2_'; $_m['pre'] = '';
$_m['salt'] = ''; $_m['salt'] = '';
$_sendermail = 'noreply@troy-grunt.de'; $_sendermail = 'noreply@.de';
$_smtp['srv'] = 'mail.seemsleg.it';
$_smtp['user'] = 'noreply@.de';
$_smtp['pw'] = '';
?> ?>

View File

@@ -13,4 +13,37 @@ function sendToTroy($data) {
$context = stream_context_create ( $options ); $context = stream_context_create ( $options );
return file_get_contents ( $url, false, $context ); return file_get_contents ( $url, false, $context );
} }
function sendToGitea($title, $message) {
// secret.php liegt in lib/
require 'secret.php';
$url = rtrim($giteaUrl, '/') . "/repos/$giteaOwner/$giteaRepo/issues";
$data = [
"title" => $title,
"body" => $message
];
$options = [
'http' => [
'method' => 'POST',
'header' => [
"Content-Type: application/json",
"Authorization: token $giteaToken"
],
'content' => json_encode($data)
]
];
$context = stream_context_create($options);
$result = file_get_contents($url, false, $context);
if ($result === FALSE) {
throw new Exception("Fehler beim Erstellen der Anfrage");
}
return json_decode($result, true);
}
?> ?>