Merge pull request 'feature/better-email' (#2 ) from feature/better-email into master

Reviewed-on: #2
phpMailer eingebaut
2022-11-12 11:13:39 +01:00 · 2022-11-12 11:10:59 +01:00 · 2022-11-11 14:41:11 +01:00 · 2022-11-11 13:20:20 +01:00 · 2022-10-28 17:15:53 +02:00 · 2022-09-23 07:21:14 +02:00
6 changed files with 6620 additions and 22 deletions
--- a/ips/crawler.php
+++ b/ips/crawler.php
@@ -1,29 +1,32 @@
 <?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
-        '185.191.171.', // semrush bot
-        '207.46.13.', // bing bot
-        '54.36.148.', // ahrefbot
-        '54.36.149.', // ahrefbot
-        '216.244.66.196', // opensiteexplorer
-        '65.21.180.26', // seekport
-        '81.209.177.145', // website-datenbank.de
-        '2a01:4f8:190:4244::2', // mj12bot
        '144.76.15.153', // mj12bot
-        '192.99.5.225', // ...
-        '157.55.39.', // microsoft???
-        '2a01:4f8:162:43c5::2', // mj12bot
-        '85.25.177.', // abuse
-        '85.25.210.', // hosteurope abuse
-        '34.79.234.76', // google
        '148.251.120.201', // mj12bot
-        '205.185.115.87' //sex spam
+        '157.55.39.', // microsoft???
+        '172.217.', //google
+        '176.125.230.38', //sql inj
+        '185.191.171.', // semrush bot
+        '192.99.5.225', // ...
+        '205.185.115.87', //sex spam
+        '207.46.13.', // bing bot
+        '216.58.', //google
+        '216.244.66.196', // opensiteexplorer
+        '2a01:4f8:190:4244::2', // mj12bot
+        '2a01:4f8:162:43c5::2', // mj12bot
 );
 function checkHuman() {
  global $_ips_crawler;
--- 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,70 @@ 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 = '') {
+  $boundary = md5($an.$betreff.$text.time());
+  include 'secret.php';
+  $sender = 'noreply@troy-grunt.de';
+  if (isset ( $_sendermail )) {
+    $sender = $_sendermail;
+  }
+  include 'php-mailer/SMTP.php';
+  include 'php-mailer/PHPMailer.php';
+  $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->addAddress($an);
+  $mail->Subject = $betreff;
+  $mail->msgHTML('<html><body>'.$text.'</body></html>');
+  $mail->AltBody = strip_tags($text);
+  //$mail->addAttachment('images/phpmailer_mini.png');
+
+  if (!$mail->send()) {
+    echo 'Mailer Error: ' . $mail->ErrorInfo;
+  } else {
+      echo 'Message sent!';
+  }
+}
+
+?>
--- 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
@@ -166,6 +166,12 @@ class SQL {
        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 );
Author	SHA1	Message	Date
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