From 54efa2327c08ebdcd93f6f8440fc7138c22e62ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20M=C3=BCller?= Date: Mon, 5 May 2014 18:10:34 +0200 Subject: [PATCH 01/45] neue emailtexte ferttig! --- app/Config/routes.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Config/routes.php b/app/Config/routes.php index deb7815..9dff834 100755 --- a/app/Config/routes.php +++ b/app/Config/routes.php @@ -33,9 +33,9 @@ Router::connect('/company', array('controller' => 'home', 'action' => 'company')); - Router::connect('/registration', array('controller' => 'registration', 'action' => 'main')); - Router::connect('/registration/user', array('controller' => 'registration', 'action' => 'worker')); - Router::connect('/registration/company', array('controller' => 'registration', 'action' => 'company')); + Router::connect('/company/registration', array('controller' => 'registration', 'action' => 'company')); + //Router::connect('/registration', array('controller' => 'registration', 'action' => 'main')); + Router::connect('/registration', array('controller' => 'registration', 'action' => 'worker')); Router::connect('/registration/active/:code', array('controller' => 'registration', 'action' => 'active'),array("code" => ".+")); Router::connect('/profil', array('controller' => 'user', 'action' => 'profil')); From a1ea46bc4c2406ce4fadb8ddb7ca3c1da845c0fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20M=C3=BCller?= Date: Mon, 5 May 2014 18:11:33 +0200 Subject: [PATCH 02/45] neue emailtexte ferttig! --- app/View/Emails/html/contact.ctp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/View/Emails/html/contact.ctp b/app/View/Emails/html/contact.ctp index e12ccbd..54776bb 100644 --- a/app/View/Emails/html/contact.ctp +++ b/app/View/Emails/html/contact.ctp @@ -1,7 +1,7 @@ - + From 3f5e714ed517518b570e53ec01fb60338dabf091 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20M=C3=BCller?= Date: Mon, 5 May 2014 18:12:27 +0200 Subject: [PATCH 03/45] neue emailtexte ferttig! --- app/View/Emails/html/contact.ctp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/View/Emails/html/contact.ctp b/app/View/Emails/html/contact.ctp index 54776bb..a45cbd8 100644 --- a/app/View/Emails/html/contact.ctp +++ b/app/View/Emails/html/contact.ctp @@ -4,7 +4,7 @@ - + From 0e557f3252c155881b080ad0c3be566a26b7adbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20M=C3=BCller?= Date: Mon, 5 May 2014 18:13:07 +0200 Subject: [PATCH 04/45] neue emailtexte ferttig! --- app/View/Emails/text/contact.ctp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/View/Emails/text/contact.ctp b/app/View/Emails/text/contact.ctp index 73d61f3..983fa3e 100644 --- a/app/View/Emails/text/contact.ctp +++ b/app/View/Emails/text/contact.ctp @@ -1,5 +1,5 @@ \n -\n +\n \n \n request->data['mail']['subject']);?>\n From 03a57d85534307a3287dabc6a254575c8450b44a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20M=C3=BCller?= Date: Mon, 5 May 2014 18:13:33 +0200 Subject: [PATCH 05/45] neue emailtexte ferttig! --- app/View/Emails/text/contact.ctp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/View/Emails/text/contact.ctp b/app/View/Emails/text/contact.ctp index 983fa3e..b5a395f 100644 --- a/app/View/Emails/text/contact.ctp +++ b/app/View/Emails/text/contact.ctp @@ -2,7 +2,7 @@ \n \n \n -request->data['mail']['subject']);?>\n +request->data['mail']['subject'];?>\n \n \n Date: Mon, 5 May 2014 18:15:28 +0200 Subject: [PATCH 06/45] neue emailtexte ferttig! --- app/Controller/HomeController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Controller/HomeController.php b/app/Controller/HomeController.php index 8ddb0d9..1eb42b5 100755 --- a/app/Controller/HomeController.php +++ b/app/Controller/HomeController.php @@ -113,7 +113,7 @@ 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)); From 4a208c96f91473e190fe654ff1dfb20f70e8e330 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20M=C3=BCller?= Date: Mon, 5 May 2014 18:22:38 +0200 Subject: [PATCH 07/45] neue emailtexte ferttig! --- app/View/Emails/html/contact.ctp | 8 ++++---- app/View/Emails/text/contact.ctp | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/View/Emails/html/contact.ctp b/app/View/Emails/html/contact.ctp index a45cbd8..6ad32e0 100644 --- a/app/View/Emails/html/contact.ctp +++ b/app/View/Emails/html/contact.ctp @@ -1,12 +1,12 @@
request->data['mail']['subject']);?>
request->data['mail']['subject']);?>request->data['mail']['subject'];?>
- - + + - + - +
request->data['mail']['subject'];?>
diff --git a/app/View/Emails/text/contact.ctp b/app/View/Emails/text/contact.ctp index b5a395f..ea63770 100644 --- a/app/View/Emails/text/contact.ctp +++ b/app/View/Emails/text/contact.ctp @@ -1,12 +1,12 @@ -\n -\n +\n +\n \n \n -request->data['mail']['subject'];?>\n +\n \n \n ]*?>.*?@si', '@<[\/\!]*?[^<>]*?>@si', From 3fe6d902e7d486623868216f88376d8664f83927 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20M=C3=BCller?= Date: Mon, 5 May 2014 18:27:29 +0200 Subject: [PATCH 08/45] 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='