@@ -62,7 +62,7 @@ class NewsSendTestmailListener

                     'date' => date('d.m.Y',$News->date),

                     'headline' => $News->headline,

                     'teaser' => $News->teaser ? StringUtil::substr(strip_tags(str_ireplace(array('<br />','<br>','<br/>','</p>','<p>'),' ',$News->teaser)),128) : '',

-                    'text_plain' => $strText ? strip_tags(str_ireplace(array('<br />','<br>','<br/>','</p>','<p>'),' ',$strText)) : strip_tags(str_ireplace(array('<br />','<br>','<br/>','</p>','<p>'),' ',$News->teaser)),

+                    'text_plain' => $strText ? strip_tags(str_ireplace(array('<br />','<br>','<br/>','</p>','<p>'),' ',$strText)) : ($News->teaser ? strip_tags(str_ireplace(array('<br />','<br>','<br/>','</p>','<p>'),' ',$News->teaser)) : ''),

                     'text_html' => $strText ?: $News->teaser

                 );

@@ -14,6 +14,8 @@ namespace vonRotenberg\NewsmailerBundle\EventListener;

 use Contao\BackendUser;

 use Contao\Config;

+use Contao\ContentModel;

+use Contao\Controller;

 use Contao\CoreBundle\ServiceAnnotation\Callback;

 use Contao\DataContainer;

 use Contao\Message;

@@ -45,10 +47,23 @@ class NewsSendTestmailListener

             if ($News !== null && ($Archive = $News->getRelated('pid')) !== null && ($Notification = Notification::findByPk($Archive->nc_notification)) !== null)

             {

+                $strText = '';

+                $objContentElement = ContentModel::findPublishedByPidAndTable($News->id, 'tl_news');

+

+                if ($objContentElement !== null)

+                {

+                    while ($objContentElement->next())

+                    {

+                        $strText .= Controller::getContentElement($objContentElement->current());

+                    }

+                }

+

                 $arrRow = array(

                     'date' => date('d.m.Y',$News->date),

                     'headline' => $News->headline,

-                    'teaser' => $News->teaser ? StringUtil::substr(strip_tags(str_ireplace(array('<br />','<br>','<br/>','</p>','<p>'),' ',$News->teaser)),128) : ''

+                    'teaser' => $News->teaser ? StringUtil::substr(strip_tags(str_ireplace(array('<br />','<br>','<br/>','</p>','<p>'),' ',$News->teaser)),128) : '',

+                    'text_plain' => $strText ? strip_tags(str_ireplace(array('<br />','<br>','<br/>','</p>','<p>'),' ',$strText)) : strip_tags(str_ireplace(array('<br />','<br>','<br/>','</p>','<p>'),' ',$News->teaser)),

+                    'text_html' => $strText ?: $News->teaser

                 );

                 if (($objJumpTo = $Archive->getRelated('jumpTo')) !== null)

@@ -59,6 +74,8 @@ class NewsSendTestmailListener

                 $arrNewsPlain[] = date('d.m.Y',$News->date).' - '.$News->headline;

                 $arrNewsHtml[] = '<div style="margin-bottom: 15px;"><h3>'.$arrRow['date'].' '.$arrRow['headline'].'</h3><p>'.$arrRow['teaser'].'</p>'. ($arrRow['url'] ? '<p><a href="'.$arrRow['url'].'">&raquo; Ganze Nachricht lesen...</a></p>' : '') .'</div>';

+                $arrNewsFullPlain[] = date('d.m.Y',$News->date).' - '.$News->headline . "\n" . $arrRow['text_plain'];

+                $arrNewsFullHtml[] = '<div style="margin-bottom: 15px;"><h3>'.$arrRow['date'].' '.$arrRow['headline'].'</h3>' . $arrRow['text_html'] . ($arrRow['url'] ? '<p><a href="'.$arrRow['url'].'">&raquo; Ganze Nachricht lesen...</a></p>' : '') .'</div>';

                 // User

                 $strEmail = $User->email;

@@ -86,6 +103,8 @@ class NewsSendTestmailListener

                     'member_lastname' => $strLastname,

                     'news_topics'       => implode("\n",$arrNewsPlain),

                     'news_topics_html'  => "<ul>\n<li>".str_replace('%%_TOKEN_%%',$strToken,implode("</li>\n<li>",$arrNewsHtml))."</li>\n</ul>",

+                    'news_full' => implode("\n",$arrNewsFullPlain),

+                    'news_full_html' => implode("",$arrNewsFullHtml),

                     'member_login_token'  => $strToken,

                     'admin_email'  => $admin_email,

                 ),

