diff --git a/.gitignore b/.gitignore index 115bbf0..a982c3a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ -/csv /cache /composer.lock +/csv +/conf/MD_CONF_EMAIL.php /translation-importer /values/langfiles *.swp diff --git a/.gitmodules b/.gitmodules index 279f876..b4f8b3f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,3 +10,6 @@ [submodule "classes/MDTlLoader"] path = classes/MDTlLoader url = /var/www/vhosts/museum-digital.de/git-base/MDTlLoader/ +[submodule "classes/MDMailer"] + path = classes/MDMailer + url = /var/www/vhosts/museum-digital.de/git-base/MDMailer diff --git a/classes/MDErrorReporter b/classes/MDErrorReporter index ef00d81..c13d06e 160000 --- a/classes/MDErrorReporter +++ b/classes/MDErrorReporter @@ -1 +1 @@ -Subproject commit ef00d81c1d70b9402f22ba00c52bc2fca7a2e8e5 +Subproject commit c13d06eccb5127c932e53bc0bbda33810c871d0c diff --git a/classes/MDMailer b/classes/MDMailer new file mode 160000 index 0000000..ae2d831 --- /dev/null +++ b/classes/MDMailer @@ -0,0 +1 @@ +Subproject commit ae2d83172d8b144e6ec7b031853da7a2ef80a613 diff --git a/composer.json b/composer.json index cbadbc6..b25b9a0 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,8 @@ { "require-dev": { "phpunit/phpunit": "^8.4" + }, + "require": { + "phpmailer/phpmailer": "^6.1" } } diff --git a/functions/functions.php b/functions/functions.php index de0e9f7..6cfe4ba 100644 --- a/functions/functions.php +++ b/functions/functions.php @@ -9,10 +9,14 @@ declare(strict_types = 1); // Set autoloader +error_reporting(E_ALL); +ini_set('display_errors', "1"); spl_autoload_register("mdCsvxmlAutoloader"); set_exception_handler("mdExceptionHandler"); set_error_handler("mdErrorHandler", E_ALL); +require_once __DIR__ . '/../vendor/autoload.php'; + /** * Autoloader for museum-digital.org. * @@ -28,6 +32,8 @@ function mdCsvxmlAutoloader(string $className):void { __DIR__ . "/../classes/MDAllowedValueSets/src", __DIR__ . "/../classes/MDExportFormats/src", __DIR__ . "/../classes/MDErrorReporter", + __DIR__ . "/../classes/MDMailer/src", + __DIR__ . "/../conf", __DIR__ . "/../classes/MDErrorReporter/exceptions/generic", __DIR__ . "/../classes/MDErrorReporter/exceptions/page", __DIR__ . "/../classes/MDErrorReporter/exceptions/updates", diff --git a/index.php b/index.php index f1ce677..febb0e2 100644 --- a/index.php +++ b/index.php @@ -34,7 +34,6 @@ $toInject = ' '; echo printHTMLHead($toInject); - echo '