hotfixes

README.md

@@ -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

mail.php

@@ -1,20 +1,17 @@
 <?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;
+    }
 }
 

secret.php.example

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

sql.php

@@ -1,4 +1,12 @@
 <?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;
@@ -16,12 +24,95 @@ class SQL {
     if (SQL_LOG)
       $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;
     }
+    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 ++;
@@ -33,56 +124,23 @@ class SQL {
           ' ',
           ''
       ), $que ) . "\n" . print_r ( $p, true ) . "\n\n" );
-    $statement = $this->h->prepare ( $que );
+    $res = $this->prepare ( $que, $t, $p );
-    switch (count ( $p )) {
+    //var_dump ( $res );
-      case 0 :
+    //echo '<hr>';
-        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 (isset ( $statement->error ) && $statement->error != '') {
+    if (! $res) {
       if (SQL_LOG)
-        fputs ( $this->f, $statement->error );
+        fputs ( $this->f, mysqli_error ( $this->h ) );
       return false;
     }
-    $result = $statement->get_result ();
+    while ( $row = $res->fetch_assoc () ) {
-    // 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 ()) {
@@ -119,7 +177,6 @@ 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",
@@ -128,72 +185,22 @@ class SQL {
           ' ',
           ''
       ), $que ) . "\n" . print_r ( $p, true ) . "\n\n" );
-    switch (count ( $p )) {
+    $res = $this->prepare ( $que, $t, $p );
-      case 0 :
+
-        break;
+    if (! $res) {
-      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, $statement->error );
+        fputs ( $this->f, mysqli_error ( $this->h ) );
       return false;
     }
 
     if ($id) {
-      return $statement->insert_id;
+      return mysqli_insert_id ( $this->h );
     } else {
-      return $statement->affected_rows;
+      return ( bool ) mysqli_affected_rows ( $this->h );
     }
   }
   function __destruct() {
-    if (SQL_LOG)
+    mysqli_close ( $this->h );
-      $this->h->close ();
-    // echo 'DESTROY';
   }
 }
 ?>

