| @@ -583,9 +583,12 @@ | ||
| 583 | 583 | $mailId = acym_getVar('int', 'mail_id', 0); |
| 584 | 584 | $campaignListOnly = $this->config->get('unsubscribe_campaign_list_only', '0') === '1'; |
| 585 | 585 | $displaySurvey = $this->config->get('unsubpage_survey', '0') === '1'; |
| 586 | 586 | $surveyAnswers = $this->config->get('unsub_survey', '[]'); |
| 587 | - $unsubscribeColor = $this->config->get('unsubscribe_color', '#00a4ff'); | |
| 587 | + $unsubscribeColor = $this->config->get('unsubscribe_color'); | |
| 588 | + if (empty($unsubscribeColor)) { | |
| 589 | + $unsubscribeColor = '#0079d3'; | |
| 590 | + } | |
| 588 | 591 | $hoverColor = $this->darkenRGBColor($unsubscribeColor, 20); |
| 589 | 592 | |
| 590 | 593 | $surveyAnswers = json_decode($surveyAnswers, true); |
| 591 | 594 | |
| @@ -632,14 +635,10 @@ | ||
| 632 | 635 | $data['surveyAnswers'][] = acym_translation('ACYM_OTHER'); |
| 633 | 636 | $data['surveyAnswers'] = array_combine($data['surveyAnswers'], $data['surveyAnswers']); |
| 634 | 637 | } |
| 635 | 638 | |
| 636 | - if (!empty($this->config->get('unsubscribe_color'))) { | |
| 637 | - $unsubscribeColor = $this->config->get('unsubscribe_color'); | |
| 638 | - $hoverColor = $this->darkenRGBColor($unsubscribeColor, 20); | |
| 639 | - $data['unsubscribeColor'] = $unsubscribeColor; | |
| 640 | - $data['hoverColor'] = $hoverColor; | |
| 641 | - } | |
| 639 | + $data['unsubscribeColor'] = $unsubscribeColor; | |
| 640 | + $data['hoverColor'] = $hoverColor; | |
| 642 | 641 | $data['svgImage'] = $this->getSVGImage($unsubscribeColor, $hoverColor); |
| 643 | 642 | |
| 644 | 643 | acym_setVar('layout', 'unsubscribepage'); |
| 645 | 644 | acym_header('Content-Type: text/html; charset=utf-8'); |
| @@ -831,8 +830,11 @@ | ||
| 831 | 830 | } |
| 832 | 831 | if (!in_array('2', $values->fields) && !in_array(2, $values->fields)) { |
| 833 | 832 | $values->fields[] = '2'; |
| 834 | 833 | } |
| 834 | + if (!isset($values->page_heading)) { | |
| 835 | + $values->page_heading = ''; | |
| 836 | + } | |
| 835 | 837 | if (!isset($values->introtext)) { |
| 836 | 838 | $values->introtext = ''; |
| 837 | 839 | } |
| 838 | 840 | if (!isset($values->posttext)) { |
| @@ -1078,9 +1080,9 @@ | ||
| 1078 | 1080 | { |
| 1079 | 1081 | $output = ''; |
| 1080 | 1082 | $types = ['success', 'info', 'warning', 'error']; |
| 1081 | 1083 | foreach ($types as $type) { |
| 1082 | - $messages = acym_getVar('array', 'acymessage'.$type, [], 'SESSION'); | |
| 1084 | + $messages = acym_getVar('array', 'acymessage'.$type, [], 'SESSION', ACYM_ALLOWHTML); | |
| 1083 | 1085 | if (empty($messages)) { |
| 1084 | 1086 | continue; |
| 1085 | 1087 | } |
| 1086 | 1088 | |
