diff --git a/VERSION b/VERSION index e01cfbd..b334865 100644 --- a/VERSION +++ b/VERSION @@ -1,4 +1,4 @@ latest -1.1.5 +1.1.6 1.1 1 diff --git a/core/Mail.php b/core/Mail.php index f0cdcbc..716a067 100644 --- a/core/Mail.php +++ b/core/Mail.php @@ -18,7 +18,8 @@ class Mail { private static $templates = array( - 'mailAdminNotif' + 'mailAdminNotif', + 'mailNewPollNotif' ); private $type, $template, $mailHeader; diff --git a/core/PollCreator.php b/core/PollCreator.php index 720e62c..e0a94ea 100644 --- a/core/PollCreator.php +++ b/core/PollCreator.php @@ -205,7 +205,7 @@ private function sendNewPollMail() { $m->setContent('POLLNAME', Utilities::optimizeOutputString( $this->data['pollname'] )); $m->setContent('POLLDESCRIP', Utilities::optimizeOutputString( $this->data['description'] )); $m->setContent('ADMINLINK', $this->getAdminLink() ); - $m->setContent('POLLLINK', URL::generateLink('poll', '', $this->data['code']['poll'] )); + $m->setContent('POLLLINK', URL::generateLink('poll', $this->data['code']['poll'], '' )); $m->setContent('POLLID', $this->data['code']['poll'] ); $m->sendMail( $to ); diff --git a/core/Utilities.php b/core/Utilities.php index 23d12bc..94e29f8 100644 --- a/core/Utilities.php +++ b/core/Utilities.php @@ -16,7 +16,7 @@ class Utilities{ /** * The system's Version */ - const SYS_VERSION = 'v1.1.5'; + const SYS_VERSION = 'v1.1.6'; /** * Possible chars for: diff --git a/data/config.json b/data/config.json index 382b63f..a1d7ae4 100644 --- a/data/config.json +++ b/data/config.json @@ -16,5 +16,5 @@ }, "urlrewrite": false, "cookiebanner": false, - "newpollmailto" : "test@example.com" + "newpollmailto": "test@example.com" } \ No newline at end of file diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index aae0b74..c905810 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -18,7 +18,7 @@ services: - CONF_site_pagename=KIMB-Forms-Project Dev - CONF_site_footercontent=Development Version - CONF_captcha_poll=false - - CONF_captcha_new=true + - CONF_captcha_new=false - CONF_texts_enablePoll=true - CONF_texts_enableNew=true - CONF_texts_textPoll=Ich bin mit den Datenschutzrichlinien ... einverstanden!