3 Commits

Author SHA1 Message Date
troy grunt
c13739e81f hotfixes 2021-04-01 22:08:16 +02:00
troy grunt
c414ec0917 dürfte passen 2021-04-01 21:24:02 +02:00
troy grunt
0d1c93bdb5 SQL update 2021-04-01 19:17:50 +02:00
8 changed files with 245 additions and 272 deletions

9
.gitignore vendored
View File

@@ -1,6 +1,5 @@
/.buildpath /.buildpath
/.project /.project
/secret.php /secret.php
/config.php /config.php
/test.php /test.php
/_secret.php

View File

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

View File

@@ -1,10 +1,10 @@
<?php <?php
// include ('config.php'); // include ('config.php');
include_once ('sql.php'); include_once ('sql.php');
$sql = new SQL (); $sql = new SQL ();
include_once ('string.php'); include_once ('string.php');
include_once ('numbers.php'); include_once ('numbers.php');
include_once ('mail.php'); include_once ('mail.php');
include_once ('debug.php'); include_once ('debug.php');
// include_once ('markdown.php'); include_once ('markdown.php');
?> ?>

View File

@@ -1,24 +0,0 @@
<?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???
'2a01:4f8:162:43c5::2', // mj12bot
'85.25.177.', // abuse
'85.25.210.' // hosteurope abuse
);
?>

View File

@@ -1,20 +1,17 @@
<?php <?php
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 ();
if (mail ( $an, $betreff, $text, $header ) === true) { function send_mail($an, $betreff, $text, $ok = '', $error = '')
echo $ok; {
} else { $header = 'From: noreply@isleofhope.de' . "\r\n";
echo $error; $header .= 'To: ' . $an . "\r\n";
} $header .= 'Content-Type:text/html' . "\r\n";
$header .= 'Content-Transfer-Encoding: 8bit' . "\r\n";
$header .= 'X-Mailer: PHP/' . phpversion();
if (mail($an, $betreff, $text, $header) === true) {
echo $ok;
} else {
echo $error;
}
} }

View File

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

230
sql.php
View File

