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

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

@@ -0,0 +1,21 @@
+<?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.', // 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
+        '192.99.5.225', // ...
+        '157.55.39.' // microsoft???
+);
+?>

sql.php

@@ -34,6 +34,7 @@ class SQL {
               ''
       ), $que ) . "\n" . print_r ( $p, true ) . "\n\n" );
     $statement = $this->h->prepare ( $que );
+    if (is_array ( $p )) {
       switch (count ( $p )) {
         case 0 :
           break;
@@ -68,6 +69,9 @@ class SQL {
           $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;
       }
+    } else {
+      $statement->bind_param ( $t, $p );
+    }
     $statement->execute ();
     
     $ret = array ();
@@ -128,6 +132,7 @@ class SQL {
               ' ',
               ''
       ), $que ) . "\n" . print_r ( $p, true ) . "\n\n" );
+    if (is_array ( $p )) {
       switch (count ( $p )) {
         case 0 :
           break;
@@ -161,21 +166,9 @@ 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] );
+    } else {
-        break;
+      $statement->bind_param ( $t, $p );
-      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;
-      case 13 :
-        $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], $p [12] );
-        break;
-      case 14 :
-        $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], $p [12], $p [13] );
-        break;
-      case 15 :
-        $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], $p [12], $p [13], $p [14] );
-        break;
     }
     $statement->execute ();
     if (isset ( $statement->error ) && $statement->error != '') {

string.php

@@ -7,7 +7,8 @@ function umlaute($str) {
           'ä',
           'ö',
           'ü',
-      'ß'
+          'ß',
+          '&'
   ), array (
           'Ä',
           'Ö',
@@ -15,7 +16,8 @@ function umlaute($str) {
           'ä',
           'ö',
           'ü',
-      'ß'
+          'ß',
+          '&'
   ), $str );
 }
 function chk($str) {
@@ -257,4 +259,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;
+}
 ?>