abfangen wenn mailtext arrayst

Conflicts:
	ips/crawler.php

.gitignore

@@ -1,5 +1,6 @@
-/.buildpath
+/.buildpath
-/.project
+/.project
-/secret.php
+/secret.php
-/config.php
+/config.php
 /test.php
+/_secret.php

README.md

@@ -1,3 +1,2 @@
-git submodule add https://git.seemsleg.it/ef/php-func-lib lib
+# php-func-lib
-
+git submodule add https://git.seemsleg.it/pub/php-func-lib lib
-test

_func.php

@@ -1,10 +1,10 @@
-<?php
+<?php
-// include ('config.php');
+// include ('config.php');
-include_once ('sql.php');
+include_once ('sql.php');
-$sql = new SQL ();
+$sql = new SQL ();
-include_once ('string.php');
+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 ('markdown.php');
+// include_once ('markdown.php');
 ?>

ips/crawler.php

@@ -0,0 +1,18 @@
+<?php
+$_ips_crawler = array (
+        '40.77.167.', // bing bot
+        '66.249.',
+        '62.138.',
+        '62.210.149.60',
+        '92.118.160.37', // netsystem research bot
+        '104.155.85.', // google
+        '114.119.1', // petalbot
+        '185.191.171.', // semrush bot
+        '207.46.13.124', // bing bot
+        '54.36.148.', // ahrefbot
+        '216.244.66.196', // opensiteexplorer
+        '65.21.180.26', // seekport
+        '81.209.177.145', // website-datenbank.de
+        '2a01:4f8:190:4244::2' // mj12bot
+);
+?>

mail.php

@@ -1,17 +1,23 @@
 <?php
-
+function send_mail($an, $betreff, $text, $ok = '', $error = '') {
-function send_mail($an, $betreff, $text, $ok = '', $error = '')
+  include 'secret.php';
-{
+  $sender = 'noreply@troy-grunt.de';
-    $header = 'From: noreply@isleofhope.de' . "\r\n";
+  if (isset ( $_sendermail )) {
-    $header .= 'To: ' . $an . "\r\n";
+    $sender = $_sendermail;
-    $header .= 'Content-Type:text/html' . "\r\n";
+  }
-    $header .= 'Content-Transfer-Encoding: 8bit' . "\r\n";
+  if (is_array ( $text )) {
-    $header .= 'X-Mailer: PHP/' . phpversion();
+    $text = print_r ( $text, true );
-
+  }
-    if (mail($an, $betreff, $text, $header) === true) {
+  $header = 'From: ' . $sender . "\r\n";
-        echo $ok;
+  $header .= 'To: ' . $an . "\r\n";
-    } else {
+  $header .= 'Content-Type:text/html' . "\r\n";
-        echo $error;
+  $header .= 'Content-Transfer-Encoding: 8bit' . "\r\n";
-    }
+  $header .= 'X-Mailer: PHP/' . phpversion ();
+  
+  if (mail ( $an, $betreff, $text, $header ) === true) {
+    echo $ok;
+  } else {
+    echo $error;
+  }
 }
 

markdown.php

@@ -1,84 +0,0 @@
-<?php
-// TODO markdown imple
-function md($str) {
-  // return nl2br ( $str ); // TODO md problem
-  $text = '<p>';
-  $lv = 0;
-  $str = explode ( "\n", str_replace ( "\r\n", "\n", $str ) );
-  // var_dump ( $str );
-  foreach ( $str as $t ) {
-    // echo '<pre>' . $t . '</pre>';
-    $t = preg_replace_callback ( '/\[\[([^\]]*)\]\]/m', '_md_link_replacer', $t );
-    $nlv = 0;
-    if (startsWith ( $t, '**** ' )) {
-      // echo - 1;
-      $t = substr ( $t, 5 );
-      $nlv = 4;
-    }
-    if (startsWith ( $t, '*** ' )) {
-      // echo - 2;
-      $t = substr ( $t, 4 );
-      $nlv = 3;
-    }
-    if (startsWith ( $t, '** ' )) {
-      // echo - 3;
-      $t = substr ( $t, 3 );
-      $nlv = 2;
-    }
-    if (startsWith ( $t, '* ' )) {
-      // echo - 4;
-      $t = substr ( $t, 2 );
-      $nlv = 1;
-    }
-    if ($lv != $nlv) {
-      while ( $lv < $nlv ) {
-        // echo '-5 (' . $lv . '-' . $nlv . ')';
-        $text .= '<ul>';
-        $lv ++;
-      }
-      while ( $lv > $nlv ) {
-        // echo '-6 (' . $lv . '-' . $nlv . ')';
-        $text .= '</ul>';
-        $lv --;
-      }
-    }
-    if (startsWith ( $t, '!!!!! ' )) {
-      $t = '<h5>' . substr ( $t, 6 ) . '</h5>';
-    }
-    if (startsWith ( $t, '!!!! ' )) {
-      $t = '<h4>' . substr ( $t, 5 ) . '</h4>';
-    }
-    if (startsWith ( $t, '!!! ' )) {
-      $t = '<h3>' . substr ( $t, 4 ) . '</h3>';
-    }
-    if (startsWith ( $t, '!! ' )) {
-      $t = '<h2>' . substr ( $t, 3 ) . '</h2>';
-    }
-    if (startsWith ( $t, '! ' )) {
-      $t = '<h1>' . substr ( $t, 2 ) . '</h1>';
-    }
-    if ($lv == 0) {
-      if ($t == '') {
-        $text .= '</p><p>';
-      } else {
-        $text .= $t;
-      }
-    } else {
-      $text .= '<li>' . $t . '</li>';
-    }
-    // var_dump ( $t );
-  }
-  while ( $lv > 0 ) {
-    $text .= '</ul>';
-    $lv --;
-  }
-  $text .= '</p>';
-  return $text;
-}
-function _md_link_replacer($in) {
-  // var_dump ( $in );
-  $in = explode ( '|', $in [1], 2 );
-
-  return '<a href="' . $in [0] . '" target="_blank">' . (isset ( $in [1] ) ? $in [1] : $in [0]) . '</a>';
-}
-?>

secret.php.example

@@ -7,4 +7,6 @@ $_m['pass'] = '';
 $_m['data'] = '';
 $_m['pre']  = 'efcms2_';
 $_m['salt'] = '';
+
+$_sendermail = 'noreply@troy-grunt.de';
 ?>

sql.php

@@ -196,4 +196,4 @@ class SQL {
     // echo 'DESTROY';
   }
 }
