Merge branch 'master' of https://git.seemsleg.it/pub/php-func-lib into

HEAD

Conflicts:
	ips/crawler.php

README.md

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

ips/crawler.php

@@ -0,0 +1,14 @@
+<?php
+$_ips_crawler = array (
+        '40.77.167.56 ', // bing bot
+        '66.249.',
+        '62.138.',
+        '62.210.149.60',
+        '92.118.160.37', // netsystem research bot
+        '104.155.85.84',
+        '114.119.1', // petalbot
+        '185.191.171.6', // semrush bot
+        '207.46.13.124', // bing bot
+        '54.36.148.' //ahrefbot
+);
+?>

mail.php

@@ -1,8 +1,11 @@
 <?php
-
-function send_mail($an, $betreff, $text, $ok = '', $error = '')
-{
-    $header = 'From: noreply@isleofhope.de' . "\r\n";
+function send_mail($an, $betreff, $text, $ok = '', $error = '') {
+  include 'secret.php';
+  $sender = 'noreply@troy-grunt.de';
+  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-Z])([-\w]+\.)+([^\s\.]+[^\s]*)+[^,.\s])@';
+  return $output = preg_replace ( $pattern, '<a href="http$2://$3">$0</a>', $input );
+}
+function inStr($needle, $haystack) {
+  if (strpos ( $haystack, $needle ) !== false) {
+    return true;
+  }
+  return false;
+}
 ?>