@@ -1,4 +1,12 @@
<?php <?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 { class SQL {
private $h; private $h;
private $res = false; private $res = false;
@@ -9,84 +17,130 @@ class SQL {
public $cnt_set = 0; public $cnt_set = 0;
public function __construct() { public function __construct() {
require_once ('secret.php'); require_once ('secret.php');
$this->m = $_m; $this->m = $_m;
$this->pre = $_m ['pre']; $this->pre = $_m ['pre'];
$this->salt = $_m ['salt']; $this->salt = $_m ['salt'];
if (SQL_LOG) if (SQL_LOG)
$this->f = fopen ( 'sql.log', 'w' ); $this->f = fopen ( 'sql.log', 'w' );
$this->h = new mysqli ( $_m ['host'], $_m ['user'], $_m ['pass'], $_m ['data'] ); $this->h = mysqli_connect ( $_m ['host'], $_m ['user'], $_m ['pass'] );
if ($this->h->connect_errno) { //var_dump ( $this->h );
if (! $this->h) {
return false; return false;
} }
mysqli_select_db ( $this->h, $_m ['data'] );
return true; 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 ()) { public function get($que, $t = '', $p = array ()) {
// echo $que; // echo $que;
$this->cnt_get ++; $this->cnt_get ++;
if (SQL_LOG) if (SQL_LOG)
fputs ( $this->f, str_replace ( array ( fputs ( $this->f, str_replace ( array (
"\n", "\n",
" " " "
), array ( ), array (
' ', ' ',
'' ''
), $que ) . "\n" . print_r ( $p, true ) . "\n\n" ); ), $que ) . "\n" . print_r ( $p, true ) . "\n\n" );
$statement = $this->h->prepare ( $que ); $res = $this->prepare ( $que, $t, $p );
if (is_array ( $p )) { //var_dump ( $res );
switch (count ( $p )) { //echo '<hr>';
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 (); $ret = array ();
// print_r($statement); // print_r($statement);
if (isset ( $statement->error ) && $statement->error != '') { if (! $res) {
if (SQL_LOG) if (SQL_LOG)
fputs ( $this->f, $statement->error ); fputs ( $this->f, mysqli_error ( $this->h ) );
return false; return false;
} }
$result = $statement->get_result (); while ( $row = $res->fetch_assoc () ) {
// print_r($result);
while ( $row = $result->fetch_assoc () ) {
$ret [] = $row; $ret [] = $row;
} }
//var_dump ( $ret );
//echo '<hr><hr>';
return $ret; return $ret;
} }
public function single($que, $t = '', $p = array ()) { public function single($que, $t = '', $p = array ()) {
@@ -123,70 +177,30 @@ class SQL {
public function set($que, $t = '', $p = array (), $id = false) { public function set($que, $t = '', $p = array (), $id = false) {
// echo $que; // echo $que;
$this->cnt_set ++; $this->cnt_set ++;
$statement = $this->h->prepare ( $que );
if (SQL_LOG) if (SQL_LOG)
fputs ( $this->f, str_replace ( array ( fputs ( $this->f, str_replace ( array (
"\n", "\n",
" " " "
), array ( ), array (
' ', ' ',
'' ''
), $que ) . "\n" . print_r ( $p, true ) . "\n\n" ); ), $que ) . "\n" . print_r ( $p, true ) . "\n\n" );
if (is_array ( $p )) { $res = $this->prepare ( $que, $t, $p );
switch (count ( $p )) {
case 0 : if (! $res) {
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 != '') {
if (SQL_LOG) if (SQL_LOG)
fputs ( $this->f, $statement->error ); fputs ( $this->f, mysqli_error ( $this->h ) );
return false; return false;
} }
if ($id) { if ($id) {
return $statement->insert_id; return mysqli_insert_id ( $this->h );
} else { } else {
return $statement->affected_rows; return ( bool ) mysqli_affected_rows ( $this->h );
} }
} }
function __destruct() { function __destruct() {
if (SQL_LOG) mysqli_close ( $this->h );
$this->h->close ();
// echo 'DESTROY';
} }
} }
?> ?>

View File

@@ -1,23 +1,21 @@
<?php <?php
function umlaute($str) { function umlaute($str) {
return str_replace ( array ( return str_replace ( array (
'Ä', 'Ä',
'Ö', 'Ö',
'Ü', 'Ü',
'ä', 'ä',
'ö', 'ö',
'ü', 'ü',
'ß', 'ß'
'&'
), array ( ), array (
'&Auml;', '&Auml;',
'&Ouml;', '&Ouml;',
'&Uuml;', '&Uuml;',
'&auml;', '&auml;',
'&ouml;', '&ouml;',
'&uuml;', '&uuml;',
'&szlig;', '&szlig;'
'&amp;'
), $str ); ), $str );
} }
function chk($str) { function chk($str) {
@@ -25,17 +23,17 @@ function chk($str) {
} }
function noScript($str) { function noScript($str) {
return str_replace ( array ( return str_replace ( array (
'<', '<',
'>' '>'
), array ( ), array (
'&lt;', '&lt;',
'&gt;' '&gt;'
), $str ); ), $str );
} }
function random($name_laenge) { function random($name_laenge) {
$zeichen = "abcedfghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRTSUVWXYZ0123456789"; $zeichen = "abcedfghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRTSUVWXYZ0123456789";
$name_neu = ""; $name_neu = "";
@mt_srand ( ( double ) microtime () * 1000000 ); @mt_srand ( ( double ) microtime () * 1000000 );
for($i = 0; $i < $name_laenge; $i ++) { for($i = 0; $i < $name_laenge; $i ++) {
$r = mt_rand ( 0, strlen ( $zeichen ) - 1 ); $r = mt_rand ( 0, strlen ( $zeichen ) - 1 );
@@ -49,7 +47,7 @@ function startsWith($haystack, $needle) {
} }
function endsWith($haystack, $needle) { function endsWith($haystack, $needle) {
$length = strlen ( $needle ); $length = strlen ( $needle );
return $length === 0 || (substr ( $haystack, - $length ) === $needle); return $length === 0 || (substr ( $haystack, - $length ) === $needle);
} }
function onlyAlpha($str, $zus = '') { function onlyAlpha($str, $zus = '') {
@@ -129,144 +127,134 @@ function markUp($text) {
} }
function onlySimpleHTML($s) { function onlySimpleHTML($s) {
$s = str_replace ( array ( $s = str_replace ( array (
'<', '<',
'>' '>'
), array ( ), array (
'{{|-&lt;-|}}', '{{|-&lt;-|}}',
'{{|-&gt;-|}}' '{{|-&gt;-|}}'
), $s ); ), $s );
$s = str_replace ( array ( $s = str_replace ( array (
'{{|-&lt;-|}}b{{|-&gt;-|}}', '{{|-&lt;-|}}b{{|-&gt;-|}}',
'{{|-&lt;-|}}b/{{|-&gt;-|}}' '{{|-&lt;-|}}b/{{|-&gt;-|}}'
), array ( ), array (
'<b>', '<b>',
'<b/>' '<b/>'
), $s ); ), $s );
$s = str_replace ( array ( $s = str_replace ( array (
'{{|-&lt;-|}}u{{|-&gt;-|}}', '{{|-&lt;-|}}u{{|-&gt;-|}}',
'{{|-&lt;-|}}u/{{|-&gt;-|}}' '{{|-&lt;-|}}u/{{|-&gt;-|}}'
), array ( ), array (
'<u>', '<u>',
'<u/>' '<u/>'
), $s ); ), $s );
$s = str_replace ( array ( $s = str_replace ( array (
'{{|-&lt;-|}}i{{|-&gt;-|}}', '{{|-&lt;-|}}i{{|-&gt;-|}}',
'{{|-&lt;-|}}i/{{|-&gt;-|}}' '{{|-&lt;-|}}i/{{|-&gt;-|}}'
), array ( ), array (
'<i>', '<i>',
'<i/>' '<i/>'
), $s ); ), $s );
$s = str_replace ( array ( $s = str_replace ( array (
'{{|-&lt;-|}}span{{|-&gt;-|}}', '{{|-&lt;-|}}span{{|-&gt;-|}}',
'{{|-&lt;-|}}span/{{|-&gt;-|}}' '{{|-&lt;-|}}span/{{|-&gt;-|}}'
), array ( ), array (
'<span>', '<span>',
'<span/>' '<span/>'
), $s ); ), $s );
$s = str_replace ( array ( $s = str_replace ( array (
'{{|-&lt;-|}}b{{|-&gt;-|}}', '{{|-&lt;-|}}b{{|-&gt;-|}}',
'{{|-&lt;-|}}b/{{|-&gt;-|}}' '{{|-&lt;-|}}b/{{|-&gt;-|}}'
), array ( ), array (
'<b>', '<b>',
'<b/>' '<b/>'
), $s ); ), $s );
$s = str_replace ( array ( $s = str_replace ( array (
'{{|-&lt;-|}}br{{|-&gt;-|}}', '{{|-&lt;-|}}br{{|-&gt;-|}}',
'{{|-&lt;-|}}br/{{|-&gt;-|}}' '{{|-&lt;-|}}br/{{|-&gt;-|}}'
), array ( ), array (
'<br>', '<br>',
'<br/>' '<br/>'
), $s ); ), $s );
$s = str_replace ( array ( $s = str_replace ( array (
'{{|-&lt;-|}}h1{{|-&gt;-|}}', '{{|-&lt;-|}}h1{{|-&gt;-|}}',
'{{|-&lt;-|}}h1/{{|-&gt;-|}}' '{{|-&lt;-|}}h1/{{|-&gt;-|}}'
), array ( ), array (
'<h1>', '<h1>',
'<h1/>' '<h1/>'
), $s ); ), $s );
$s = str_replace ( array ( $s = str_replace ( array (
'{{|-&lt;-|}}h2{{|-&gt;-|}}', '{{|-&lt;-|}}h2{{|-&gt;-|}}',
'{{|-&lt;-|}}h2/{{|-&gt;-|}}' '{{|-&lt;-|}}h2/{{|-&gt;-|}}'
), array ( ), array (
'<h2>', '<h2>',
'<h2/>' '<h2/>'
), $s ); ), $s );
$s = str_replace ( array ( $s = str_replace ( array (
'{{|-&lt;-|}}h3{{|-&gt;-|}}', '{{|-&lt;-|}}h3{{|-&gt;-|}}',
'{{|-&lt;-|}}h3/{{|-&gt;-|}}' '{{|-&lt;-|}}h3/{{|-&gt;-|}}'
), array ( ), array (
'<h3>', '<h3>',
'<h3/>' '<h3/>'
), $s ); ), $s );
$s = str_replace ( array ( $s = str_replace ( array (
'{{|-&lt;-|}}h4{{|-&gt;-|}}', '{{|-&lt;-|}}h4{{|-&gt;-|}}',
'{{|-&lt;-|}}h4/{{|-&gt;-|}}' '{{|-&lt;-|}}h4/{{|-&gt;-|}}'
), array ( ), array (
'<h4>', '<h4>',
'<h4/>' '<h4/>'
), $s ); ), $s );
$s = str_replace ( array ( $s = str_replace ( array (
'{{|-&lt;-|}}h5{{|-&gt;-|}}', '{{|-&lt;-|}}h5{{|-&gt;-|}}',
'{{|-&lt;-|}}h5/{{|-&gt;-|}}' '{{|-&lt;-|}}h5/{{|-&gt;-|}}'
), array ( ), array (
'<h5>', '<h5>',
'<h5/>' '<h5/>'
), $s ); ), $s );
$s = str_replace ( array ( $s = str_replace ( array (
'{{|-&lt;-|}}h6{{|-&gt;-|}}', '{{|-&lt;-|}}h6{{|-&gt;-|}}',
'{{|-&lt;-|}}h6/{{|-&gt;-|}}' '{{|-&lt;-|}}h6/{{|-&gt;-|}}'
), array ( ), array (
'<h6>', '<h6>',
'<h6/>' '<h6/>'
), $s ); ), $s );
$s = str_replace ( array ( $s = str_replace ( array (
'{{|-&lt;-|}}li{{|-&gt;-|}}', '{{|-&lt;-|}}li{{|-&gt;-|}}',
'{{|-&lt;-|}}li/{{|-&gt;-|}}' '{{|-&lt;-|}}li/{{|-&gt;-|}}'
), array ( ), array (
'<li>', '<li>',
'<li/>' '<li/>'
), $s ); ), $s );
$s = str_replace ( array ( $s = str_replace ( array (
'{{|-&lt;-|}}ul{{|-&gt;-|}}', '{{|-&lt;-|}}ul{{|-&gt;-|}}',
'{{|-&lt;-|}}ul/{{|-&gt;-|}}' '{{|-&lt;-|}}ul/{{|-&gt;-|}}'
), array ( ), array (
'<ul>', '<ul>',
'<ul/>' '<ul/>'
), $s ); ), $s );
$s = str_replace ( array ( $s = str_replace ( array (
'{{|-&lt;-|}}ol{{|-&gt;-|}}', '{{|-&lt;-|}}ol{{|-&gt;-|}}',
'{{|-&lt;-|}}ol/{{|-&gt;-|}}' '{{|-&lt;-|}}ol/{{|-&gt;-|}}'
), array ( ), array (
'<ol>', '<ol>',
'<ol/>' '<ol/>'
), $s ); ), $s );
$s = str_replace ( array ( $s = str_replace ( array (
'{{|-&lt;-|}}pre{{|-&gt;-|}}', '{{|-&lt;-|}}pre{{|-&gt;-|}}',
'{{|-&lt;-|}}pre/{{|-&gt;-|}}' '{{|-&lt;-|}}pre/{{|-&gt;-|}}'
), array ( ), array (
'<pre>', '<pre>',
'<pre/>' '<pre/>'
), $s ); ), $s );
// cleanup // cleanup
$s = str_replace ( array ( $s = str_replace ( array (
'{{|-', '{{|-',
'-|}}' '-|}}'
), array ( ), array (
'', '',
'' ''
), $s ); ), $s );
return $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;
}
?> ?>