From a004b56d61e6b213a356290238969d51c77a5ebe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20M=C3=BCller?= Date: Mon, 16 Jun 2014 01:24:23 +0200 Subject: [PATCH] Password vergessen - Mail --- app/Locale/cake.pot | 2 +- app/Locale/cake_dev.pot | 2 +- app/Locale/default.pot | 13 ++++++------ app/Locale/deu/LC_MESSAGES/default.mo | Bin 16353 -> 16397 bytes app/Locale/deu/LC_MESSAGES/default.po | 15 +++++++------ app/Model/User.php | 8 +++---- app/View/Emails/html/password_reset.ctp | 23 ++++++++++++++++++-- app/View/Emails/text/password_reset.ctp | 27 ++++++++++++++++++++++++ app/View/Registration/company.ctp | 2 +- app/View/Registration/worker.ctp | 2 +- 10 files changed, 71 insertions(+), 23 deletions(-) diff --git a/app/Locale/cake.pot b/app/Locale/cake.pot index 1440243..35659f7 100644 --- a/app/Locale/cake.pot +++ b/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 \n" "Language-Team: LANGUAGE \n" diff --git a/app/Locale/cake_dev.pot b/app/Locale/cake_dev.pot index 63ca261..90716dc 100644 --- a/app/Locale/cake_dev.pot +++ b/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 \n" "Language-Team: LANGUAGE \n" diff --git a/app/Locale/default.pot b/app/Locale/default.pot index 247908e..f003262 100644 --- a/app/Locale/default.pot +++ b/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 \n" "Language-Team: LANGUAGE \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" diff --git a/app/Locale/deu/LC_MESSAGES/default.mo b/app/Locale/deu/LC_MESSAGES/default.mo index ba3578de5a365585d07356bdcc193187a9be8f71..dbfefd6f6d962a5b8713784e9187db5ffe61f1c9 100644 GIT binary patch delta 4339 zcmZA2dvKK18OQOnKyH}J?j|IV>x&XY5+Mlz!y4pPsxrtWhK?3tXkd3R2#JJ*43uU? zJ3<>M)^`}GmUafEq}2@K7EzEYO;QO&DyRsG#Epvg3vIE*vFi7iJ%72Av!C;x_q^vk z=Q-!yM8n(e^@K0@hwU(YE>dzSwe1JvggJOWj>bP?0Uov2QM`uh zp+u35MR+yN#E}@nQP^hh??jCo!F=X7r>HnIe2MDlBMMDWikff^YM|9f7xMrr1HZ=< zd=izJL-zg&dq0W_{1Pe?DOtwwXB@ut++-ZZ{N^Sq%J$Dt12rOl=3c%O&`x9w^E4`T zy{MI5w0ek68O%jJUyiyz1J!>qk|eVpHO_BP8QOzkJ#dVQI-WzuG+*IWn9A(BpN)#R z6t%Yjq>Gt@{FxwMdcF;n+DEO=VLsPypfdUuI+#gx>R**j{`J5@8pdD~7UILU!x2=( zZ=zCv2{my7c~xp1zO?cws0kLJ7H|)0#amDl?Lz*{A-=Q~XHbECltcdYU?RPAO2?um zn1mX59_oQ*_I``KzR$V?HBbj?;+K#`nttmQ)WqqmQd?YxIy+NQ8J!oVqLnR1J=lZ_ zU@I#1d+hyZP!sf_R`wn$z$-X-xQK$PaZt}qMfIPL>c0Xt?nc|b1Jys=NkthrVQ+kb z3TP;edSDbfI05yV)uL9^iW%u{#Movs>Ut3>GrvI1vl|uA zU(w6_<}?*e_%1s54QdPWcuE~BQ4`dlRpZ$mxz1S+s@)S-%^Qv3z#unp&x(gLzk zXJG_QE25Ox1Fmg2`a4l}PcW<1V9J+~Is{xB*dJ*e0AEGh$E zpcdpWik*eAIQTnKMEroT5qn`T{YMc(7f={6`^BHR8Ls+iHOU8K2N1c_zO7gD(#?vqx%TbYSz=ik_Dgz&& z_B@GY>%lbCKqE033sB=+XWPf4&cYTP)kwbk+A>thpMjf$`e zr{iqYgTF>ixE~eyAylBpt$nurBr4Sxa3+3;6&!VE0 zF0yVyrL+S}@nzHx(G}G1Ll&=!GLVDHNFHis<4^$N{X!9wcd|Y-+4u zJ?g%TTIgdK)=E36DAH#z2fL6TL(^}sQ>VoyEUcKOQ%?u6~ts zcVk0CbI56^Uw&7!Q`g|s)`y&Rp{BJVIyO74p{8J{!Pvg7EnNMuQ{-QPBc6o1hSi}} M!BC{Ldg8F}0jz}Q%K!iX delta 4226 zcmXZf3y@FO9l-JPk6o|q+heiVMOg1(msr9^Dw!6cis>|EJd#FDJzAZj75PgO$%Y7W z$AmPkpwdJ~T3soMrbN?3rLrMZw#cT$7%`2~3F##5_q+e|pa1!P&b{Z}bAIP{&b`*^ z<*9~r`fO3w`oQM`r6Xl@vk)p$A@d0duOJe&oSjh1v zEW(|bgNKoCsN=_RE+Fmca0|WI&<5LLFSO&k`00dGumpdIU2qMS;?8(nhut{7h8?h& zXu9GcY=={@Jd&Un#sF>}qqa960zTx})7*GvzZ`gvSZZA5MlhLba z26Kqg`^(Vwf#~()kmQ6pXg`mj8Cs8NZ`eb{3*Sci3LoRG_$Aujk|>P01YO%+NK+V& ze8XgZynjBL+Evk4urtShK{NU>mSIz(^ZN1*;HN^8-Wto6V(F_bgudhb>Nr(HXxTzMQGpa!ccmata z>_NWa6h8)Z1MQ%YXVaPYMenOd&riahI3MljIW*8(^!hq1!}Hjh@k2J@8bAlMp)Wen zedv-rgr;&ivYcT<^fk1@_mIhk3&=NQlP3BOJ<;PaXlCZ2<2;K7^h+#Y{BVeh10KgR z`~+QsT<-G1Zs-7`&>78)=a-@P{R|Ck7rLqH&`ov@4g6o|9%#m+<%Bw-=Z9dLvBLP+ zunkf40htY{#L^tIZXa@4iGfP`m zPX5a{QOyZwG9xzpIJyDN!0vebK01Tz=nV2$Xfx9T9r#`}6VuSW^AmLD8_@t?MKgF1 z&Cr>iwR#wha1)yHooI*0&>7dGH(W-RF*If2*$$x}I^ZN^Rl?MG{&DpF z?a|+33yu$AOFW8AeEv^mDxn_D#5p8`;bQbs^fG31{z^Q)hIaHHbRc)8f##qy?T8bx zAC_S{o_`S=Cy4nz|Hr5_4vfy=BD%@)Z_m6~dZC#afd)1KP3gpV{7^jpE*j7>w7(j3 z#%rA(t(ccA?>;4sDy*QmG&`w!rsR2+j{@CkIYyo`2m7Ax^;Jnk_t(_V$_x3B|_Dw>CdSb%1rYdpR)IvyQh273Kcw4-HsC$2y< za|oUJDYU-^Y>L;=z4AGFf0GLG|1~Pv+x0;{qhO@HqMc*^Or6BpSe{vHd3URt3|Znwd!@ zy4GXS0Bg|q$2x3CVJ=+$WRs?3Y26q#r`49---R5YcJ#p9Rb@iF8@5w4>d zxPfNmb981chh=vA0CcyH!uB`;591tce7bnFcvXZkXn;%5zdyrDDyDE7nv&l%Hn3Lc zjNU~z&3SZlrI@}c%tdF|4)gGKbW@JRTW~D;7>-A;n~r^O5%$6@w)^}arDBTDpfmgw zd*i>+8Fd zDX)(g8kM_v9_3BS`^mbzNmI^Jvs**EpK_e?JIY$hQpy5~J7f>V&%G4q*@p5ucw6FJ$|{N*`yAy$awWfb)H~Gttfow+ z)Ki|M_*qPGSDm6vqxhLcsio|tFu`y%xu>8y^`~S-L7x`x%)e6(C3_1>Q>T;D1r@3D zNp4}c><>75BpFXs8xE( zPjb4jG_^mu$?u0r`=XNUe{gblQdLxv`%&Ws{8fo>Co_x6TO6bI2<2q5uBf\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/worker.ctp:44 View/User/settings_account.ctp:88 +#: View/Registration/password_replace.ctp:12 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" diff --git a/app/Model/User.php b/app/Model/User.php index a0f2215..576c699 100755 --- a/app/Model/User.php +++ b/app/Model/User.php @@ -41,12 +41,12 @@ class User extends AppModel { $Email->template('delete_order'); $key = substr($data['User']['code'],2); $Email->viewVars(array('data'=>$data,'key'=>$key)); - return $Email->send(); - } - public static function sendPasswortResetMail($data){ + return $Email->send(); + } + 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)); diff --git a/app/View/Emails/html/password_reset.ctp b/app/View/Emails/html/password_reset.ctp index 2333a5d..0abaf67 100644 --- a/app/View/Emails/html/password_reset.ctp +++ b/app/View/Emails/html/password_reset.ctp @@ -1,4 +1,23 @@ + +Klicken Sie auf folgenden Link um Ihr Passwort zurückzusetzen
+ Html->link(__('dreamjob.password.reset.link'),array('controller' => 'registration', 'action' => 'password_replace','code'=>$key, - '?'=>array('mail'=>$data['User']['mail']),'full_base' => true) ); + $url = $this->Html->url(array('controller'=>'registration','action'=>'password_replace','code'=>$key,'?'=>array('mail'=>$data['User']['mail'])),true); + echo $this->Html->link($url,$url); ?> +