-?>
+?>

string.php

@@ -1,21 +1,21 @@
 <?php
 function umlaute($str) {
   return str_replace ( array (
-      'Ä',
+          'Ä',
-      'Ö',
+          'Ö',
-      'Ü',
+          'Ü',
-      'ä',
+          'ä',
-      'ö',
+          'ö',
-      'ü',
+          'ü',
-      'ß'
+          'ß'
   ), array (
-      '&Auml;',
+          '&Auml;',
-      '&Ouml;',
+          '&Ouml;',
-      '&Uuml;',
+          '&Uuml;',
-      '&auml;',
+          '&auml;',
-      '&ouml;',
+          '&ouml;',
-      '&uuml;',
+          '&uuml;',
-      '&szlig;'
+          '&szlig;'
   ), $str );
 }
 function chk($str) {
@@ -23,17 +23,17 @@ function chk($str) {
 }
 function noScript($str) {
   return str_replace ( array (
-      '<',
+          '<',
-      '>'
+          '>'
   ), array (
-      '&lt;',
+          '&lt;',
-      '&gt;'
+          '&gt;'
   ), $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 );
@@ -47,7 +47,7 @@ function startsWith($haystack, $needle) {
 }
 function endsWith($haystack, $needle) {
   $length = strlen ( $needle );
-
+  
   return $length === 0 || (substr ( $haystack, - $length ) === $needle);
 }
 function onlyAlpha($str, $zus = '') {
@@ -127,134 +127,144 @@ function markUp($text) {
 }
 function onlySimpleHTML($s) {
   $s = str_replace ( array (
-      '<',
+          '<',
-      '>'
+          '>'
   ), array (
-      '{{|-&lt;-|}}',
+          '{{|-&lt;-|}}',
-      '{{|-&gt;-|}}'
+          '{{|-&gt;-|}}'
   ), $s );
   $s = str_replace ( array (
-      '{{|-&lt;-|}}b{{|-&gt;-|}}',
+          '{{|-&lt;-|}}b{{|-&gt;-|}}',
-      '{{|-&lt;-|}}b/{{|-&gt;-|}}'
+          '{{|-&lt;-|}}b/{{|-&gt;-|}}'
   ), array (
-      '<b>',
+          '<b>',
-      '<b/>'
+          '<b/>'
   ), $s );
   $s = str_replace ( array (
-      '{{|-&lt;-|}}u{{|-&gt;-|}}',
+          '{{|-&lt;-|}}u{{|-&gt;-|}}',
-      '{{|-&lt;-|}}u/{{|-&gt;-|}}'
+          '{{|-&lt;-|}}u/{{|-&gt;-|}}'
   ), array (
-      '<u>',
+          '<u>',
-      '<u/>'
+          '<u/>'
   ), $s );
   $s = str_replace ( array (
-      '{{|-&lt;-|}}i{{|-&gt;-|}}',
+          '{{|-&lt;-|}}i{{|-&gt;-|}}',
-      '{{|-&lt;-|}}i/{{|-&gt;-|}}'
+          '{{|-&lt;-|}}i/{{|-&gt;-|}}'
   ), array (
-      '<i>',
+          '<i>',
-      '<i/>'
+          '<i/>'
   ), $s );
   $s = str_replace ( array (
-      '{{|-&lt;-|}}span{{|-&gt;-|}}',
+          '{{|-&lt;-|}}span{{|-&gt;-|}}',
-      '{{|-&lt;-|}}span/{{|-&gt;-|}}'
+          '{{|-&lt;-|}}span/{{|-&gt;-|}}'
   ), array (
-      '<span>',
+          '<span>',
-      '<span/>'
+          '<span/>'
   ), $s );
   $s = str_replace ( array (
-      '{{|-&lt;-|}}b{{|-&gt;-|}}',
+          '{{|-&lt;-|}}b{{|-&gt;-|}}',
-      '{{|-&lt;-|}}b/{{|-&gt;-|}}'
+          '{{|-&lt;-|}}b/{{|-&gt;-|}}'
   ), array (
-      '<b>',
+          '<b>',
-      '<b/>'
+          '<b/>'
   ), $s );
   $s = str_replace ( array (
-      '{{|-&lt;-|}}br{{|-&gt;-|}}',
+          '{{|-&lt;-|}}br{{|-&gt;-|}}',
-      '{{|-&lt;-|}}br/{{|-&gt;-|}}'
+          '{{|-&lt;-|}}br/{{|-&gt;-|}}'
   ), array (
-      '<br>',
+          '<br>',
-      '<br/>'
+          '<br/>'
   ), $s );
   $s = str_replace ( array (
-      '{{|-&lt;-|}}h1{{|-&gt;-|}}',
+          '{{|-&lt;-|}}h1{{|-&gt;-|}}',
-      '{{|-&lt;-|}}h1/{{|-&gt;-|}}'
+          '{{|-&lt;-|}}h1/{{|-&gt;-|}}'
   ), array (
-      '<h1>',
+          '<h1>',
-      '<h1/>'
+          '<h1/>'
   ), $s );
   $s = str_replace ( array (
-      '{{|-&lt;-|}}h2{{|-&gt;-|}}',
+          '{{|-&lt;-|}}h2{{|-&gt;-|}}',
-      '{{|-&lt;-|}}h2/{{|-&gt;-|}}'
+          '{{|-&lt;-|}}h2/{{|-&gt;-|}}'
   ), array (
-      '<h2>',
+          '<h2>',
-      '<h2/>'
+          '<h2/>'
   ), $s );
   $s = str_replace ( array (
-      '{{|-&lt;-|}}h3{{|-&gt;-|}}',
+          '{{|-&lt;-|}}h3{{|-&gt;-|}}',
-      '{{|-&lt;-|}}h3/{{|-&gt;-|}}'
+          '{{|-&lt;-|}}h3/{{|-&gt;-|}}'
   ), array (
-      '<h3>',
+          '<h3>',
-      '<h3/>'
+          '<h3/>'
   ), $s );
   $s = str_replace ( array (
-      '{{|-&lt;-|}}h4{{|-&gt;-|}}',
+          '{{|-&lt;-|}}h4{{|-&gt;-|}}',
-      '{{|-&lt;-|}}h4/{{|-&gt;-|}}'
+          '{{|-&lt;-|}}h4/{{|-&gt;-|}}'
   ), array (
-      '<h4>',
+          '<h4>',
-      '<h4/>'
+          '<h4/>'
   ), $s );
   $s = str_replace ( array (
-      '{{|-&lt;-|}}h5{{|-&gt;-|}}',
+          '{{|-&lt;-|}}h5{{|-&gt;-|}}',
-      '{{|-&lt;-|}}h5/{{|-&gt;-|}}'
+          '{{|-&lt;-|}}h5/{{|-&gt;-|}}'
   ), array (
-      '<h5>',
+          '<h5>',
-      '<h5/>'
+          '<h5/>'
   ), $s );
   $s = str_replace ( array (
-      '{{|-&lt;-|}}h6{{|-&gt;-|}}',
+          '{{|-&lt;-|}}h6{{|-&gt;-|}}',
-      '{{|-&lt;-|}}h6/{{|-&gt;-|}}'
+          '{{|-&lt;-|}}h6/{{|-&gt;-|}}'
   ), array (
-      '<h6>',
+          '<h6>',
-      '<h6/>'
+          '<h6/>'
   ), $s );
   $s = str_replace ( array (
-      '{{|-&lt;-|}}li{{|-&gt;-|}}',
+          '{{|-&lt;-|}}li{{|-&gt;-|}}',
-      '{{|-&lt;-|}}li/{{|-&gt;-|}}'
+          '{{|-&lt;-|}}li/{{|-&gt;-|}}'
   ), array (
-      '<li>',
+          '<li>',
-      '<li/>'
+          '<li/>'
   ), $s );
   $s = str_replace ( array (
-      '{{|-&lt;-|}}ul{{|-&gt;-|}}',
+          '{{|-&lt;-|}}ul{{|-&gt;-|}}',
-      '{{|-&lt;-|}}ul/{{|-&gt;-|}}'
+          '{{|-&lt;-|}}ul/{{|-&gt;-|}}'
   ), array (
-      '<ul>',
+          '<ul>',
-      '<ul/>'
+          '<ul/>'
   ), $s );
   $s = str_replace ( array (
-      '{{|-&lt;-|}}ol{{|-&gt;-|}}',
+          '{{|-&lt;-|}}ol{{|-&gt;-|}}',
-      '{{|-&lt;-|}}ol/{{|-&gt;-|}}'
+          '{{|-&lt;-|}}ol/{{|-&gt;-|}}'
   ), array (
-      '<ol>',
+          '<ol>',
-      '<ol/>'
+          '<ol/>'
   ), $s );
   $s = str_replace ( array (
-      '{{|-&lt;-|}}pre{{|-&gt;-|}}',
+          '{{|-&lt;-|}}pre{{|-&gt;-|}}',
-      '{{|-&lt;-|}}pre/{{|-&gt;-|}}'
+          '{{|-&lt;-|}}pre/{{|-&gt;-|}}'
   ), array (
-      '<pre>',
+          '<pre>',
-      '<pre/>'
+          '<pre/>'
   ), $s );
-
+  
   // cleanup
   $s = str_replace ( array (
-      '{{|-',
+          '{{|-',
-      '-|}}'
+          '-|}}'
   ), array (
-      '',
+          '',
-      ''
+          ''
   ), $s );
-
+  
   return $s;
 }
+function linkify($input) {
+  $pattern = '@(http(s)?://[a-zA-Z0-9/\.\#\-\_]*)@';
+  return $output = preg_replace ( $pattern, '<a href="$1">$1</a>', $input );
+}
+function inStr($needle, $haystack) {
+  if (strpos ( $haystack, $needle ) !== false) {
+    return true;
+  }
+  return false;
+}
 ?>