miconware
/
dreamjob
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

#92 Loginanfrage - mit Fehlermeldung

This commit is contained in:
Martin Müller 2014-10-04 15:44:21 +02:00
parent 082f2c826f
commit e041210296
9 changed files with 130 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Controller/HomeController.php
View File

@ -63,12 +63,7 @@ class HomeController extends AppController {
$this->MiconwareSession->initWeb($this); $this->MiconwareSession->initWeb($this);
$openings = $this->DreamjobJobOpening->find('all',array('conditions'=>$this->MiconwareSession->getOpeningCondition(), $this->render('/Home/login');
'order'=>'DreamjobJobOpening.id DESC','limit'=> self::$opening_limit));
$this->set('openings',$openings);
$this->set('title', __('dreamjob.startpage'));
$this->set('MENU_START', true);
$this->render('/Home/home');
} }
public function logout(){ public function logout(){

32
app/Controller/JobController.php
View File

@ -27,6 +27,9 @@ class JobController extends AppController {
if (!is_array($self) or count($self) <= 0) { if (!is_array($self) or count($self) <= 0) {
$this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text'))); $this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text')));
if(!$this->MiconwareSession->isLoggedin())
$this->render('/Home/login');
else
$this->render('/Home/error'); $this->render('/Home/error');
} else { } else {
if (!empty($this->request->query['del'])) { if (!empty($this->request->query['del'])) {
@ -69,6 +72,9 @@ class JobController extends AppController {
$this->render('/Job/opening_edit'); $this->render('/Job/opening_edit');
} else { } else {
$this->set('error', array('title'=>__('dreamjob.error.noCompany.title'),'text'=>__('dreamjob.error.noCompany.text'))); $this->set('error', array('title'=>__('dreamjob.error.noCompany.title'),'text'=>__('dreamjob.error.noCompany.text')));
if(!$this->MiconwareSession->isLoggedin())
$this->render('/Home/login');
else
$this->render('/Home/error'); $this->render('/Home/error');
} }
} }
@ -80,8 +86,10 @@ class JobController extends AppController {
$a = $this->MiconwareSession->getCompany(); $a = $this->MiconwareSession->getCompany();
if (empty($a)) { if (empty($a)) {
$this->set('error', array('title'=>__('dreamjob.error.noCompany.title'),'text'=>__('dreamjob.error.noCompany.text'))); $this->set('error', array('title'=>__('dreamjob.error.noCompany.title'),'text'=>__('dreamjob.error.noCompany.text')));
if(!$this->MiconwareSession->isLoggedin())
$this->render('/Home/login');
else
$this->render('/Home/error'); $this->render('/Home/error');
return null;
} }
if (!empty($this->request->params['id'])) { if (!empty($this->request->params['id'])) {
$load = $this->DreamjobJobOpening->findById($this->request->params['id']); $load = $this->DreamjobJobOpening->findById($this->request->params['id']);
@ -153,6 +161,10 @@ class JobController extends AppController {
if (!is_array($opening) or count($opening) <= 0) { if (!is_array($opening) or count($opening) <= 0) {
$this->set('error', array('title'=>__('dreamjob.error.opening.notFound.title'),'text'=>__('dreamjob.error.opening.notFound.text'))); $this->set('error', array('title'=>__('dreamjob.error.opening.notFound.title'),'text'=>__('dreamjob.error.opening.notFound.text')));
if(!$this->MiconwareSession->isLoggedin())
$this->render('/Home/login');
else
$this->render('/Home/error');
$this->render('/Home/error'); $this->render('/Home/error');
} else { } else {
$this->set('opening', $opening); $this->set('opening', $opening);
@ -167,6 +179,9 @@ class JobController extends AppController {
$self = $this->MiconwareSession->getWorker(); $self = $this->MiconwareSession->getWorker();
if (!is_array($self) or count($self) <= 0) { if (!is_array($self) or count($self) <= 0) {
$this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text'))); $this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text')));
if(!$this->MiconwareSession->isLoggedin())
$this->render('/Home/login');
else
$this->render('/Home/error'); $this->render('/Home/error');
} else { } else {
$fav_id = array(); $fav_id = array();
@ -189,6 +204,9 @@ class JobController extends AppController {
if (!is_array($self) or count($self) <= 0) { if (!is_array($self) or count($self) <= 0) {
$this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text'))); $this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text')));
if(!$this->MiconwareSession->isLoggedin())
$this->render('/Home/login');
else
$this->render('/Home/error'); $this->render('/Home/error');
} else { } else {
$applications = $this->DreamjobJobApplication->find('all', array('conditions' => array('DreamjobJobApplication.worker_id' => $self['AppUser']['id']))); $applications = $this->DreamjobJobApplication->find('all', array('conditions' => array('DreamjobJobApplication.worker_id' => $self['AppUser']['id'])));
@ -214,6 +232,9 @@ class JobController extends AppController {
if (!is_array($application) or count($application) <= 0) { if (!is_array($application) or count($application) <= 0) {
$this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text'))); $this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text')));
if(!$this->MiconwareSession->isLoggedin())
$this->render('/Home/login');
else
$this->render('/Home/error'); $this->render('/Home/error');
} else { } else {
$this->set('page', null); $this->set('page', null);
@ -313,6 +334,9 @@ class JobController extends AppController {
} }
if (!is_array($opening) or count($opening) <= 0) { if (!is_array($opening) or count($opening) <= 0) {
$this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text'))); $this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text')));
if(!$this->MiconwareSession->isLoggedin())
$this->render('/Home/login');
else
$this->render('/Home/error'); $this->render('/Home/error');
} else { } else {
$this->set('opening', $opening); $this->set('opening', $opening);
@ -364,6 +388,9 @@ class JobController extends AppController {
} }
} else { } else {
$this->set('error', array('title'=>__('dreamjob.error.noWorker.title'),'text'=>__('dreamjob.error.noWorker.text'))); $this->set('error', array('title'=>__('dreamjob.error.noWorker.title'),'text'=>__('dreamjob.error.noWorker.text')));
if(!$this->MiconwareSession->isLoggedin())
$this->render('/Home/login');
else
$this->render('/Home/error'); $this->render('/Home/error');
} }
} }
@ -445,6 +472,9 @@ class JobController extends AppController {
} else { } else {
$this->set('error', array('title'=>__('dreamjob.error.noWorker.title'),'text'=>__('dreamjob.error.noWorker.text'))); $this->set('error', array('title'=>__('dreamjob.error.noWorker.title'),'text'=>__('dreamjob.error.noWorker.text')));
if(!$this->MiconwareSession->isLoggedin())
$this->render('/Home/login');
else
$this->render('/Home/error'); $this->render('/Home/error');
} }
} }