@@ -48,7 +48,7 @@ class NewsSendTestmailListener

                 $arrRow = array(

                     'date' => date('d.m.Y',$News->date),

                     'headline' => $News->headline,

-                    'teaser' => \Contao\StringUtil::substr(strip_tags(str_ireplace(array('<br />','<br>','<br/>','</p>','<p>'),' ',$News->teaser)),128)

+                    'teaser' => $News->teaser ? StringUtil::substr(strip_tags(str_ireplace(array('<br />','<br>','<br/>','</p>','<p>'),' ',$News->teaser)),128) : ''

                 );

                 if (($objJumpTo = $Archive->getRelated('jumpTo')) !== null)

@@ -53,7 +53,8 @@ class NewsSendTestmailListener

                 if (($objJumpTo = $Archive->getRelated('jumpTo')) !== null)

                 {

-                    $arrRow['url'] = $objJumpTo->getAbsoluteUrl(sprintf((Config::get('useAutoItem') ? '/%s' : '/items/%s'),$News->alias)).'?ltoken=%%_TOKEN_%%';

+//                    $arrRow['url'] = $objJumpTo->getAbsoluteUrl(sprintf((Config::get('useAutoItem') ? '/%s' : '/items/%s'),$News->alias)).'?ltoken=%%_TOKEN_%%';

+                    $arrRow['url'] = $objJumpTo->getAbsoluteUrl(sprintf((Config::get('useAutoItem') ? '/%s' : '/items/%s'),$News->alias));

                 }

                 $arrNewsPlain[] = date('d.m.Y',$News->date).' - '.$News->headline;

