troys issues funktion

Reviewed-on: #2

_func.php

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

mail.php

@@ -1,9 +1,14 @@
 <?php
 function send_mail($an, $betreff, $text, $ok = '', $error = '') {
-  include 'secret.php';
+  global $absender;
   $sender = 'noreply@troy-grunt.de';
-  if (isset ( $_sendermail )) {
+  if(isset($absender) && $absender) {
-    $sender = $_sendermail;
+    $sender = $absender;
+  }else{
+    include 'secret.php';
+    if (isset ( $_sendermail )) {
+      $sender = $_sendermail;
+    }
   }
   $header = 'From: ' . $sender . "\r\n";
   $header .= 'To: ' . $an . "\r\n";
@@ -19,12 +24,18 @@ function send_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';
-  if (isset ( $_sendermail )) {
+  if(isset($absender) && $absender) {
-    $sender = $_sendermail;
+    $sender = $absender;
+  }else{
+    include 'secret.php';
+    if (isset ( $_sendermail )) {
+      $sender = $_sendermail;
+    }
   }
+  $boundary = md5($an.$betreff.$text.time());
+
   $header = 'From: ' . $sender . "\n";
   $header .= 'To: ' . $an . "\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!';
+  }
+}
 ?>

secret.php.example

@@ -1,12 +1,17 @@
-<?php 
+<?php
 if (!defined('SQL_LOG')) define ( 'SQL_LOG', 1 ); // schreibt sql querys in eine log
 
-$_m['host'] = 'localhost'; 
+$_m['host'] = 'localhost';
 $_m['user'] = '';
 $_m['pass'] = '';
 $_m['data'] = '';
-$_m['pre']  = 'efcms2_';
+$_m['pre']  = '';
 $_m['salt'] = '';
 
-$_sendermail = 'noreply@troy-grunt.de';
+$_m['issuedata'] = ['domain'=>'','secret'=>''];
+
+$_sendermail = 'noreply@.de';
+$_smtp['srv'] = 'mail.seemsleg.it';
+$_smtp['user'] = 'noreply@.de';
+$_smtp['pw'] = '';
 ?>

sql.php

@@ -4,6 +4,7 @@ class SQL {
   private $res = false;
   private $m;
   public $salt;
+  public $issuedata;
   public $pre;
   public $cnt_get = 0;
   public $cnt_set = 0;
@@ -11,6 +12,7 @@ class SQL {
     require_once ('secret.php');
 
     $this->m = $_m;
+    $this->issuedata = $_m['issuedata'];
     $this->pre = $_m ['pre'];
     $this->salt = $_m ['salt'];
     if (SQL_LOG)

troy-api.php

@@ -1,16 +1,50 @@
 <?php
 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);
 }
 ?>