6
app/Controller/PdfController.php
View File

@ -23,6 +23,9 @@ class PdfController extends AppController {
if(!is_array($application) or count($application) <= 0){ if(!is_array($application) or count($application) <= 0){
$this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text'))); $this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text')));
if(!$this->MiconwareSession->isLoggedin())
$this->render('/Home/login');
else
$this->render('/Home/error'); $this->render('/Home/error');
}else{ }else{
$this->response->type('application/pdf'); $this->response->type('application/pdf');
@ -44,6 +47,9 @@ class PdfController extends AppController {
if(!is_array($WORKER) or count($WORKER) <= 0){ if(!is_array($WORKER) or count($WORKER) <= 0){
$this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text'))); $this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text')));
if(!$this->MiconwareSession->isLoggedin())
$this->render('/Home/login');
else
$this->render('/Home/error'); $this->render('/Home/error');
}else{ }else{
$this->response->type('application/pdf'); $this->response->type('application/pdf');

9
app/Controller/SearchController.php
View File

@ -72,6 +72,9 @@ class SearchController extends AppController {
$this->render('/Search/' . $type); $this->render('/Search/' . $type);
} else { } else {
$this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text'))); $this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text')));
if(!$this->MiconwareSession->isLoggedin())
$this->render('/Home/login');
else
$this->render('/Home/error'); $this->render('/Home/error');
} }
} }
@ -152,6 +155,9 @@ class SearchController extends AppController {
$this->render('/Search/auto'); $this->render('/Search/auto');
} else { } else {
$this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text'))); $this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text')));
if(!$this->MiconwareSession->isLoggedin())
$this->render('/Home/login');
else
$this->render('/Home/error'); $this->render('/Home/error');
} }
} }
@ -190,6 +196,9 @@ class SearchController extends AppController {
$this->render('/Search/worker'); $this->render('/Search/worker');
}else { }else {
$this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text'))); $this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text')));
if(!$this->MiconwareSession->isLoggedin())
$this->render('/Home/login');
else
$this->render('/Home/error'); $this->render('/Home/error');
} }
} }

25
app/Controller/UserController.php
View File

