@@ -68,57 +68,58 @@ class SendNewsNotificationJob

                 // Load groups and notification models if we have news to share

                 if ($News->rowCount() && ($Notification = Notification::findByPk($Archive->nc_notification)) !== null && ($Groups = MemberGroupModel::findMultipleByIds($arrGroupIds)) !== null)

                 {

-                    while ($Groups->next())

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

                     {

-                        // Skip disabled groups

-                        if ($Groups->disable)

-                        {

-                            continue;

-                        }

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

-                        // Get group members

-                        $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

                         $arrNews = array();

                         $arrNewsPlain = array();

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

-                        {

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

-                            if ($Members !== null)

+                        $strText = '';

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

+

+                        if ($objContentElement !== null)

+                        {

+                            while ($objContentElement->next())

                             {

-                                $strText = '';

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

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

+                            }

+                        }

+                        $arrRow = array(

+                            'date' => date('d.m.Y',$item['date']),

+                            'headline' => $item['headline'],

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

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

+                            'text_html' => $strText ?: $item['teaser']

+                        );

+

+                        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']));

+                        }

-                                if ($objContentElement !== null)

-                                {

-                                    while ($objContentElement->next())

-                                    {

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

-                                    }

-                                }

-                                $arrRow = array(

-                                    'date' => date('d.m.Y',$item['date']),

-                                    'headline' => $item['headline'],

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

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

-                                    'text_html' => $strText ?: $item['teaser']

-                                );

-

-                                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']));

-                                }

+                        $arrNews[] = $arrRow;

+

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

-                                $arrNews[] = $arrRow;

+                        while ($Groups->next())

+                        {

+                            // Skip disabled groups

+                            if ($Groups->disable)

+                            {

+                                continue;

+                            }

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

+                            // Get group members

+                            $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)

+                            {

                                 while ($Members->next())

                                 {

                                     if (!$Members->nc_news_subscribe)

@@ -145,9 +146,9 @@ class SendNewsNotificationJob

                                 }

                             }

                         }

-

                     }

+

                     // Flag news as sent

                     if (count($arrNewsIds))

                     {