add troy api

mail absender
added functional php mail
2024-04-04 19:53:41 +02:00 · 2022-12-18 19:29:34 +01:00 · 2022-12-18 19:04:18 +01:00 · 2022-11-12 11:25:42 +01:00 · 2022-11-12 11:22:56 +01:00 · 2022-11-12 11:13:39 +01:00
10 changed files with 6745 additions and 109 deletions
--- a/_func.php
+++ b/_func.php
@ -6,5 +6,6 @@ include_once ('string.php');
 include_once ('numbers.php');
 include_once ('mail.php');
 include_once ('debug.php');
-include_once ('markdown.php');
+include_once ('troy-api.php');
+// include_once ('markdown.php');
 ?>
--- a/ips/crawler.php
+++ b/ips/crawler.php
@ -1,18 +1,43 @@
 <?php
 $_ips_crawler = array (
+        '34.79.234.76', // google
        '40.77.167.', // bing bot
+        '54.36.148.', // ahrefbot
+        '54.36.149.', // ahrefbot
        '66.249.',
        '62.138.',
        '62.210.149.60',
+        '65.21.180.26', // seekport
+        '81.209.177.145', // website-datenbank.de
+        '85.25.177.', // abuse
+        '85.25.210.', // hosteurope abuse
        '92.118.160.37', // netsystem research bot
        '104.155.85.', // google
        '114.119.1', // petalbot
+        '144.76.15.153', // mj12bot
+        '148.251.120.201', // mj12bot
+        '157.55.39.', // microsoft???
+        '172.217.', //google
+        '176.125.230.38', //sql inj
        '185.191.171.', // semrush bot
-        '207.46.13.124', // bing bot
-        '54.36.148.', // ahrefbot
+        '192.99.5.225', // ...
+        '205.185.115.87', //sex spam
+        '207.46.13.', // bing bot
+        '216.58.', //google
        '216.244.66.196', // opensiteexplorer
-        '65.21.180.26', // seekport
-        '81.209.177.145', // website-datenbank.de
-        '2a01:4f8:190:4244::2' // mj12bot
+        '2a01:4f8:190:4244::2', // mj12bot
+        '2a01:4f8:162:43c5::2', // mj12bot
 );
+function checkHuman() {
+  global $_ips_crawler;
+  if (stripos ( $_SERVER ['HTTP_USER_AGENT'], 'bot' ) !== false || stripos ( $_SERVER ['HTTP_USER_AGENT'], 'crawler' ) !== false) {
+    return false;
+  }
+  foreach ( $_ips_crawler as $np ) {
+    if (startsWith ( $_SERVER ['REMOTE_ADDR'], $np )) {
+      return false;
+    }
+  }
+  return true;
+}
 ?>
--- a/mail.php
+++ b/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 )) {
-    $sender = $_sendermail;
+  if(isset($absender) && $absender) {
+    $sender = $absender;
+  }else{
+    include 'secret.php';
+    if (isset ( $_sendermail )) {
+      $sender = $_sendermail;
+    }
  }
  $header = 'From: ' . $sender . "\r\n";
  $header .= 'To: ' . $an . "\r\n";
@ -18,3 +23,59 @@ function send_mail($an, $betreff, $text, $ok = '', $error = '') {
  }
 }

