Password vergessen - Mail

app/Locale/cake.pot

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
-"POT-Creation-Date: 2014-06-16 00:35+0200\n"
+"POT-Creation-Date: 2014-06-16 01:17+0200\n"
 "PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n"
 "Last-Translator: NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <EMAIL@ADDRESS>\n"

app/Locale/cake_dev.pot

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
-"POT-Creation-Date: 2014-06-16 00:35+0200\n"
+"POT-Creation-Date: 2014-06-16 01:17+0200\n"
 "PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n"
 "Last-Translator: NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <EMAIL@ADDRESS>\n"

app/Locale/default.pot

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
-"POT-Creation-Date: 2014-06-16 00:35+0200\n"
+"POT-Creation-Date: 2014-06-16 01:17+0200\n"
 "PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n"
 "Last-Translator: NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <EMAIL@ADDRESS>\n"
@@ -651,10 +651,6 @@ msgstr ""
 msgid "dreamjob.regisration.active.link"
 msgstr ""
 
-#: View/Emails/html/password_reset.ctp:2
-msgid "dreamjob.password.reset.link"
-msgstr ""
-
 #: View/Home/company.ctp:11
 #: View/Home/home.ctp:22
 msgid "dreamjob.registration.to"
@@ -692,9 +688,7 @@ msgstr ""
 
 #: View/Job/application.ctp:134
 #: View/Job/opening_edit.ctp:49
-#: View/Registration/company.ctp:41
 #: View/Registration/password_replace.ctp:12
-#: View/Registration/worker.ctp:44
 #: View/User/settings_account.ctp:88
 #: View/User/settings_imageUpload.ctp:14
 #: View/User/settings_isearch.ctp:60
@@ -906,6 +900,11 @@ msgstr ""
 msgid "dreamjob.addresse"
 msgstr ""
 
+#: View/Registration/company.ctp:41
+#: View/Registration/worker.ctp:44
+msgid "dreamjob.save.registration"
+msgstr ""
+
 #: View/Registration/company.ctp:47
 #: View/Registration/worker.ctp:50
 msgid "dreamjob.registration.done.text"

app/Locale/deu/LC_MESSAGES/default.po

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2014-06-16 00:35+0200\n"
+"POT-Creation-Date: 2014-06-16 01:09+0200\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: LANGUAGE <EMAIL@ADDRESS>\n"
@@ -206,11 +206,11 @@ msgstr "Passwörter stimmen nicht überein"
 
 #: Controller/RegistrationController.php:163
 msgid "dreamjob.password_reset.send.success"
-msgstr "Passwort wurde erfolgreich geändert"
+msgstr "E-Mail wurde an Sie versendet"
 
 #: Controller/RegistrationController.php:166
 msgid "dreamjob.password_reset.send.error"
-msgstr "Passwort konnte nicht geändert werden"
+msgstr "E-Mail konnte nicht an Sie versendet werden"
 
 #: Controller/RegistrationController.php:183
 msgid "dreamjob.password_replace.notFound"
@@ -621,8 +621,7 @@ msgid "dreamjob.message"
 msgstr "Nachrichten"
 
 #: View/Job/application.ctp:134 View/Job/opening_edit.ctp:49
-#: View/Registration/company.ctp:41 View/Registration/password_replace.ctp:12
+#: View/Registration/password_replace.ctp:12 View/User/settings_account.ctp:88
-#: View/Registration/worker.ctp:44 View/User/settings_account.ctp:88
 #: View/User/settings_imageUpload.ctp:14 View/User/settings_isearch.ctp:60
 #: View/User/settings_pages.ctp:113
 msgid "dreamjob.save"
@@ -813,6 +812,10 @@ msgstr "Internetseite"
 msgid "dreamjob.addresse"
 msgstr "Adresse"
 
+#: View/Registration/company.ctp:41 View/Registration/worker.ctp:44
+msgid "dreamjob.save.registration"
+msgstr "anmelden"
+
 #: View/Registration/company.ctp:47 View/Registration/worker.ctp:50
 msgid "dreamjob.registration.done.text"
 msgstr ""
@@ -838,7 +841,7 @@ msgstr "Passwort zurücksetzen"
 
 #: View/Registration/password_reset.ctp:11
 msgid "dreamjob.password.reset.send"
-msgstr "Passwort zurücksetzen"
+msgstr "Passwort ändern"
 
 #: View/Registration/worker.ctp:19 View/User/settings_account.ctp:46
 msgid "dreamjob.worker"

app/Model/User.php

