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

Conflicts:
	secret.php.example

.gitignore

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

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

_func.php

@@ -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');
 ?>

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';
 ?>

sql.php

@@ -196,4 +196,4 @@ class SQL {
     // echo 'DESTROY';
   }
 }
-?>
+?>