?

Conflicts:
	secret.php.example

README.md

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

mail.php

@@ -1,17 +1,20 @@
 <?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 ();
 
-function send_mail($an, $betreff, $text, $ok = '', $error = '')
+  if (mail ( $an, $betreff, $text, $header ) === true) {
-{
+    echo $ok;
-    $header = 'From: noreply@isleofhope.de' . "\r\n";
+  } else {
-    $header .= 'To: ' . $an . "\r\n";
+    echo $error;
-    $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,4 +7,6 @@ $_m['pass'] = '';
 $_m['data'] = '';
 $_m['pre']  = 'efcms2_';
 $_m['salt'] = '';
+
+$_sendermail = 'noreply@troy-grunt.de';
 ?>

string.php

@@ -51,7 +51,7 @@ function endsWith($haystack, $needle) {
   return $length === 0 || (substr ( $haystack, - $length ) === $needle);
 }
 function onlyAlpha($str, $zus = '') {
-  return preg_replace ( "/[^a-zA-Z0-9 \-\{$zus}_]+/", "", $str );
+  return preg_replace ( "/[^a-zA-Z0-9 \-\_{$zus}]+/", "", $str );
 }
 function shortener($str, $len = 50, $fill = '...') {
   if (strlen ( $str ) > $len) {