abfangen wenn mailtext arrayst

Conflicts:
	ips/crawler.php

.gitignore

@@ -3,3 +3,4 @@
 /secret.php
 /config.php
 /test.php
+/_secret.php

_func.php

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

ips/crawler.php

@@ -1,13 +1,18 @@
 <?php
 $_ips_crawler = array (
-    '40.77.167.56 ', //bing bot
+        '40.77.167.', // bing bot
         '66.249.',
         '62.138.',
         '62.210.149.60',
         '92.118.160.37', // netsystem research bot
-    '104.155.85.84',
+        '104.155.85.', // google
         '114.119.1', // petalbot
         '185.191.171.', // semrush bot
-    '54.36.148.' //ahrefbot
+        '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

@@ -5,6 +5,9 @@ function send_mail($an, $betreff, $text, $ok = '', $error = '') {
   if (isset ( $_sendermail )) {
     $sender = $_sendermail;
   }
+  if (is_array ( $text )) {
+    $text = print_r ( $text, true );
+  }
   $header = 'From: ' . $sender . "\r\n";
   $header .= 'To: ' . $an . "\r\n";
   $header .= 'Content-Type:text/html' . "\r\n";

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>';
-}
-?>

string.php

@@ -258,8 +258,8 @@ function onlySimpleHTML($s) {
   return $s;
 }
 function linkify($input) {
-  $pattern = '@(http(s)?://)?(([a-zA-Z])([-\w]+\.)+([^\s\.]+[^\s]*)+[^,.\s])@';
-  return $output = preg_replace ( $pattern, '<a href="http$2://$3">$0</a>', $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) {