diff --git a/app/Config/routes.php b/app/Config/routes.php index 168a877..aec46a4 100755 --- a/app/Config/routes.php +++ b/app/Config/routes.php @@ -35,6 +35,8 @@ Router::connect('/team', array('controller' => 'extra', 'action' => 'team')); Router::connect('/premium', array('controller' => 'extra', 'action' => 'premium')); Router::connect('/advertise', array('controller' => 'extra', 'action' => 'advertise')); + Router::connect('/muell1', array('controller' => 'extra', 'action' => 'muell1')); + Router::connect('/muell2', array('controller' => 'extra', 'action' => 'muell2')); Router::connect('/service', array('controller' => 'service', 'action' => 'index')); Router::connect('/service/:list', array('controller' => 'service','action'=>'serviceList'),array("list"=>"[a-z0-9]+")); diff --git a/app/Controller/ExtraController.php b/app/Controller/ExtraController.php index 81f3a0a..1aeb996 100644 --- a/app/Controller/ExtraController.php +++ b/app/Controller/ExtraController.php @@ -37,12 +37,22 @@ class ExtraController extends AppController { $this->set('title','dreamjob.team'); $this->render('/Extra/team'); } + public function muell1(){ + $this->MiconwareSession->init($this); + $this->MiconwareSession->initWeb($this); + $this->render('/Extra/muell1'); + } + public function muell2(){ + $this->MiconwareSession->init($this); + $this->MiconwareSession->initWeb($this); + $this->render('/Extra/muell2'); + } public function premium(){ 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->subject('[Dreamjob-Kontakt-Premium]' . $this->request->data['mail']['subject']); + $Email->from(array($this->request->data['mail']['adresse'] => $this->request->data['mail']['owner'] . ' von ' . $this->request->data['mail']['company'])); + $Email->subject('[Dreamjob-Kontakt-Premium]'); $Email->template('contact'); $Email->viewVars(array('text' => $this->request->data, 'strip_tags' => $this->MiconwareSession->strip_tags)); if ($Email->send()) @@ -59,7 +69,7 @@ class ExtraController 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']['owner'] . ' von ' . $this->request->data['mail']['company'])); $Email->subject('[Dreamjob-Kontakt-Advertise]' . $this->request->data['mail']['subject']); $Email->template('contact'); $Email->viewVars(array('text' => $this->request->data, 'strip_tags' => $this->MiconwareSession->strip_tags)); diff --git a/app/Locale/default.pot b/app/Locale/default.pot index 8f1065d..9f00d87 100644 --- a/app/Locale/default.pot +++ b/app/Locale/default.pot @@ -274,8 +274,13 @@ msgstr "" msgid "dreamjob.applicate" msgstr "" -#: View/Elements/navbar.ctp:6 -msgid "dreamjob.admin" +msgid "dreamjob.team" +msgstr "" + +msgid "dreamjob.premium" +msgstr "" + +msgid "dreamjob.advertise" msgstr "" #: View/Elements/navbar.ctp:8 diff --git a/app/View/Elements/navbar.ctp b/app/View/Elements/navbar.ctp index df4aef8..4e7f18d 100755 --- a/app/View/Elements/navbar.ctp +++ b/app/View/Elements/navbar.ctp @@ -29,22 +29,4 @@ echo $this->Form->end(); ?> - -