From b9255be77a2cfb20cfde58854ca348c1249e28df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20M=C3=BCller?= Date: Mon, 28 Apr 2014 22:17:49 +0200 Subject: [PATCH] md5 fur keyGen + placeholder diffrent --- .../Component/MiconwareSessionComponent.php | 2 +- app/Locale/cake.pot | 2 +- app/Locale/cake_dev.pot | 2 +- app/Locale/default.pot | 24 ++++++++++++++----- app/View/Home/home.ctp | 2 +- app/View/Search/academy.ctp | 2 +- app/View/Search/education.ctp | 2 +- app/View/Search/internship.ctp | 2 +- 8 files changed, 25 insertions(+), 13 deletions(-) diff --git a/app/Controller/Component/MiconwareSessionComponent.php b/app/Controller/Component/MiconwareSessionComponent.php index 5e827d6..40d4104 100755 --- a/app/Controller/Component/MiconwareSessionComponent.php +++ b/app/Controller/Component/MiconwareSessionComponent.php @@ -121,7 +121,7 @@ class MiconwareSessionComponent extends Component { } public static function generateKey($length=8){ - return base64_encode(mcrypt_create_iv($length, MCRYPT_DEV_URANDOM)); + return md5(mcrypt_create_iv($length, MCRYPT_DEV_URANDOM)); } /** diff --git a/app/Locale/cake.pot b/app/Locale/cake.pot index b93bc2c..12f9085 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-04-28 12:52+0200\n" +"POT-Creation-Date: 2014-04-28 22: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 25d5d90..df2f337 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-04-28 12:52+0200\n" +"POT-Creation-Date: 2014-04-28 22: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 88bc18a..02781c3 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-04-28 12:52+0200\n" +"POT-Creation-Date: 2014-04-28 22:17+0200\n" "PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n" "Last-Translator: NAME \n" "Language-Team: LANGUAGE \n" @@ -361,11 +361,7 @@ msgid "dreamjob.message.send" msgstr "" #: View/Home/home.ctp:13 -#: View/Search/academy.ctp:20 -#: View/Search/education.ctp:20 -#: View/Search/internship.ctp:20 -#: View/Search/opening.ctp:20 -msgid "dreamjob.search.opening.placeholder" +msgid "dreamjob.search.opening.startpage.placeholder" msgstr "" #: View/Home/home.ctp:22 @@ -735,6 +731,10 @@ msgstr "" msgid "dreamjob.country" msgstr "" +#: View/Search/academy.ctp:20 +msgid "dreamjob.search.opening.academy.placeholder" +msgstr "" + #: View/Search/academy.ctp:24;25 #: View/Search/company.ctp:25;26 #: View/Search/education.ctp:24;25 @@ -751,6 +751,10 @@ msgstr "" msgid "dreamjob.search.company.placeholder" msgstr "" +#: View/Search/education.ctp:20 +msgid "dreamjob.search.opening.education.placeholder" +msgstr "" + #: View/Search/education.ctp:24 msgid "dreamjob.branch.placeholder" msgstr "" @@ -759,6 +763,14 @@ msgstr "" msgid "dreamjob.city.placeholder" msgstr "" +#: View/Search/internship.ctp:20 +msgid "dreamjob.search.opening.internship.placeholder" +msgstr "" + +#: View/Search/opening.ctp:20 +msgid "dreamjob.search.opening.placeholder" +msgstr "" + #: View/Search/worker.ctp:14 msgid "dreamjob.search.worker" msgstr "" diff --git a/app/View/Home/home.ctp b/app/View/Home/home.ctp index a8ebe46..ba3c93a 100755 --- a/app/View/Home/home.ctp +++ b/app/View/Home/home.ctp @@ -10,7 +10,7 @@
Form->create(null,array('inputDefaults'=> array('div' => false,'label'=>false,'class' => 'form-control'),'url'=>array('controller'=>'search', 'action'=>'opening'),'type'=>'get')); ?>
- Form->input('DreamjobJobOpening.title',array('placeholder'=>__('dreamjob.search.opening.placeholder')));?> + Form->input('DreamjobJobOpening.title',array('placeholder'=>__('dreamjob.search.opening.startpage.placeholder')));?> Form->button('',array('div' => false,'class'=>"btn btn-default",'type' => 'submit')); ?> diff --git a/app/View/Search/academy.ctp b/app/View/Search/academy.ctp index 157a617..b0d2b9b 100644 --- a/app/View/Search/academy.ctp +++ b/app/View/Search/academy.ctp @@ -17,7 +17,7 @@ $a = $default_hForm['inputDefaults']; $a['inputDefaults']['between'] = false; $a['inputDefaults']['after'] = false; - $a['placeholder'] = __('dreamjob.search.opening.placeholder'); + $a['placeholder'] = __('dreamjob.search.opening.academy.placeholder'); echo $this->Form->input('DreamjobJobOpening.title',$a); ?>
diff --git a/app/View/Search/education.ctp b/app/View/Search/education.ctp index 0bbe7f0..a3270cc 100644 --- a/app/View/Search/education.ctp +++ b/app/View/Search/education.ctp @@ -17,7 +17,7 @@ $a = $default_hForm['inputDefaults']; $a['inputDefaults']['between'] = false; $a['inputDefaults']['after'] = false; - $a['placeholder'] = __('dreamjob.search.opening.placeholder'); + $a['placeholder'] = __('dreamjob.search.opening.education.placeholder'); echo $this->Form->input('DreamjobJobOpening.title',$a); ?>
diff --git a/app/View/Search/internship.ctp b/app/View/Search/internship.ctp index c7bac6b..bdf91b7 100644 --- a/app/View/Search/internship.ctp +++ b/app/View/Search/internship.ctp @@ -17,7 +17,7 @@ $a = $default_hForm['inputDefaults']; $a['inputDefaults']['between'] = false; $a['inputDefaults']['after'] = false; - $a['placeholder']=__('dreamjob.search.opening.placeholder'); + $a['placeholder']=__('dreamjob.search.opening.internship.placeholder'); echo $this->Form->input('DreamjobJobOpening.title',$a); ?>