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

& in umlaute
versuch2 mit single param ohne array umbau
2021-11-03 07:22:50 +01:00 · 2021-11-03 07:22:04 +01:00 · 2021-10-15 12:48:41 +02:00 · 2021-10-15 12:21:19 +02:00 · 2021-10-10 16:28:12 +02:00 · 2021-10-09 13:44:04 +02:00
5 changed files with 112 additions and 108 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /secret.php
 /config.php
 /test.php
+/_secret.php
--- a/_func.php
+++ b/_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');
 ?>
--- a/ips/crawler.php
+++ b/ips/crawler.php
@@ -1,13 +1,21 @@
 <?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.', //semrush bot
-    '54.36.148.' //ahrefbot
+        '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???
 );
 ?>
--- a/sql.php
+++ b/sql.php
@@ -9,13 +9,13 @@ class SQL {
  public $cnt_set = 0;
  public function __construct() {
    require_once ('secret.php');
-
+    
    $this->m = $_m;
    $this->pre = $_m ['pre'];
    $this->salt = $_m ['salt'];
    if (SQL_LOG)
      $this->f = fopen ( 'sql.log', 'w' );
-
+    
    $this->h = new mysqli ( $_m ['host'], $_m ['user'], $_m ['pass'], $_m ['data'] );
    if ($this->h->connect_errno) {
      return false;
@@ -27,51 +27,55 @@ class SQL {
    $this->cnt_get ++;
    if (SQL_LOG)
      fputs ( $this->f, str_replace ( array (
-          "\n",
-          "	"
+              "\n",
+              "	"
      ), array (
-          ' ',
-          ''
+              ' ',
+              ''
      ), $que ) . "\n" . print_r ( $p, true ) . "\n\n" );
    $statement = $this->h->prepare ( $que );
-    switch (count ( $p )) {
-      case 0 :
-        break;
-      case 1 :
-        $statement->bind_param ( $t, $p [0] );
-        break;
-      case 2 :
-        $statement->bind_param ( $t, $p [0], $p [1] );
-        break;
-      case 3 :
-        $statement->bind_param ( $t, $p [0], $p [1], $p [2] );
-        break;
-      case 4 :
-        $statement->bind_param ( $t, $p [0], $p [1], $p [2], $p [3] );
-        break;
-      case 5 :
-        $statement->bind_param ( $t, $p [0], $p [1], $p [2], $p [3], $p [4] );
-        break;
-      case 6 :
-        $statement->bind_param ( $t, $p [0], $p [1], $p [2], $p [3], $p [4], $p [5] );
-        break;
-      case 7 :
-        $statement->bind_param ( $t, $p [0], $p [1], $p [2], $p [3], $p [4], $p [5], $p [6] );
-        break;
-      case 8 :
-        $statement->bind_param ( $t, $p [0], $p [1], $p [2], $p [3], $p [4], $p [5], $p [6], $p [7] );
-        break;
-      case 9 :
-        $statement->bind_param ( $t, $p [0], $p [1], $p [2], $p [3], $p [4], $p [5], $p [6], $p [7], $p [8] );
-        break;
-      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;
+    if (is_array ( $p )) {
+      switch (count ( $p )) {
+        case 0 :
+          break;
+        case 1 :
+          $statement->bind_param ( $t, $p [0] );
+          break;
+        case 2 :
+          $statement->bind_param ( $t, $p [0], $p [1] );
+          break;
+        case 3 :
+          $statement->bind_param ( $t, $p [0], $p [1], $p [2] );
+          break;
+        case 4 :
+          $statement->bind_param ( $t, $p [0], $p [1], $p [2], $p [3] );
+          break;
+        case 5 :
+          $statement->bind_param ( $t, $p [0], $p [1], $p [2], $p [3], $p [4] );
+          break;
+        case 6 :
+          $statement->bind_param ( $t, $p [0], $p [1], $p [2], $p [3], $p [4], $p [5] );
+          break;
+        case 7 :
+          $statement->bind_param ( $t, $p [0], $p [1], $p [2], $p [3], $p [4], $p [5], $p [6] );
+          break;
+        case 8 :
+          $statement->bind_param ( $t, $p [0], $p [1], $p [2], $p [3], $p [4], $p [5], $p [6], $p [7] );
+          break;
+        case 9 :
+          $statement->bind_param ( $t, $p [0], $p [1], $p [2], $p [3], $p [4], $p [5], $p [6], $p [7], $p [8] );
+          break;
+        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;
+      }
+    } else {
+      $statement->bind_param ( $t, $p );
    }
    $statement->execute ();
-
+    
    $ret = array ();
-
+    
    // print_r($statement);
    if (isset ( $statement->error ) && $statement->error != '') {
      if (SQL_LOG)
@@ -122,60 +126,49 @@ class SQL {
    $statement = $this->h->prepare ( $que );
    if (SQL_LOG)
      fputs ( $this->f, str_replace ( array (
-          "\n",
-          "	"
+              "\n",
+              "	"
      ), array (
-          ' ',
-          ''
+              ' ',
+              ''
      ), $que ) . "\n" . print_r ( $p, true ) . "\n\n" );
-    switch (count ( $p )) {
-      case 0 :
-        break;
-      case 1 :
-        $statement->bind_param ( $t, $p [0] );
-        break;
-      case 2 :
-        $statement->bind_param ( $t, $p [0], $p [1] );
-        break;
-      case 3 :
-        $statement->bind_param ( $t, $p [0], $p [1], $p [2] );
-        break;
-      case 4 :
-        $statement->bind_param ( $t, $p [0], $p [1], $p [2], $p [3] );
-        break;
-      case 5 :
-        $statement->bind_param ( $t, $p [0], $p [1], $p [2], $p [3], $p [4] );
-        break;
-      case 6 :
-        $statement->bind_param ( $t, $p [0], $p [1], $p [2], $p [3], $p [4], $p [5] );
-        break;
-      case 7 :
-        $statement->bind_param ( $t, $p [0], $p [1], $p [2], $p [3], $p [4], $p [5], $p [6] );
-        break;
-      case 8 :
-        $statement->bind_param ( $t, $p [0], $p [1], $p [2], $p [3], $p [4], $p [5], $p [6], $p [7] );
-        break;
-      case 9 :
-        $statement->bind_param ( $t, $p [0], $p [1], $p [2], $p [3], $p [4], $p [5], $p [6], $p [7], $p [8] );
-        break;
-      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] );
-        break;
-      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;
+    if (is_array ( $p )) {
+      switch (count ( $p )) {
+        case 0 :
+          break;
+        case 1 :
+          $statement->bind_param ( $t, $p [0] );
+          break;
+        case 2 :
+          $statement->bind_param ( $t, $p [0], $p [1] );
+          break;
+        case 3 :
+          $statement->bind_param ( $t, $p [0], $p [1], $p [2] );
+          break;
+        case 4 :
+          $statement->bind_param ( $t, $p [0], $p [1], $p [2], $p [3] );
+          break;
+        case 5 :
+          $statement->bind_param ( $t, $p [0], $p [1], $p [2], $p [3], $p [4] );
+          break;
+        case 6 :
+          $statement->bind_param ( $t, $p [0], $p [1], $p [2], $p [3], $p [4], $p [5] );
+          break;
+        case 7 :
+          $statement->bind_param ( $t, $p [0], $p [1], $p [2], $p [3], $p [4], $p [5], $p [6] );
+          break;
+        case 8 :
+          $statement->bind_param ( $t, $p [0], $p [1], $p [2], $p [3], $p [4], $p [5], $p [6], $p [7] );
+          break;
+        case 9 :
+          $statement->bind_param ( $t, $p [0], $p [1], $p [2], $p [3], $p [4], $p [5], $p [6], $p [7], $p [8] );
+          break;
+        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;
+      }
+    } else {
+      $statement->bind_param ( $t, $p );
    }
    $statement->execute ();
    if (isset ( $statement->error ) && $statement->error != '') {
@@ -183,7 +176,7 @@ class SQL {
        fputs ( $this->f, $statement->error );
      return false;
    }
-
+    
    if ($id) {
      return $statement->insert_id;
    } else {
--- a/string.php
+++ b/string.php
@@ -7,7 +7,8 @@ function umlaute($str) {
          'ä',
          'ö',
          'ü',
-          'ß'
+          'ß',
+          '&'
  ), array (
          '&Auml;',
          '&Ouml;',
@@ -15,7 +16,8 @@ function umlaute($str) {
          '&auml;',
          '&ouml;',
          '&uuml;',
-          '&szlig;'
+          '&szlig;',
+          '&amp;'
  ), $str );
 }
 function chk($str) {
@@ -258,8 +260,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) {
Author	SHA1	Message	Date
Sebastian Titz	31a0a02366	Merge branch 'master' of https://git.seemsleg.it/pub/php-func-lib	2021-11-03 07:22:50 +01:00
Sebastian Titz	233c9f5aed	& in umlaute	2021-11-03 07:22:04 +01:00
troy	9c034cd935	versuch2 mit single param ohne array umbau	2021-10-15 12:48:41 +02:00
troy	d32ad04722	sql single hotfix	2021-10-15 12:21:19 +02:00
troy	32c65f7da1	sql mit einem param muss nicht mehr mit array geschrieben werden	2021-10-10 16:28:12 +02:00
troy	f736789f5b	.	2021-10-09 13:44:04 +02:00
troy	973a0a1d01	microsoft ip	2021-09-21 15:14:23 +02:00
Sebastian Titz	de82116482	crawlerips	2021-08-26 15:21:59 +02:00
Sebastian Titz	5c7e2f6a8f	abfangen wenn mailtext arrayst	2021-08-26 15:12:49 +02:00
Sebastian Titz	6920c10d2d	remove markdown	2021-08-26 09:18:43 +02:00
troy	c477afabb0	Merge branch 'master' of https://git.seemsleg.it/pub/php-func-lib Conflicts: ips/crawler.php	2021-08-17 18:33:05 +02:00
troy	ea745b5dbb	ip	2021-08-17 18:31:57 +02:00
troy-grunt	1184d1415a	Bing bot	2021-08-14 00:10:37 +02:00
troy-grunt	2030fbce57	Mj12	2021-08-14 00:07:54 +02:00
troy	5f3879e48c	.	2021-08-08 15:43:04 +02:00
troy	051747f114	linkify bugfix	2021-08-07 09:10:26 +02:00
Sebastian Titz	0a96927e50	seekport	2021-08-03 13:30:05 +02:00
Sebastian Titz	57f254ea39	google bot netz	2021-08-03 07:24:36 +02:00
Sebastian Titz	05903ce02d	ips crawler	2021-07-28 08:34:37 +02:00
Sebastian Titz	9a024c5c88	Merge branch 'master' of https://git.seemsleg.it/pub/php-func-lib into HEAD Conflicts: ips/crawler.php	2021-07-26 15:23:00 +02:00
Sebastian Titz	f9a0e41889	bing bot	2021-07-26 12:33:58 +02:00