+Bei Fragen wenden Sie sich gerne an unser Team:
+service@dream-job.eu

+Jetzt noch mehr Funktionen!
+ +Mit unserem dreamJOB Premium-Account
+hier mehr infos

+ +Mit freundlichen Grüßen
+Ihr dreamJOB Team
+





+Ausgezeichnete Leistungen, bester Service:
+Herzlich willkommen bei der DAK-Gesundheit.
+

+AGBs
+Impressum diff --git a/app/View/Emails/text/password_reset.ctp b/app/View/Emails/text/password_reset.ctp index 41f88d0..5500505 100644 --- a/app/View/Emails/text/password_reset.ctp +++ b/app/View/Emails/text/password_reset.ctp @@ -1,4 +1,31 @@ + +Klicken Sie auf folgenden Link um Ihr Passwort zurückzusetzen + 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 diff --git a/app/View/Registration/company.ctp b/app/View/Registration/company.ctp index cb5b2b9..9eee162 100644 --- a/app/View/Registration/company.ctp +++ b/app/View/Registration/company.ctp @@ -38,7 +38,7 @@ Html->link(__("dreamjob.agb.accept"),array('controller'=>'home','action'=>'agb'),array('data-target'=>'#popup','data-toggle'=>"modal",'title'=>__('dreamjob.agb'),"ref"=>"eventOff"));?>
- Form->button(__('dreamjob.save'),array('div' => false,'class'=>"btn btn-primary ",'type' => 'submit'));?> + Form->button(__('dreamjob.save.registration'),array('div' => false,'class'=>"btn btn-primary ",'type' => 'submit'));?> Html->link(__("dreamjob.agb.accept"),array('controller'=>'home','action'=>'agb'),array('data-target'=>'#popup','data-toggle'=>"modal",'title'=>__('dreamjob.agb'),"ref"=>"eventOff"));?>
- Form->button(__('dreamjob.save'),array('div' => false,'class'=>"btn btn-primary ",'type' => 'submit'));?> + Form->button(__('dreamjob.save.registration'),array('div' => false,'class'=>"btn btn-primary ",'type' => 'submit'));?>