@@ -14,7 +14,24 @@ $GLOBALS['NOTIFICATION_CENTER']['NOTIFICATION_TYPE']['contao']['news_submitted']

 (

     'recipients'    => array

     (

-        'member_email' // The email address of the recipient

+        'member_email', // The email address of the recipient

+        'admin_email' // The email address of the recipient

+    ),

+    'email_sender_address'    => array

+    (

+        'member_email', // The email address of the recipient

+        'admin_email' // The email address of the recipient

+    ),

+    'email_sender_name'    => array

+    (

+        'member_email', // The email address of the recipient

+        'admin_email' // The email address of the recipient

+    ),

+    'email_subject'        => array

+    (

+        'domain',

+        'member_email',

+        'admin_email'

     ),

     'email_text'    => array

     (

@@ -22,6 +22,15 @@

                 <source>Notifications</source>

                 <target>Benachrichtigungen</target>

             </trans-unit>

+

+            <trans-unit id="tl_news.MSC.nc_news_testletter">

+                <source>A test notification has been sent to %s.</source>

+                <target>Eine Testbenachrichtigung wurde versendet an %s.</target>

+            </trans-unit>

+            <trans-unit id="tl_news.MSC.nc_news_testletter_error">

+                <source>A test notification could not be sent.</source>

+                <target>Eine Testmeldung konnte nicht gesendet werden.</target>

+            </trans-unit>

         </body>

     </file>

 </xliff>

@@ -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;

     }

 }