markdown ready for repair

Conflicts:
	ips/crawler.php

.gitignore

@@ -3,3 +3,4 @@
 /secret.php
 /config.php
 /test.php
+/_secret.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,8 +1,11 @@
 <?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 )) {
+    $sender = $_sendermail;
+  }
+  $header = 'From: ' . $sender . "\r\n";
   $header .= 'To: ' . $an . "\r\n";
   $header .= 'Content-Type:text/html' . "\r\n";
   $header .= 'Content-Transfer-Encoding: 8bit' . "\r\n";

secret.php.example

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

string.php

@@ -257,4 +257,14 @@ function onlySimpleHTML($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;
+}
 ?>