@ -98,6 +98,9 @@ class UserController extends AppController {
$hard_error = true; $hard_error = true;
$this->MiconwareSession->setFlash(__('dreamjob.error.page.notFound'),'flash',array('alert'=>'danger')); $this->MiconwareSession->setFlash(__('dreamjob.error.page.notFound'),'flash',array('alert'=>'danger'));
$this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text'))); $this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text')));
if(!$this->MiconwareSession->isLoggedin())
$this->render('/Home/login');
else
$this->render('/Home/error'); $this->render('/Home/error');
} }
}elseif($profil['AppUser']['id'] == $self['AppUser']['id']){ }elseif($profil['AppUser']['id'] == $self['AppUser']['id']){
@ -155,6 +158,9 @@ class UserController extends AppController {
$this->render('/User/worker'); $this->render('/User/worker');
}else{ }else{
$this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text'))); $this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text')));
if(!$this->MiconwareSession->isLoggedin())
$this->render('/Home/login');
else
$this->render('/Home/error'); $this->render('/Home/error');
} }
} }
@ -201,6 +207,9 @@ class UserController extends AppController {
if(empty($profil) or count($profil) <= 0){ if(empty($profil) or count($profil) <= 0){
$this->MiconwareSession->setFlash(__('dreamjob.error.page.notFound'),'flash',array('alert'=>'danger')); $this->MiconwareSession->setFlash(__('dreamjob.error.page.notFound'),'flash',array('alert'=>'danger'));
$this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text'))); $this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text')));
if(!$this->MiconwareSession->isLoggedin())
$this->render('/Home/login');
else
$this->render('/Home/error'); $this->render('/Home/error');
}else{ }else{
if(isset($this->request->query['list']) and is_array($this->request->query['list'])){ if(isset($this->request->query['list']) and is_array($this->request->query['list'])){
@ -248,6 +257,9 @@ class UserController extends AppController {
if(empty($profil) or count($profil) <= 0){ if(empty($profil) or count($profil) <= 0){
$this->MiconwareSession->setFlash(__('dreamjob.error.page.notFound'),'flash',array('alert'=>'danger')); $this->MiconwareSession->setFlash(__('dreamjob.error.page.notFound'),'flash',array('alert'=>'danger'));
$this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text'))); $this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text')));
if(!$this->MiconwareSession->isLoggedin())
$this->render('/Home/login');
else
$this->render('/Home/error'); $this->render('/Home/error');
}else{ }else{
if ($this->request->is('post')){ if ($this->request->is('post')){
@ -324,6 +336,9 @@ class UserController extends AppController {
if(empty($profil) or count($profil) <= 0){ if(empty($profil) or count($profil) <= 0){
$this->MiconwareSession->setFlash(__('dreamjob.error.page.notFound'),'flash',array('alert'=>'danger')); $this->MiconwareSession->setFlash(__('dreamjob.error.page.notFound'),'flash',array('alert'=>'danger'));
$this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text'))); $this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text')));
if(!$this->MiconwareSession->isLoggedin())
$this->render('/Home/login');
else
$this->render('/Home/error'); $this->render('/Home/error');
}else{ }else{
//PAGE BEARBEITEN //PAGE BEARBEITEN
@ -440,6 +455,9 @@ class UserController extends AppController {
if(empty($profil) or count($profil) <= 0){ if(empty($profil) or count($profil) <= 0){
$this->MiconwareSession->setFlash(__('dreamjob.error.page.notFound'),'flash',array('alert'=>'danger')); $this->MiconwareSession->setFlash(__('dreamjob.error.page.notFound'),'flash',array('alert'=>'danger'));
$this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text'))); $this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text')));
if(!$this->MiconwareSession->isLoggedin())
$this->render('/Home/login');
else
$this->render('/Home/error'); $this->render('/Home/error');
}else{ }else{
if($this->request->is('post')){ if($this->request->is('post')){
@ -486,6 +504,10 @@ class UserController extends AppController {
if(empty($profil) or count($profil) <= 0){ if(empty($profil) or count($profil) <= 0){
$this->MiconwareSession->setFlash(__('dreamjob.error.page.notFound'),'flash',array('alert'=>'danger')); $this->MiconwareSession->setFlash(__('dreamjob.error.page.notFound'),'flash',array('alert'=>'danger'));
$this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text'))); $this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text')));
if(!$this->MiconwareSession->isLoggedin())
$this->render('/Home/login');
else
$this->render('/Home/error'); $this->render('/Home/error');
}else{ }else{
if ($this->request->is('post')){ if ($this->request->is('post')){
@ -515,6 +537,9 @@ class UserController extends AppController {
if(empty($profil) or count($profil) <= 0){ if(empty($profil) or count($profil) <= 0){
$this->MiconwareSession->setFlash(__('dreamjob.error.page.notFound'),'flash',array('alert'=>'danger')); $this->MiconwareSession->setFlash(__('dreamjob.error.page.notFound'),'flash',array('alert'=>'danger'));
$this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text'))); $this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text')));
if(!$this->MiconwareSession->isLoggedin())
$this->render('/Home/login');
else
$this->render('/Home/error'); $this->render('/Home/error');
}else{ }else{
if($this->request->is('put') or $this->request->is('post')){ if($this->request->is('put') or $this->request->is('post')){

BIN
app/Locale/deu/LC_MESSAGES/default.mo
View File

Binary file not shown.

4
app/Locale/deu/LC_MESSAGES/default.po
View File

@ -104,7 +104,7 @@ msgstr "Zugriff verweigert"
#: Controller/SearchController.php:74;154;192 #: Controller/SearchController.php:74;154;192
#: Controller/UserController.php:100;157;203;250;326;442;488;517 #: Controller/UserController.php:100;157;203;250;326;442;488;517
msgid "dreamjob.error.noPermision.text" msgid "dreamjob.error.noPermision.text"
msgstr "überprüfen Sie, ob Sie tatsächlich angemeldet sind" msgstr "Sie haben hier keine Rechte."
#: Controller/JobController.php:36 #: Controller/JobController.php:36
msgid "dreamjob.opening.delete.success" msgid "dreamjob.opening.delete.success"
@ -181,7 +181,7 @@ msgstr "Zugriff verweigert"
#: Controller/JobController.php:365 #: Controller/JobController.php:365
msgid "dreamjob.error.noWorker.text" msgid "dreamjob.error.noWorker.text"
msgstr "überprüfen Sie, ob Sie tatsächlich angemedet sind" msgstr "Sie haben hier keine Rechte."
#: Controller/RegistrationController.php:21;76;134;147;171 #: Controller/RegistrationController.php:21;76;134;147;171
msgid "dreamjob.error.loggedin.title" msgid "dreamjob.error.loggedin.title"

22
app/View/Home/login.ctp Normal file
View File

@ -0,0 +1,22 @@
<?php
?>
<div class="box 2modal">
<h1 class="modal-title" style="background-color:#9D1C16;color:white;"><?=__('dreamjob.login');?></h1>
<?php
$default_Form['back'] = true;
$default_Form['url'] = array('controller'=>'home','action'=>'login');
$default_Form['class'] = 'modal-body';
echo $this->Form->create(null, $default_Form);
echo $this->Form->input('User.mail',array('placeholder'=>__('dreamjob.mail'),'label'=>array('text'=>__("dreamjob.mail"),"class"=>$default_Form['inputDefaults']['label']['class'])));
echo $this->Form->input('User.password',array('placeholder'=>__('dreamjob.password'),'label'=>array('text'=>__("dreamjob.password"),"class"=>$default_Form['inputDefaults']['label']['class'])));
?>
<div class="form-group">
<div class="modal-footer">
<?=$this->Form->button(__('dreamjob.login'),array('class'=>'btn btn-primary','type'=>'submit'));?>
<?=$this->Html->link(__('dreamjob.registration.to'),array('controller'=>'registration','action'=>'worker'),array('class'=>'btn btn-default'));?>
<?=$this->Html->link(__('dreamjob.password.forget'),array('controller'=>'registration','action'=>'password_reset'),array('style'=>'float:left;'));?>
</div>
</div>
<?=$this->Form->end();?>
</div>

2
app/webroot/js/dreamjob.js
View File

@ -26,6 +26,8 @@ var global_load = null;
$("#popup .modal-title").html($("#container div.box.2modal .modal-title", data).html()); $("#popup .modal-title").html($("#container div.box.2modal .modal-title", data).html());
$("#popup .modal-body").html($("#container div.box.2modal .modal-body", data).html()); $("#popup .modal-body").html($("#container div.box.2modal .modal-body", data).html());
$("#popup .modal-footer").html($("#container div.box.2modal .modal-footer", data).html()); $("#popup .modal-footer").html($("#container div.box.2modal .modal-footer", data).html());
$("#popup .modal-body .modal-footer").remove();
$("#popup .modal-content").attr("action",$(".2modal form.modal-body",data).attr("action"));
}, error: function(data) { }, error: function(data) {
}}); }});
}); });