@@ -65,10 +65,10 @@ class NewsSendTestmailListener

                 {

                     $strLastname = $Member->firstname;

                     $strFirstname = $Member->lastname;

-                    /*if ($Member->nc_news_additionalEmail)

+                    if ($Member->nc_news_additionalEmail)

                     {

                         $strEmail .= ','.$Member->nc_news_additionalEmail;

-                    }*/

+                    }

 //                    $strToken = \TokenLogin::getOrRenewUserToken($Member);

                     $strToken = '';

                 } else {

@@ -53,7 +53,7 @@ class NewsSendTestmailListener

                 if (($objJumpTo = $Archive->getRelated('jumpTo')) !== null)

                 {

-                    $arrRow['url'] = $objJumpTo->getAbsoluteUrl(Config::get('useAutoItem') ? '/%s' : '/items/%s').'?ltoken=%%_TOKEN_%%';

+                    $arrRow['url'] = $objJumpTo->getAbsoluteUrl(sprintf((Config::get('useAutoItem') ? '/%s' : '/items/%s'),$News->alias)).'?ltoken=%%_TOKEN_%%';

                 }

                 $arrNewsPlain[] = date('d.m.Y',$News->date).' - '.$News->headline;

@@ -12,10 +12,14 @@ declare(strict_types=1);

 namespace vonRotenberg\NewsmailerBundle\EventListener;

+use Contao\BackendUser;

 use Contao\Config;

 use Contao\CoreBundle\ServiceAnnotation\Callback;

 use Contao\DataContainer;

+use Contao\Message;

 use Contao\NewsModel;

+use Contao\StringUtil;

+use Contao\System;

 use NotificationCenter\Model\Notification;

 class NewsSendTestmailListener

@@ -33,9 +37,11 @@ class NewsSendTestmailListener

      */

     public function onSaveCallback($varValue, DataContainer $dc)

     {

-        if ($varValue)

+        if ($varValue && System::getContainer()->get('contao.security.token_checker')->hasBackendUser())

         {

             $News = NewsModel::findByPk($dc->id);

+            $User = BackendUser::getInstance();

+            list($admin_name,$admin_email) = StringUtil::splitFriendlyEmail(Config::get('adminEmail'));

             if ($News !== null && ($Archive = $News->getRelated('pid')) !== null && ($Notification = Notification::findByPk($Archive->nc_notification)) !== null)

             {

@@ -50,41 +56,48 @@ class NewsSendTestmailListener

                     $arrRow['url'] = $objJumpTo->getAbsoluteUrl(Config::get('useAutoItem') ? '/%s' : '/items/%s').'?ltoken=%%_TOKEN_%%';

                 }

-

                 $arrNewsPlain[] = date('d.m.Y',$News->date).' - '.$News->headline;

                 $arrNewsHtml[] = '<div style="margin-bottom: 15px;"><h3>'.$arrRow['date'].' '.$arrRow['headline'].'</h3><p>'.$arrRow['teaser'].'</p>'. ($arrRow['url'] ? '<p><a href="'.$arrRow['url'].'">&raquo; Ganze Nachricht lesen...</a></p>' : '') .'</div>';

                 // User

-                $strEmail = $this->User->email;

-                if (($Member = \MemberModel::findActiveByEmailAndUsername($this->User->email)) !== null)

+                $strEmail = $User->email;

+                if (($Member = \MemberModel::findActiveByEmailAndUsername($strEmail)) !== null)

                 {

                     $strLastname = $Member->firstname;

                     $strFirstname = $Member->lastname;

-                    if ($Member->nc_news_additionalEmail)

+                    /*if ($Member->nc_news_additionalEmail)

                     {

                         $strEmail .= ','.$Member->nc_news_additionalEmail;

-                    }

-                    $strToken = \TokenLogin::getOrRenewUserToken($Member);

+                    }*/

+//                    $strToken = \TokenLogin::getOrRenewUserToken($Member);

+                    $strToken = '';

                 } else {

-                    $arrSplitName = explode(" ", $this->User->name);

+                    $arrSplitName = explode(" ", $User->name);

                     $strLastname = array_pop($arrSplitName);

                     $strFirstname = implode(" ", $arrSplitName);

                     $strToken = '';

                 }

-                $Notification->send(array

+                if ($Notification->send(array

                 (

                     'member_email'      => $strEmail,

                     'member_firstname' => $strFirstname,

                     'member_lastname' => $strLastname,

                     'news_topics'       => implode("\n",$arrNewsPlain),

                     'news_topics_html'  => "<ul>\n<li>".str_replace('%%_TOKEN_%%',$strToken,implode("</li>\n<li>",$arrNewsHtml))."</li>\n</ul>",

-                    'member_login_token'  => $strToken

+                    'member_login_token'  => $strToken,

+                    'admin_email'  => $admin_email,

                 ),

-                    $GLOBALS['TL_LANGUAGE']);

+                    $GLOBALS['TL_LANGUAGE']))

+                {

+                    Message::addConfirmation(sprintf($GLOBALS['TL_LANG']['tl_news']['MSC']['nc_news_testletter'],$strEmail));

+                } else {

+                    Message::addError($GLOBALS['TL_LANG']['tl_news']['MSC']['nc_news_testletter_error']);

+                }

-                Message::addConfirmation($GLOBALS['TL_LANG']['tl_news']['MSC']['nc_news_testletter']);

             }

         }

+

+        return null;

     }

 }

