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

Conflicts: ips/crawler.php
ip
2021-08-17 18:33:05 +02:00 · 2021-08-17 18:31:57 +02:00 · 2021-08-14 00:10:37 +02:00 · 2021-08-14 00:07:54 +02:00 · 2021-08-08 15:43:04 +02:00 · 2021-08-07 09:10:26 +02:00
8 changed files with 259 additions and 233 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /secret.php
 /config.php
 /test.php
+/_secret.php
--- a/README.md
+++ b/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
--- a/ips/crawler.php
+++ b/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
+);
+?>
--- a/mail.php
+++ b/mail.php
@@ -1,14 +1,17 @@
 <?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";
-    $header .= 'X-Mailer: PHP/' . phpversion();
+  $header .= 'X-Mailer: PHP/' . phpversion ();

-    if (mail($an, $betreff, $text, $header) === true) {
+  if (mail ( $an, $betreff, $text, $header ) === true) {
    echo $ok;
  } else {
    echo $error;
--- a/secret.php.example
+++ b/secret.php.example
@@ -7,4 +7,6 @@ $_m['pass'] = '';
 $_m['data'] = '';
 $_m['pre']  = 'efcms2_';
 $_m['salt'] = '';
+
+$_sendermail = 'noreply@troy-grunt.de';
 ?>
--- a/sql.php
+++ b/sql.php
@@ -1,12 +1,4 @@
 <?php
-/*
- * $query = sprintf("SELECT firstname, lastname, address, age FROM friends
- * WHERE firstname='%s' AND lastname='%s'",
- * mysql_real_escape_string($firstname),
- * mysql_real_escape_string($lastname));
- *
- *
- */
 class SQL {
  private $h;
  private $res = false;
@@ -24,95 +16,12 @@ class SQL {
    if (SQL_LOG)
      $this->f = fopen ( 'sql.log', 'w' );

-    $this->h = mysqli_connect ( $_m ['host'], $_m ['user'], $_m ['pass'] );
-    //var_dump ( $this->h );
-    if (! $this->h) {
+    $this->h = new mysqli ( $_m ['host'], $_m ['user'], $_m ['pass'], $_m ['data'] );
+    if ($this->h->connect_errno) {
      return false;
    }
-    mysqli_select_db ( $this->h, $_m ['data'] );
    return true;
  }
-  private function prepare($q, $t, $p) {
-    $t = str_split ( $t );
-    $v = array ();
-    $q = str_replace ( "?", "%s", $q );
-    foreach ( $t as $i => $c ) {
-      switch ($c) {
-        case 's' :
-          $v [] = "'" . mysqli_real_escape_string ( $this->h, $p [$i] ) . "'";
-          break;
-        case 'i' :
-          $v [] = ( int ) $p [$i];
-          break;
-        case 'd' :
-          $v [] = ( double ) $p [$i];
-          break;
-        default :
-        //return false;
-      }
-    }
-
-    $res = array ();
-    switch (count ( $p )) {
-      case 0 :
-        $res = mysqli_query ( $this->h, $q );
-        break;
-      case 1 :
-        $res = mysqli_query ( $this->h, sprintf ( $q, $v [0] ) );
-        break;
-      case 2 :
-        $res = mysqli_query ( $this->h, sprintf ( $q, $v [0], $v [1] ) );
-        break;
-      case 3 :
-        $res = mysqli_query ( $this->h, sprintf ( $q, $v [0], $v [1], $v [2] ) );
-        break;
-      case 4 :
-        $res = mysqli_query ( $this->h, sprintf ( $q, $v [0], $v [1], $v [2], $v [3] ) );
-        break;
-      case 5 :
-        $res = mysqli_query ( $this->h, sprintf ( $q, $v [0], $v [1], $v [2], $v [3], $v [4] ) );
-        break;
-      case 6 :
-        $res = mysqli_query ( $this->h, sprintf ( $q, $v [0], $v [1], $v [2], $v [3], $v [4], $v [5] ) );
-        break;
-      case 7 :
-        $res = mysqli_query ( $this->h, sprintf ( $q, $v [0], $v [1], $v [2], $v [3], $v [4], $v [5], $v [6] ) );
-        break;
-      case 8 :
-        $res = mysqli_query ( $this->h, sprintf ( $q, $v [0], $v [1], $v [2], $v [3], $v [4], $v [5], $v [6], $v [7] ) );
-        break;
-      case 9 :
-        $res = mysqli_query ( $this->h, sprintf ( $q, $v [0], $v [1], $v [2], $v [3], $v [4], $v [5], $v [6], $v [7], $v [8] ) );
-        break;
-      case 10 :
-        $res = mysqli_query ( $this->h, sprintf ( $q, $v [0], $v [1], $v [2], $v [3], $v [4], $v [5], $v [6], $v [7], $v [8], $v [9] ) );
-        break;
-      case 11 :
-        $res = mysqli_query ( $this->h, sprintf ( $q, $v [0], $v [1], $v [2], $v [3], $v [4], $v [5], $v [6], $v [7], $v [8], $v [9], $v [10] ) );
-        break;
-      case 12 :
-        $res = mysqli_query ( $this->h, sprintf ( $q, $v [0], $v [1], $v [2], $v [3], $v [4], $v [5], $v [6], $v [7], $v [8], $v [9], $v [10], $v [11] ) );
-        break;
-      case 13 :
-        $res = mysqli_query ( $this->h, sprintf ( $q, $v [0], $v [1], $v [2], $v [3], $v [4], $v [5], $v [6], $v [7], $v [8], $v [9], $v [10], $v [11], $v [12] ) );
-        break;
-      case 14 :
-        $res = mysqli_query ( $this->h, sprintf ( $q, $v [0], $v [1], $v [2], $v [3], $v [4], $v [5], $v [6], $v [7], $v [8], $v [9], $v [10], $v [11], $v [12], $v [13] ) );
-        break;
-      case 15 :
-        $res = mysqli_query ( $this->h, sprintf ( $q, $v [0], $v [1], $v [2], $v [3], $v [4], $v [5], $v [6], $v [7], $v [8], $v [9], $v [10], $v [11], $v [12], $v [13], $v [14] ) );
-        break;
-    }
-    //echo 'ERROR:';
-    //var_dump ( mysqli_error_list ( $this->h ) );
-    //echo '<br>';
-    /*
-     * if (! $res || mysqli_errno ( $this->h )) {
-     * return false;
-     * }
-     */
-    return $res;
-  }
  public function get($que, $t = '', $p = array ()) {
    // echo $que;
    $this->cnt_get ++;
@@ -124,23 +33,56 @@ class SQL {
          ' ',
          ''
      ), $que ) . "\n" . print_r ( $p, true ) . "\n\n" );
-    $res = $this->prepare ( $que, $t, $p );
-    //var_dump ( $res );
-    //echo '<hr>';
+    $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;
+    }
+    $statement->execute ();
+
    $ret = array ();

    // print_r($statement);
-    if (! $res) {
+    if (isset ( $statement->error ) && $statement->error != '') {
      if (SQL_LOG)
-        fputs ( $this->f, mysqli_error ( $this->h ) );
+        fputs ( $this->f, $statement->error );
      return false;
    }
-    while ( $row = $res->fetch_assoc () ) {
+    $result = $statement->get_result ();
+    // print_r($result);
+    while ( $row = $result->fetch_assoc () ) {
      $ret [] = $row;
    }
-
-    //var_dump ( $ret );
-    //echo '<hr><hr>';
    return $ret;
  }
  public function single($que, $t = '', $p = array ()) {
@@ -177,6 +119,7 @@ class SQL {
  public function set($que, $t = '', $p = array (), $id = false) {
    // echo $que;
    $this->cnt_set ++;
+    $statement = $this->h->prepare ( $que );
    if (SQL_LOG)
      fputs ( $this->f, str_replace ( array (
          "\n",
@@ -185,22 +128,72 @@ class SQL {
          ' ',
          ''
      ), $que ) . "\n" . print_r ( $p, true ) . "\n\n" );
-    $res = $this->prepare ( $que, $t, $p );
-
-    if (! $res) {
+    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;
+    }
+    $statement->execute ();
+    if (isset ( $statement->error ) && $statement->error != '') {
      if (SQL_LOG)
-        fputs ( $this->f, mysqli_error ( $this->h ) );
+        fputs ( $this->f, $statement->error );
      return false;
    }

    if ($id) {
-      return mysqli_insert_id ( $this->h );
+      return $statement->insert_id;
    } else {
-      return ( bool ) mysqli_affected_rows ( $this->h );
+      return $statement->affected_rows;
    }
  }
  function __destruct() {
-    mysqli_close ( $this->h );
+    if (SQL_LOG)
+      $this->h->close ();
+    // echo 'DESTROY';
  }
 }
 ?>
--- a/string.php
+++ b/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;
+}
 ?>
Author	SHA1	Message	Date
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
troy	e17e570114	crawler ips	2021-07-24 09:50:22 +02:00
troy-grunt	50b3d192ba	neue bot ips	2021-07-19 14:22:19 +02:00
Sebastian Titz	b2e6260dfb	in string fkt	2021-07-15 08:56:38 +02:00
admin	ed87d341ab	bot ips zentral sammeln	2021-07-14 20:09:48 +02:00
admin	df5d1447af	Merge branch 'master' of https://git.seemsleg.it/pub/php-func-lib Conflicts: string.php	2021-07-13 21:38:08 +02:00
admin	2352fd5396	linkify tool um urls in text in echte links zu verwandeln	2021-07-13 21:37:14 +02:00
Sebastian Titz	385a02c90f	?	2021-07-12 13:40:12 +02:00
admin	8638f28847	fix only alpha	2021-07-11 10:32:35 +02:00
home	5f2502877b	.	2021-07-10 14:45:56 +02:00
admin	8eccdffb1e	Merge branch 'master' of https://git.seemsleg.it/pub/php-func-lib Conflicts: secret.php.example	2021-05-22 09:25:26 +02:00
admin	c858d5dd32	mail sender update	2021-05-22 09:24:33 +02:00
Sebastian Titz	234e187a54	merge	2021-05-10 13:27:51 +02:00
troy-grunt	d8f5fd7f3a	pub	2021-05-10 09:57:56 +02:00
admin	a30fd21842	Merge branch 'master' of https://git.seemsleg.it/pub/php-func-lib.git into HEAD Conflicts: .gitignore README.md _func.php secret.php.example sql.php	2021-05-09 18:13:15 +02:00
admin	57421ead5e	.	2021-05-09 18:10:53 +02:00
troy-grunt	a846fe2fa7	Initial commit	2021-05-09 15:10:06 +02:00
troy grunt	06a3112617	.	2021-04-09 15:13:07 +02:00
troy grunt	064d8f0df3	Merge branch 'master' of https://git.seemsleg.it/pub/php-func-lib	2021-04-09 15:11:31 +02:00
troy grunt	19dcea8344	Merge branch 'master' of https://git.seemsleg.it/pub/php-func-lib Conflicts: README.md	2021-04-09 15:04:31 +02:00
troy-grunt	b8e078f470	Initial commit	2021-04-06 13:39:59 +02:00