@@ -42,11 +42,11 @@ class User extends AppModel {
 		$key = substr($data['User']['code'],2);
 		$Email->viewVars(array('data'=>$data,'key'=>$key));
 		return $Email->send();
-        }
+	}
-        public static function sendPasswortResetMail($data){
+	public static function sendPasswortResetMail($data){
 		$Email = new CakeEmail('dreamjobMain');
 		$Email->to($data['User']['mail']);
-		$Email->subject('Welcome to our really cool thing');
+		$Email->subject('Passwort zurücksetzen');
 		$Email->template('password_reset');
 		$key = substr($data['User']['code'],2);
 		$Email->viewVars(array('data'=>$data,'key'=>$key));

app/View/Emails/html/password_reset.ctp

@@ -1,4 +1,23 @@
+
+Klicken Sie auf folgenden Link um Ihr Passwort zurückzusetzen<br/>
+
 <?php
-	echo $this->Html->link(__('dreamjob.password.reset.link'),array('controller' => 'registration', 'action' => 'password_replace','code'=>$key,
+	$url = $this->Html->url(array('controller'=>'registration','action'=>'password_replace','code'=>$key,'?'=>array('mail'=>$data['User']['mail'])),true);
-		'?'=>array('mail'=>$data['User']['mail']),'full_base' => true) );
+	echo $this->Html->link($url,$url);
 ?>
+<br/><br/>
+Bei Fragen wenden Sie sich gerne an unser Team:<br/>
+<a href="mailto:service@dream-job.eu">service@dream-job.eu</a><br/><br/>
+Jetzt noch mehr Funktionen!<br/>
+
+Mit unserem dreamJOB Premium-Account</br>
+<a href="https://dream-job.eu/premiumAccount">hier mehr infos</a><br/><br/>
+
+Mit freundlichen Gr&uuml;&szlig;en<br/> 
+Ihr dreamJOB Team<br/> 
+<br/> <br/> <br/> <br/> <br/> <br/>
+Ausgezeichnete Leistungen, bester Service: <br/>
+Herzlich willkommen bei der DAK-Gesundheit.<br/>
+<a href="https://www.dak.de/dak/formulare/Das_Gesundheitspaket-1320736.html"><img src="cid:dak.jpg"></a><br/><br/>
+<a href="https://dream-job.eu/agb">AGBs</a><br/>
+<a href="https://dream-job.eu/impressum">Impressum</a>

app/View/Emails/text/password_reset.ctp

@@ -1,4 +1,31 @@
+
+Klicken Sie auf folgenden Link um Ihr Passwort zurückzusetzen
+
 <?php
  echo $this->Html->url(array('controller'=>'registration','action'=>'password_replace','code'=>$key,
  	'?'=>array('mail'=>$data['User']['mail'])),true);
 ?>
+
+
+---
+Bei Fragen wenden Sie sich gerne an unser Team:
+service@dream-job.eu
+
+Jetzt noch mehr Funktionen!
+Mit unserem dreamJOB Premium-Account
+https://dream-job.eu/premiumAccount
+   
+Mit freundlichen Grüßen
+Ihr dreamJOB Team
+
+
+
+
+
+
+
+Ausgezeichnete Leistungen, bester Service:
+Herzlich willkommen bei der DAK-Gesundheit.
+
+https://dream-job.eu/agb
+https://dream-job.eu/impressum

app/View/Registration/company.ctp

@@ -38,7 +38,7 @@
 			<?=$this->Html->link(__("dreamjob.agb.accept"),array('controller'=>'home','action'=>'agb'),array('data-target'=>'#popup','data-toggle'=>"modal",'title'=>__('dreamjob.agb'),"ref"=>"eventOff"));?>
 		</div>
 		<br/>
-		<?=$this->Form->button(__('dreamjob.save'),array('div' => false,'class'=>"btn btn-primary ",'type' => 'submit'));?>
+		<?=$this->Form->button(__('dreamjob.save.registration'),array('div' => false,'class'=>"btn btn-primary ",'type' => 'submit'));?>
 	</div>
 </fieldset>
 <?php

app/View/Registration/worker.ctp

@@ -41,7 +41,7 @@
 			<?=$this->Html->link(__("dreamjob.agb.accept"),array('controller'=>'home','action'=>'agb'),array('data-target'=>'#popup','data-toggle'=>"modal",'title'=>__('dreamjob.agb'),"ref"=>"eventOff"));?>
 		</div>
 		<br/>
-		<?=$this->Form->button(__('dreamjob.save'),array('div' => false,'class'=>"btn btn-primary ",'type' => 'submit'));?>
+		<?=$this->Form->button(__('dreamjob.save.registration'),array('div' => false,'class'=>"btn btn-primary ",'type' => 'submit'));?>
 	</div>
 </fieldset>
 <?php