string.php

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 <?php
 function umlaute($str) {
   return str_replace ( array (
@@ -258,269 +257,4 @@ 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 );
-}
-=======
-<?php
-function umlaute($str) {
-  return str_replace ( array (
-      'Ä',
-      'Ö',
-      'Ü',
-      'ä',
-      'ö',
-      'ü',
-      'ß'
-  ), array (
-      '&Auml;',
-      '&Ouml;',
-      '&Uuml;',
-      '&auml;',
-      '&ouml;',
-      '&uuml;',
-      '&szlig;'
-  ), $str );
-}
-function chk($str) {
-  return str_replace ( "'", '"', $str );
-}
-function noScript($str) {
-  return str_replace ( array (
-      '<',
-      '>'
-  ), array (
-      '&lt;',
-      '&gt;'
-  ), $str );
-}
-function random($name_laenge) {
-  $zeichen = "abcedfghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRTSUVWXYZ0123456789";
-  $name_neu = "";
-
-  @mt_srand ( ( double ) microtime () * 1000000 );
-  for($i = 0; $i < $name_laenge; $i ++) {
-    $r = mt_rand ( 0, strlen ( $zeichen ) - 1 );
-    $name_neu .= $zeichen {$r};
-  }
-  return $name_neu;
-}
-function startsWith($haystack, $needle) {
-  $length = strlen ( $needle );
-  return (substr ( $haystack, 0, $length ) === $needle);
-}
-function endsWith($haystack, $needle) {
-  $length = strlen ( $needle );
-
-  return $length === 0 || (substr ( $haystack, - $length ) === $needle);
-}
-function onlyAlpha($str, $zus = '') {
-  return preg_replace ( "/[^a-zA-Z0-9 \-\_{$zus}]+/", "", $str );
-}
-function shortener($str, $len = 50, $fill = '...') {
-  if (strlen ( $str ) > $len) {
-    $str = substr ( $str, 0, $len - strlen ( $fill ) ) . $fill;
-  }
-  return $str;
-}
-function isEmail($str) {
-  $match = preg_match ( "/[a-zA-Z0-9\-\_\.]*\@[a-zA-Z0-9\-\_\.]*.[a-z]{2,10}/", $str );
-  if ($match) {
-    return $str;
-  }
-  return false;
-}
-function markUp($text) {
-  $r = '';
-  $lv = 0;
-  foreach ( explode ( "\n", $text ) as $t ) {
-    $nlv = 0;
-    if (startsWith ( '**** ', $t )) {
-      $t = substr ( $t, 5 );
-      $nlv = 4;
-    }
-    if (startsWith ( '*** ', $t )) {
-      $t = substr ( $t, 4 );
-      $nlv = 3;
-    }
-    if (startsWith ( '** ', $t )) {
-      $t = substr ( $t, 3 );
-      $nlv = 2;
-    }
-    if (startsWith ( '* ', $t )) {
-      $t = substr ( $t, 2 );
-      $nlv = 1;
-    }
-    if ($lv != $nlv) {
-      while ( $lv < $nlv ) {
-        $text .= '<ul>';
-        $lv ++;
-      }
-      while ( $lv > $nlv ) {
-        $text .= '</ul>';
-        $lv --;
-      }
-    }
-    if (startsWith ( $t, '!!!!! ' )) {
-      $t = '<h5>' . substr ( $t, 6 ) . '</h5>';
-    }
-    if (startsWith ( $t, '!!!! ' )) {
-      $t = '<h4>' . substr ( $t, 5 ) . '</h4>';
-    }
-    if (startsWith ( $t, '!!! ' )) {
-      $t = '<h3>' . substr ( $t, 4 ) . '</h3>';
-    }
-    if (startsWith ( $t, '!! ' )) {
-      $t = '<h2>' . substr ( $t, 3 ) . '</h2>';
-    }
-    if (startsWith ( $t, '! ' )) {
-      $t = '<h1>' . substr ( $t, 2 ) . '</h1>';
-    }
-    if ($lv == 0) {
-      $r .= $t;
-    } else {
-      $r .= '<li>' . $t . '</li>';
-    }
-    // var_dump ( $t );
-  }
-  while ( $lv > 0 ) {
-    $r .= '</ul>';
-    $lv --;
-  }
-  return $r;
-}
-function onlySimpleHTML($s) {
-  $s = str_replace ( array (
-      '<',
-      '>'
-  ), array (
-      '{{|-&lt;-|}}',
-      '{{|-&gt;-|}}'
-  ), $s );
-  $s = str_replace ( array (
-      '{{|-&lt;-|}}b{{|-&gt;-|}}',
-      '{{|-&lt;-|}}b/{{|-&gt;-|}}'
-  ), array (
-      '<b>',
-      '<b/>'
-  ), $s );
-  $s = str_replace ( array (
-      '{{|-&lt;-|}}u{{|-&gt;-|}}',
-      '{{|-&lt;-|}}u/{{|-&gt;-|}}'
-  ), array (
-      '<u>',
-      '<u/>'
-  ), $s );
-  $s = str_replace ( array (
-      '{{|-&lt;-|}}i{{|-&gt;-|}}',
-      '{{|-&lt;-|}}i/{{|-&gt;-|}}'
-  ), array (
-      '<i>',
-      '<i/>'
-  ), $s );
-  $s = str_replace ( array (
-      '{{|-&lt;-|}}span{{|-&gt;-|}}',
-      '{{|-&lt;-|}}span/{{|-&gt;-|}}'
-  ), array (
-      '<span>',
-      '<span/>'
-  ), $s );
-  $s = str_replace ( array (
-      '{{|-&lt;-|}}b{{|-&gt;-|}}',
-      '{{|-&lt;-|}}b/{{|-&gt;-|}}'
-  ), array (
-      '<b>',
-      '<b/>'
-  ), $s );
-  $s = str_replace ( array (
-      '{{|-&lt;-|}}br{{|-&gt;-|}}',
-      '{{|-&lt;-|}}br/{{|-&gt;-|}}'
-  ), array (
-      '<br>',
-      '<br/>'
-  ), $s );
-  $s = str_replace ( array (
-      '{{|-&lt;-|}}h1{{|-&gt;-|}}',
-      '{{|-&lt;-|}}h1/{{|-&gt;-|}}'
-  ), array (
-      '<h1>',
-      '<h1/>'
-  ), $s );
-  $s = str_replace ( array (
-      '{{|-&lt;-|}}h2{{|-&gt;-|}}',
-      '{{|-&lt;-|}}h2/{{|-&gt;-|}}'
-  ), array (
-      '<h2>',
-      '<h2/>'
-  ), $s );
-  $s = str_replace ( array (
-      '{{|-&lt;-|}}h3{{|-&gt;-|}}',
-      '{{|-&lt;-|}}h3/{{|-&gt;-|}}'
-  ), array (
-      '<h3>',
-      '<h3/>'
-  ), $s );
-  $s = str_replace ( array (
-      '{{|-&lt;-|}}h4{{|-&gt;-|}}',
-      '{{|-&lt;-|}}h4/{{|-&gt;-|}}'
-  ), array (
-      '<h4>',
-      '<h4/>'
-  ), $s );
-  $s = str_replace ( array (
-      '{{|-&lt;-|}}h5{{|-&gt;-|}}',
-      '{{|-&lt;-|}}h5/{{|-&gt;-|}}'
-  ), array (
-      '<h5>',
-      '<h5/>'
-  ), $s );
-  $s = str_replace ( array (
-      '{{|-&lt;-|}}h6{{|-&gt;-|}}',
-      '{{|-&lt;-|}}h6/{{|-&gt;-|}}'
-  ), array (
-      '<h6>',
-      '<h6/>'
-  ), $s );
-  $s = str_replace ( array (
-      '{{|-&lt;-|}}li{{|-&gt;-|}}',
-      '{{|-&lt;-|}}li/{{|-&gt;-|}}'
-  ), array (
-      '<li>',
-      '<li/>'
-  ), $s );
-  $s = str_replace ( array (
-      '{{|-&lt;-|}}ul{{|-&gt;-|}}',
-      '{{|-&lt;-|}}ul/{{|-&gt;-|}}'
-  ), array (
-      '<ul>',
-      '<ul/>'
-  ), $s );
-  $s = str_replace ( array (
-      '{{|-&lt;-|}}ol{{|-&gt;-|}}',
-      '{{|-&lt;-|}}ol/{{|-&gt;-|}}'
-  ), array (
-      '<ol>',
-      '<ol/>'
-  ), $s );
-  $s = str_replace ( array (
-      '{{|-&lt;-|}}pre{{|-&gt;-|}}',
-      '{{|-&lt;-|}}pre/{{|-&gt;-|}}'
-  ), array (
-      '<pre>',
-      '<pre/>'
-  ), $s );
-
-  // cleanup
-  $s = str_replace ( array (
-      '{{|-',
-      '-|}}'
-  ), array (
-      '',
-      ''
-  ), $s );
-
-  return $s;
-}
->>>>>>> branch 'master' of https://git.seemsleg.it/pub/php-func-lib
 ?>