@@ -21,13 +21,16 @@ use NotificationCenter\Model\Notification;

 class NewsSendTestmailListener

 {

     /**

-     * @Callback(table="tl_news", target="fields.nc_testmail.load)

+     * @Callback(table="tl_news", target="fields.nc_testmail.load")

      */

     public function onLoadCallback($varValue, DataContainer $dc)

     {

         return null;

     }

+    /**

+     * @Callback(table="tl_news", target="fields.nc_testmail.save")

+     */

     public function onSaveCallback($varValue, DataContainer $dc)

     {

         if ($varValue)

new file mode 100644

@@ -0,0 +1,87 @@

+<?php

+

+declare(strict_types=1);

+

+/*

+* This file is part of newsmailer bundle for Contao.

+*

+* (c) Benjamin Roth

+*

+* @license LGPL-3.0-or-later

+*/

+

+namespace vonRotenberg\NewsmailerBundle\EventListener;

+

+use Contao\Config;

+use Contao\CoreBundle\ServiceAnnotation\Callback;

+use Contao\DataContainer;

+use Contao\NewsModel;

+use NotificationCenter\Model\Notification;

+

+class NewsSendTestmailListener

+{

+    /**

+     * @Callback(table="tl_news", target="fields.nc_testmail.load)

+     */

+    public function onLoadCallback($varValue, DataContainer $dc)

+    {

+        return null;

+    }

+

+    public function onSaveCallback($varValue, DataContainer $dc)

+    {

+        if ($varValue)

+        {

+            $News = NewsModel::findByPk($dc->id);

+

+            if ($News !== null && ($Archive = $News->getRelated('pid')) !== null && ($Notification = Notification::findByPk($Archive->nc_notification)) !== null)

+            {

+                $arrRow = array(

+                    'date' => date('d.m.Y',$News->date),

+                    'headline' => $News->headline,

+                    'teaser' => \Contao\StringUtil::substr(strip_tags(str_ireplace(array('<br />','<br>','<br/>','</p>','<p>'),' ',$News->teaser)),128)

+                );

+

+                if (($objJumpTo = $Archive->getRelated('jumpTo')) !== null)

+                {

+                    $arrRow['url'] = $objJumpTo->getAbsoluteUrl(Config::get('useAutoItem') ? '/%s' : '/items/%s').'?ltoken=%%_TOKEN_%%';

+                }

+

+

+                $arrNewsPlain[] = date('d.m.Y',$News->date).' - '.$News->headline;

+                $arrNewsHtml[] = '<div style="margin-bottom: 15px;"><h3>'.$arrRow['date'].' '.$arrRow['headline'].'</h3><p>'.$arrRow['teaser'].'</p>'. ($arrRow['url'] ? '<p><a href="'.$arrRow['url'].'">&raquo; Ganze Nachricht lesen...</a></p>' : '') .'</div>';

+

+                // User

+                $strEmail = $this->User->email;

+                if (($Member = \MemberModel::findActiveByEmailAndUsername($this->User->email)) !== null)

+                {

+                    $strLastname = $Member->firstname;

+                    $strFirstname = $Member->lastname;

+                    if ($Member->nc_news_additionalEmail)

+                    {

+                        $strEmail .= ','.$Member->nc_news_additionalEmail;

+                    }

+                    $strToken = \TokenLogin::getOrRenewUserToken($Member);

+                } else {

+                    $arrSplitName = explode(" ", $this->User->name);

+                    $strLastname = array_pop($arrSplitName);

+                    $strFirstname = implode(" ", $arrSplitName);

+                    $strToken = '';

+                }

+

+                $Notification->send(array

+                (

+                    'member_email'      => $strEmail,

+                    'member_firstname' => $strFirstname,

+                    'member_lastname' => $strLastname,

+                    'news_topics'       => implode("\n",$arrNewsPlain),

+                    'news_topics_html'  => "<ul>\n<li>".str_replace('%%_TOKEN_%%',$strToken,implode("</li>\n<li>",$arrNewsHtml))."</li>\n</ul>",

+                    'member_login_token'  => $strToken

+                ),

+                    $GLOBALS['TL_LANGUAGE']);

+

+                Message::addConfirmation($GLOBALS['TL_LANG']['tl_news']['MSC']['nc_news_testletter']);

+            }

+        }

+    }

+}