+function send_html_mail($an, $betreff, $text, $ok = '', $error = '') {
+  global $absender;
+  $sender = 'noreply@troy-grunt.de';
+  if(isset($absender) && $absender) {
+    $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";
+  $header .= 'X-Mailer: PHP/' . phpversion ();
+  $content = "This is multipart message using MIME\n";
+  $content .= "--" . $boundary . "\n";
+  $content .= "Content-type: text/plain;charset=utf-8\n";
+  $content .= 'Content-Transfer-Encoding: 8bit' . "\n\n";
+  $content .= strip_tags($text)."\n\n";
+  $content .= "--" . $boundary . "\n";
+  $content .= "Content-type: text/html;charset=utf-8\n";
+  $content .= "Content-Transfer-Encoding: 8bit". "\n\n";
+  $content .= '<html><body>'.$text.'</body></html>'."\n\n";
+
+  if (mail ( $an, $betreff, $content, $header ) === true) {
+    echo $ok;
+  } else {
+    echo $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!';
+  }
+}
+?>
--- a/og.php
+++ b/og.php
@ -0,0 +1,15 @@
+<?php
+function scanOG($url) {
+  $og = array();
+  $html = file_get_contents($url);
+
+  $re = '/<meta (name|property)=("|\')(.*?)("|\').*?content=("|\')(.*?)("|\')/m';
+  preg_match_all($re, $html, $matches, PREG_SET_ORDER, 0);
+
+  foreach($matches as $m) {
+    $og[$m[3]] = $m[6];
+  }
+  //print_r($og);
+  return $og;
+}
+?>
--- a/php-mailer/PHPMailer.php
+++ b/php-mailer/PHPMailer.php
--- a/php-mailer/SMTP.php
+++ b/php-mailer/SMTP.php
--- a/secret.php.example
+++ b/secret.php.example
@ -1,12 +1,15 @@
-<?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';
+$_sendermail = 'noreply@.de';
+$_smtp['srv'] = 'mail.seemsleg.it';
+$_smtp['user'] = 'noreply@.de';
+$_smtp['pw'] = '';
 ?>
--- a/sql.php
+++ b/sql.php
@ -27,46 +27,50 @@ class SQL {
    $this->cnt_get ++;
    if (SQL_LOG)
      fputs ( $this->f, str_replace ( array (
-          "\n",
-          "	"
+              "\n",
+              "  "
      ), array (
-          ' ',
-          ''
+              ' ',
+              ''
      ), $que ) . "\n" . print_r ( $p, true ) . "\n\n" );
    $statement = $this->h->prepare ( $que );
-    switch (count ( $p )) {
-      case 0 :
-        break;
-      case 1 :
-        $statement->bind_param ( $t, $p [0] );
-        break;
-      case 2 :
-        $statement->bind_param ( $t, $p [0], $p [1] );
-        break;
-      case 3 :
-        $statement->bind_param ( $t, $p [0], $p [1], $p [2] );
-        break;
-      case 4 :
-        $statement->bind_param ( $t, $p [0], $p [1], $p [2], $p [3] );
-        break;
-      case 5 :
-        $statement->bind_param ( $t, $p [0], $p [1], $p [2], $p [3], $p [4] );
-        break;
-      case 6 :
-        $statement->bind_param ( $t, $p [0], $p [1], $p [2], $p [3], $p [4], $p [5] );
-        break;
-      case 7 :
-        $statement->bind_param ( $t, $p [0], $p [1], $p [2], $p [3], $p [4], $p [5], $p [6] );
-        break;
-      case 8 :
-        $statement->bind_param ( $t, $p [0], $p [1], $p [2], $p [3], $p [4], $p [5], $p [6], $p [7] );
-        break;
-      case 9 :
-        $statement->bind_param ( $t, $p [0], $p [1], $p [2], $p [3], $p [4], $p [5], $p [6], $p [7], $p [8] );
-        break;
-      case 10 :
-        $statement->bind_param ( $t, $p [0], $p [1], $p [2], $p [3], $p [4], $p [5], $p [6], $p [7], $p [8], $p [9] );
-        break;
+    if (is_array ( $p )) {
+      switch (count ( $p )) {
+        case 0 :
+          break;
+        case 1 :
+          $statement->bind_param ( $t, $p [0] );
+          break;
+        case 2 :
+          $statement->bind_param ( $t, $p [0], $p [1] );
+          break;
+        case 3 :
+          $statement->bind_param ( $t, $p [0], $p [1], $p [2] );
+          break;
+        case 4 :
+          $statement->bind_param ( $t, $p [0], $p [1], $p [2], $p [3] );
+          break;
+        case 5 :
+          $statement->bind_param ( $t, $p [0], $p [1], $p [2], $p [3], $p [4] );
+          break;
+        case 6 :
+          $statement->bind_param ( $t, $p [0], $p [1], $p [2], $p [3], $p [4], $p [5] );
+          break;
+        case 7 :
+          $statement->bind_param ( $t, $p [0], $p [1], $p [2], $p [3], $p [4], $p [5], $p [6] );
+          break;
+        case 8 :
+          $statement->bind_param ( $t, $p [0], $p [1], $p [2], $p [3], $p [4], $p [5], $p [6], $p [7] );
+          break;
+        case 9 :
+          $statement->bind_param ( $t, $p [0], $p [1], $p [2], $p [3], $p [4], $p [5], $p [6], $p [7], $p [8] );
+          break;
+        case 10 :
+          $statement->bind_param ( $t, $p [0], $p [1], $p [2], $p [3], $p [4], $p [5], $p [6], $p [7], $p [8], $p [9] );
+          break;
+      }
+    } else {
+      $statement->bind_param ( $t, $p );
    }
    $statement->execute ();

@ -122,60 +126,55 @@ class SQL {
    $statement = $this->h->prepare ( $que );
    if (SQL_LOG)
      fputs ( $this->f, str_replace ( array (
-          "\n",
-          "	"
+              "\n",
+              "  "
      ), array (
-          ' ',
-          ''
+              ' ',
+              ''
      ), $que ) . "\n" . print_r ( $p, true ) . "\n\n" );
-    switch (count ( $p )) {
-      case 0 :
-        break;
-      case 1 :
-        $statement->bind_param ( $t, $p [0] );
-        break;
-      case 2 :
-        $statement->bind_param ( $t, $p [0], $p [1] );
-        break;
-      case 3 :
-        $statement->bind_param ( $t, $p [0], $p [1], $p [2] );
-        break;
-      case 4 :
-        $statement->bind_param ( $t, $p [0], $p [1], $p [2], $p [3] );
-        break;
-      case 5 :
-        $statement->bind_param ( $t, $p [0], $p [1], $p [2], $p [3], $p [4] );
-        break;
-      case 6 :
-        $statement->bind_param ( $t, $p [0], $p [1], $p [2], $p [3], $p [4], $p [5] );
-        break;
-      case 7 :
-        $statement->bind_param ( $t, $p [0], $p [1], $p [2], $p [3], $p [4], $p [5], $p [6] );
-        break;
-      case 8 :
-        $statement->bind_param ( $t, $p [0], $p [1], $p [2], $p [3], $p [4], $p [5], $p [6], $p [7] );
-        break;
-      case 9 :
-        $statement->bind_param ( $t, $p [0], $p [1], $p [2], $p [3], $p [4], $p [5], $p [6], $p [7], $p [8] );
-        break;
-      case 10 :
-        $statement->bind_param ( $t, $p [0], $p [1], $p [2], $p [3], $p [4], $p [5], $p [6], $p [7], $p [8], $p [9] );
-        break;
-      case 11 :
-        $statement->bind_param ( $t, $p [0], $p [1], $p [2], $p [3], $p [4], $p [5], $p [6], $p [7], $p [8], $p [9], $p [10] );
-        break;
-      case 12 :
-        $statement->bind_param ( $t, $p [0], $p [1], $p [2], $p [3], $p [4], $p [5], $p [6], $p [7], $p [8], $p [9], $p [10], $p [11] );
-        break;
-      case 13 :
-        $statement->bind_param ( $t, $p [0], $p [1], $p [2], $p [3], $p [4], $p [5], $p [6], $p [7], $p [8], $p [9], $p [10], $p [11], $p [12] );
-        break;
-      case 14 :
-        $statement->bind_param ( $t, $p [0], $p [1], $p [2], $p [3], $p [4], $p [5], $p [6], $p [7], $p [8], $p [9], $p [10], $p [11], $p [12], $p [13] );
-        break;
-      case 15 :
-        $statement->bind_param ( $t, $p [0], $p [1], $p [2], $p [3], $p [4], $p [5], $p [6], $p [7], $p [8], $p [9], $p [10], $p [11], $p [12], $p [13], $p [14] );
-        break;
+    if (is_array ( $p )) {
+      switch (count ( $p )) {
+        case 0 :
+          break;
+        case 1 :
+          $statement->bind_param ( $t, $p [0] );
+          break;
+        case 2 :
+          $statement->bind_param ( $t, $p [0], $p [1] );
+          break;
+        case 3 :
+          $statement->bind_param ( $t, $p [0], $p [1], $p [2] );
+          break;
+        case 4 :
+          $statement->bind_param ( $t, $p [0], $p [1], $p [2], $p [3] );
+          break;
+        case 5 :
+          $statement->bind_param ( $t, $p [0], $p [1], $p [2], $p [3], $p [4] );
+          break;
+        case 6 :
+          $statement->bind_param ( $t, $p [0], $p [1], $p [2], $p [3], $p [4], $p [5] );
+          break;
+        case 7 :
+          $statement->bind_param ( $t, $p [0], $p [1], $p [2], $p [3], $p [4], $p [5], $p [6] );
+          break;
+        case 8 :
+          $statement->bind_param ( $t, $p [0], $p [1], $p [2], $p [3], $p [4], $p [5], $p [6], $p [7] );
+          break;
+        case 9 :
+          $statement->bind_param ( $t, $p [0], $p [1], $p [2], $p [3], $p [4], $p [5], $p [6], $p [7], $p [8] );
+          break;
+        case 10 :
+          $statement->bind_param ( $t, $p [0], $p [1], $p [2], $p [3], $p [4], $p [5], $p [6], $p [7], $p [8], $p [9] );
+          break;
+        case 11 :
+          $statement->bind_param ( $t, $p [0], $p [1], $p [2], $p [3], $p [4], $p [5], $p [6], $p [7], $p [8], $p [9], $p [10] );
+          break;
+        case 12 :
+          $statement->bind_param ( $t, $p [0], $p [1], $p [2], $p [3], $p [4], $p [5], $p [6], $p [7], $p [8], $p [9], $p [10], $p [11] );
+          break;
+      }
+    } else {
+      $statement->bind_param ( $t, $p );
    }
    $statement->execute ();
    if (isset ( $statement->error ) && $statement->error != '') {
--- a/string.php
+++ b/string.php
@ -7,7 +7,8 @@ function umlaute($str) {
          'ä',
          'ö',
          'ü',
-          'ß'
+          'ß',
+          '&'
  ), array (
          '&Auml;',
          '&Ouml;',
@ -15,7 +16,8 @@ function umlaute($str) {
          '&auml;',
          '&ouml;',
          '&uuml;',
-          '&szlig;'
+          '&szlig;',
+          '&amp;'
  ), $str );
 }
 function chk($str) {
@ -33,11 +35,11 @@ function noScript($str) {
 function random($name_laenge) {
  $zeichen = "abcedfghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRTSUVWXYZ0123456789";
  $name_neu = "";
-  
+
  @mt_srand ( ( double ) microtime () * 1000000 );
  for($i = 0; $i < $name_laenge; $i ++) {
    $r = mt_rand ( 0, strlen ( $zeichen ) - 1 );
-    $name_neu .= $zeichen {$r};
+    $name_neu .= $zeichen[$r];
  }
  return $name_neu;
 }
@ -47,7 +49,7 @@ function startsWith($haystack, $needle) {
 }
 function endsWith($haystack, $needle) {
  $length = strlen ( $needle );
-  
+
  return $length === 0 || (substr ( $haystack, - $length ) === $needle);
 }
 function onlyAlpha($str, $zus = '') {
@ -245,7 +247,7 @@ function onlySimpleHTML($s) {
          '<pre>',
          '<pre/>'
  ), $s );
-  
+
  // cleanup
  $s = str_replace ( array (
          '{{|-',
@ -254,7 +256,7 @@ function onlySimpleHTML($s) {
          '',
          ''
  ), $s );
-  
+
  return $s;
 }
 function linkify($input) {
--- a/troy-api.php
+++ b/troy-api.php
@ -0,0 +1,16 @@
+<?php
+function sendToTroy($data) {
+  $url = 'https://troy-grunt.de/api.php';
+  $options = array (
+          'http' => array (
+                  'method' => 'POST',
+                  'header' => array (
+                          'Content-Type: application/json'
+                  ),
+                  'content' => json_encode ( $data )
+          )
+  );
+  $context = stream_context_create ( $options );
+  return file_get_contents ( $url, false, $context );
+}
+?>
Author	SHA1	Message	Date
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
troy-grunt	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
troy	0b7d47e816	better html emails	2022-11-11 13:20:20 +01:00
troy	6e7fd28762	sqal set mehr params	2022-10-28 17:15:53 +02:00
Sebastian Titz	756827d92b	added google official	2022-09-23 07:21:14 +02:00
titz lapi	3f2c5c1e73	ip ban	2022-08-16 21:35:12 +02:00
troy	79e27ee95a	no tabs	2022-07-22 23:30:10 +02:00
Sebastian Titz	af3d7d33a1	spam ip	2022-05-17 11:25:02 +02:00
Sebastian Titz	4636e50b25	und und oder vertauscht	2022-05-05 10:30:21 +02:00
troy	88f87e15b4	openmgraph und hotfix in string	2022-03-20 12:07:25 +01:00
Sebastian Titz	e44c10c5c2	auch keine crawler agents	2022-01-31 11:29:51 +01:00
troy	48bd8e66f2	Merge branch 'master' of https://git.seemsleg.it/pub/php-func-lib	2022-01-23 00:51:19 +01:00
troy	2e5b29bd9d	so nun aber richtig	2022-01-23 00:51:10 +01:00
troy	b689d73065	warning gefixt wegen content type	2022-01-23 00:11:21 +01:00
troy	ff40210fb6	checkHuman	2022-01-22 11:52:53 +01:00
troy	209bb0b00c	domain tipser	2022-01-09 15:15:20 +01:00
troy	6bec287363	die troy api	2022-01-09 13:27:20 +01:00
troy	b035d8c2d9	mj12bot	2021-11-27 09:56:12 +01:00
troy	17ced6d294	ip google und mj12	2021-11-27 09:51:13 +01:00
Sebastian Titz	4b54e14522	ln	2021-11-24 15:09:10 +01:00
Sebastian Titz	f1b4aaf23a	Merge branch 'master' of https://git.seemsleg.it/pub/php-func-lib	2021-11-24 13:02:08 +01:00
Sebastian Titz	e6fd1de954	lrln	2021-11-24 13:01:24 +01:00
troy	c631b51ba2	hosteurope ips	2021-11-21 09:17:33 +01:00
Sebastian Titz	3e083b4eb9	ips	2021-11-16 10:14:06 +01:00
Sebastian Titz	0c41265fb6	bot ips	2021-11-05 07:44:33 +01:00
Sebastian Titz	31a0a02366	Merge branch 'master' of https://git.seemsleg.it/pub/php-func-lib	2021-11-03 07:22:50 +01:00
Sebastian Titz	233c9f5aed	& in umlaute	2021-11-03 07:22:04 +01:00
troy	9c034cd935	versuch2 mit single param ohne array umbau	2021-10-15 12:48:41 +02:00
troy	d32ad04722	sql single hotfix	2021-10-15 12:21:19 +02:00
troy	32c65f7da1	sql mit einem param muss nicht mehr mit array geschrieben werden	2021-10-10 16:28:12 +02:00
troy	f736789f5b	.	2021-10-09 13:44:04 +02:00
troy	973a0a1d01	microsoft ip	2021-09-21 15:14:23 +02:00
Sebastian Titz	de82116482	crawlerips	2021-08-26 15:21:59 +02:00
Sebastian Titz	5c7e2f6a8f	abfangen wenn mailtext arrayst	2021-08-26 15:12:49 +02:00
Sebastian Titz	6920c10d2d	remove markdown	2021-08-26 09:18:43 +02:00