Compare commits
7 Commits
67a39afe0f
...
troys_issu
| Author | SHA1 | Date | |
|---|---|---|---|
| 61b52d8427 | |||
| b475672eac | |||
|
|
560ef6589c | ||
|
|
e4a21f4d7c | ||
|
|
c2e488c8e7 | ||
|
|
59b5ffc82f | ||
|
|
2913f3f032 |
@@ -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');
|
||||||
?>
|
?>
|
||||||
15
mail.php
15
mail.php
@@ -58,29 +58,19 @@ function send_html_mail($an, $betreff, $text, $ok = '', $error = '') {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function send_php_mail($an, $betreff, $text, $ok = '', $error = '') {
|
function send_php_mail($an, $betreff, $text, $ok = '', $error = '') {
|
||||||
$boundary = md5($an.$betreff.$text.time());
|
global $_sendermail;
|
||||||
include 'secret.php';
|
|
||||||
$sender = 'noreply@troy-grunt.de';
|
$sender = 'noreply@troy-grunt.de';
|
||||||
if (isset ( $_sendermail )) {
|
if (isset ( $_sendermail )) {
|
||||||
$sender = $_sendermail;
|
$sender = $_sendermail;
|
||||||
}
|
}
|
||||||
include 'php-mailer/SMTP.php';
|
|
||||||
include 'php-mailer/PHPMailer.php';
|
include 'php-mailer/PHPMailer.php';
|
||||||
$mail = new PHPMailer();
|
$mail = new PHPMailer();
|
||||||
$mail->isSMTP();
|
|
||||||
$mail->SMTPDebug = SMTP::DEBUG_OFF;
|
|
||||||
$mail->Host = $_smtp['srv'];
|
|
||||||
$mail->Port = 25;
|
|
||||||
$mail->SMTPAuth = true;
|
|
||||||
$mail->Username = $_smtp['user'];
|
|
||||||
$mail->Password = $_smtp['pw'];
|
|
||||||
|
|
||||||
$mail->setFrom($sender);
|
$mail->setFrom($sender);
|
||||||
$mail->addAddress($an);
|
$mail->addAddress($an);
|
||||||
$mail->Subject = $betreff;
|
$mail->Subject = $betreff;
|
||||||
$mail->msgHTML('<html><body>'.$text.'</body></html>');
|
$mail->msgHTML($text, __DIR__);
|
||||||
$mail->AltBody = strip_tags($text);
|
$mail->AltBody = strip_tags($text);
|
||||||
//$mail->addAttachment('images/phpmailer_mini.png');
|
|
||||||
|
|
||||||
if (!$mail->send()) {
|
if (!$mail->send()) {
|
||||||
echo 'Mailer Error: ' . $mail->ErrorInfo;
|
echo 'Mailer Error: ' . $mail->ErrorInfo;
|
||||||
@@ -88,5 +78,4 @@ function send_php_mail($an, $betreff, $text, $ok = '', $error = '') {
|
|||||||
echo 'Message sent!';
|
echo 'Message sent!';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
?>
|
||||||
@@ -8,6 +8,8 @@ $_m['data'] = '';
|
|||||||
$_m['pre'] = '';
|
$_m['pre'] = '';
|
||||||
$_m['salt'] = '';
|
$_m['salt'] = '';
|
||||||
|
|
||||||
|
$_m['issuedata'] = ['domain'=>'','secret'=>''];
|
||||||
|
|
||||||
$_sendermail = 'noreply@.de';
|
$_sendermail = 'noreply@.de';
|
||||||
$_smtp['srv'] = 'mail.seemsleg.it';
|
$_smtp['srv'] = 'mail.seemsleg.it';
|
||||||
$_smtp['user'] = 'noreply@.de';
|
$_smtp['user'] = 'noreply@.de';
|
||||||
|
|||||||
2
sql.php
2
sql.php
@@ -4,6 +4,7 @@ class SQL {
|
|||||||
private $res = false;
|
private $res = false;
|
||||||
private $m;
|
private $m;
|
||||||
public $salt;
|
public $salt;
|
||||||
|
public $issuedata;
|
||||||
public $pre;
|
public $pre;
|
||||||
public $cnt_get = 0;
|
public $cnt_get = 0;
|
||||||
public $cnt_set = 0;
|
public $cnt_set = 0;
|
||||||
@@ -11,6 +12,7 @@ class SQL {
|
|||||||
require_once ('secret.php');
|
require_once ('secret.php');
|
||||||
|
|
||||||
$this->m = $_m;
|
$this->m = $_m;
|
||||||
|
$this->issuedata = $_m['issuedata'];
|
||||||
$this->pre = $_m ['pre'];
|
$this->pre = $_m ['pre'];
|
||||||
$this->salt = $_m ['salt'];
|
$this->salt = $_m ['salt'];
|
||||||
if (SQL_LOG)
|
if (SQL_LOG)
|
||||||
|
|||||||
58
troy-api.php
58
troy-api.php
@@ -1,16 +1,50 @@
|
|||||||
<?php
|
<?php
|
||||||
function sendToTroy($data) {
|
function sendToTroy($data) {
|
||||||
$url = 'https://troy-grunt.de/api.php';
|
$url = 'https://troy-grunt.de/api.php';
|
||||||
$options = array (
|
$options = array (
|
||||||
'http' => array (
|
'http' => array (
|
||||||
'method' => 'POST',
|
'method' => 'POST',
|
||||||
'header' => array (
|
'header' => array (
|
||||||
'Content-Type: application/json'
|
'Content-Type: application/json'
|
||||||
),
|
),
|
||||||
'content' => json_encode ( $data )
|
'content' => json_encode ( $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 troysIssue($ident, $typ, $text = null, $data = [], $reaction = []) {
|
||||||
|
global $sql;
|
||||||
|
$url = "https://issues.troy-grunt.de/api/input";
|
||||||
|
|
||||||
|
$payload = [
|
||||||
|
"domain" => $sql->issuedata['domain'],
|
||||||
|
"secret" => $sql->issuedata['secret'],
|
||||||
|
"ident" => $ident,
|
||||||
|
"typ" => $typ,
|
||||||
|
"text" => $text,
|
||||||
|
"data" => $data,
|
||||||
|
"reaction" => $reaction
|
||||||
|
];
|
||||||
|
|
||||||
|
// Entferne null-Werte aus dem Array
|
||||||
|
$payload = array_filter($payload, function ($value) {
|
||||||
|
return $value !== null;
|
||||||
|
});
|
||||||
|
|
||||||
|
$options = [
|
||||||
|
"http" => [
|
||||||
|
"header" => "Content-Type: application/json\r\n",
|
||||||
|
"method" => "POST",
|
||||||
|
"content" => json_encode($payload),
|
||||||
|
"ignore_errors" => true
|
||||||
|
]
|
||||||
|
];
|
||||||
|
|
||||||
|
$context = stream_context_create($options);
|
||||||
|
$result = file_get_contents($url, false, $context);
|
||||||
|
|
||||||
|
return json_decode($result, true);
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
Reference in New Issue
Block a user