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

Conflicts: secret.php.example
mail sender update
2021-05-22 09:25:26 +02:00 · 2021-05-22 09:24:33 +02:00 · 2021-05-10 13:27:51 +02:00 · 2021-05-10 09:57:56 +02:00 · 2021-05-09 18:13:15 +02:00 · 2021-05-09 18:10:53 +02:00
6 changed files with 34 additions and 30 deletions
--- 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/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';
 ?>
Author	SHA1	Message	Date
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