@@ -80,11 +80,13 @@ class SendNewsNotificationJob

                         $Members = MemberModel::findBy(array("`groups` LIKE '%\"".$Groups->id."\"%'","(start='' OR start<='$time') AND (stop='' OR stop>'" . ($time + 60) . "') AND disable=''"),null);

                         // Send notification to each member

-                        if ($Members !== null)

+                        $arrNews = array();

+                        $arrNewsPlain = array();

+                        foreach ($News->iterateAssociative() as $item)

                         {

-                            $arrNews = array();

-                            $arrNewsPlain = array();

-                            foreach ($News->iterateAssociative() as $item)

+                            $arrNewsIds[] = $item['id'];

+

+                            if ($Members !== null)

                             {

                                 $strText = '';

                                 $objContentElement = ContentModel::findPublishedByPidAndTable($item['id'], 'tl_news');

@@ -106,7 +108,7 @@ class SendNewsNotificationJob

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

                                 {

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

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

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

                                 }

@@ -117,33 +119,33 @@ class SendNewsNotificationJob

                                 $arrNewsFullPlain[] = date('d.m.Y',$item['date']).' - '.$item['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>';

-                                $arrNewsIds[] = $item['id'];

-                            }

-                            while ($Members->next())

-                            {

-                                if (!$Members->nc_news_subscribe)

+                                while ($Members->next())

                                 {

-                                    continue;

-                                }

+                                    if (!$Members->nc_news_subscribe)

+                                    {

+                                        continue;

+                                    }

-                                //$strToken = \TokenLogin::getOrRenewUserToken($Members->current());

-                                $strToken = '';

-

-                                $Notification->send(array

-                                (

-                                    'member_email'      => $Members->email.($Members->nc_news_additionalEmail ? ','.$Members->nc_news_additionalEmail : ''),

-                                    'member_firstname' => $Members->firstname,

-                                    'member_lastname' => $Members->lastname,

-                                    '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,

-                                ),

-                                    $GLOBALS['TL_LANGUAGE']);

+                                    //$strToken = \TokenLogin::getOrRenewUserToken($Members->current());

+                                    $strToken = '';

+

+                                    $Notification->send(array

+                                    (

+                                        'member_email'      => $Members->email.($Members->nc_news_additionalEmail ? ','.$Members->nc_news_additionalEmail : ''),

+                                        'member_firstname' => $Members->firstname,

+                                        'member_lastname' => $Members->lastname,

+                                        '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,

+                                    ),

+                                        $GLOBALS['TL_LANGUAGE']);

+                                }

                             }

                         }

+

                     }

                     // Flag news as sent