From 3fe6d902e7d486623868216f88376d8664f83927 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20M=C3=BCller?= <mueller@miconware.de>
Date: Mon, 5 May 2014 18:27:29 +0200
Subject: [PATCH] neue emailtexte ferttig!

---
 .../Component/MiconwareSessionComponent.php        |  4 ++--
 app/Controller/HomeController.php                  |  4 ++--
 app/View/Emails/text/contact.ctp                   | 14 +++++++-------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/Controller/Component/MiconwareSessionComponent.php b/app/Controller/Component/MiconwareSessionComponent.php
index c5a8965..85ad79a 100755
--- a/app/Controller/Component/MiconwareSessionComponent.php
+++ b/app/Controller/Component/MiconwareSessionComponent.php
@@ -5,7 +5,7 @@ class MiconwareSessionComponent extends Component {
 	public $components = array('Session');
 	public $self_worker_obj;
 	public $self_company_obj;
-	
+	public static $strip_tags='<b><i><br><ol><ul><li><h1><h2><h3><h4><h5><h6><blockquote><u><img><a><span><div><pre><code>';
 	public function init($controller){
 		$controller->Security->requireSecure();
 		$this->User = ClassRegistry::init('User');
@@ -20,7 +20,7 @@ class MiconwareSessionComponent extends Component {
 		}
 		$controller->set("isStaff",$this->isStaff());
 		$controller->set("MEDIA",'/uploads');
-		$controller->set("strip_tags",'<b><i><br><ol><ul><li><h1><h2><h3><h4><h5><h6><blockquote><u><img><a><span><div><pre><code>');
+		$controller->set("strip_tags",self::$strip_tags);
 		$controller->set('default_sForm',array(
 			'inputDefaults' => array(
 				'div' => array('class' => 'control-group'),
diff --git a/app/Controller/HomeController.php b/app/Controller/HomeController.php
index 1eb42b5..3418bc0 100755
--- a/app/Controller/HomeController.php
+++ b/app/Controller/HomeController.php
@@ -113,10 +113,10 @@ class HomeController extends AppController {
 		if($this->request->is('post')){
 			$Email = new CakeEmail('dreamjobMain');
 			$Email->to('service@dream-job.eu');
-			//$Email->from(array($this->request->data['mail']['adresse'] => $this->request->data['mail']['first_name'].' '.$this->request->data['mail']['last_name']));
+			$Email->from(array($this->request->data['mail']['adresse'] => $this->request->data['mail']['first_name'].' '.$this->request->data['mail']['last_name']));
 			$Email->subject('[Dreamjob-Kontakt-Firma]'.$this->request->data['mail']['subject']);
 			$Email->template('contact');
-			$Email->viewVars(array('text'=>$this->request->data));
+			$Email->viewVars(array('text'=>$this->request->data,'strip_tags'=>$this->MiconwareSession->strip_tags));
 			if($Email->send())
 				$this->MiconwareSession->setFlash(__('dreamjob.contactSend'),'flash',array('alert'=>'success'));
 			else
diff --git a/app/View/Emails/text/contact.ctp b/app/View/Emails/text/contact.ctp
index ea63770..2dda1b8 100644
--- a/app/View/Emails/text/contact.ctp
+++ b/app/View/Emails/text/contact.ctp
@@ -1,10 +1,10 @@
-<?=$text['mail']['adresse'];?>\n
-<?=$text['mail']['last_name'].', '.$text['mail']['first_name'];?>\n
-\n
-\n
-<?=$text['mail']['subject'];?>\n
-\n
-\n
+<?=$text['mail']['adresse'];?>
+<?=$text['mail']['last_name'].', '.$text['mail']['first_name'];?>
+
+
+<?=$text['mail']['subject'];?>
+
+
 <?php
 $Document = strip_tags($text['mail']['text'],$strip_tags);