Merge branch 'master' of http://git.dev.miconware.de/dreamjob

.gitignore

@@ -1,6 +1,9 @@
 # User specific & automatically generated files #
 #################################################
 /app/Config/database.php
+/app/webroot/uploads/
+/app/webroot/avatar/
+/app/webroot/dreamjob/
 /app/tmp
 /lib/Cake/Console/Templates/skel/tmp/
 /plugins

app/Config/core.php

@@ -217,9 +217,10 @@ Configure::write('Routing.prefixes', array('admin'));
  *
  */
 Configure::write('Session', array(
-		'defaults' => 'php'
+	'defaults' => 'php',
-	));
+	'cookie' => 'PHPSESSID'
-
+	)
+);
 /**
  * A random string used in security hashing methods.
  */
@@ -384,10 +385,3 @@ Cache::config('_cake_model_', array(
 	'serialize' => ($engine === 'File'),
 	'duration' => $duration
 ));
-
-
-Configure::write('Session', array(
-	'defaults' => 'php',
-	'cookie' => 'DreamJOBSession'
-	)
-);

app/Config/routes.php

@@ -34,8 +34,8 @@
 	Router::connect('/profil', array('controller' => 'user', 'action' => 'profil'));
 	Router::connect('/profil/page/:page', array('controller' => 'user', 'action' => 'profil'),array("page" => "[0-9]+"));
 	Router::connect('/settings', array('controller' => 'user', 'action' => 'settings_account'));
-	Router::connect('/settings/pages', array('controller' => 'user', 'action' => 'settings_pages'));
+	Router::connect('/settings/pages', array('controller' => 'user', 'action' => 'settings_pageInh'));
-	Router::connect('/settings/pages/:page', array('controller' => 'user', 'action' => 'settings_pages'),array("page" => "[0-9]+"));
+	Router::connect('/settings/pages/:page', array('controller' => 'user', 'action' => 'settings_pageInh'),array("page" => "[0-9]+"));
 	Router::connect('/settings/isearch', array('controller' => 'user', 'action' => 'settings_isearch'));
 	
 	
@@ -60,6 +60,8 @@
 	
 	Router::connect('/favorite', array('controller' => 'job', 'action' => 'favorite'));
 	
+	Router::connect('/search', array('controller' => 'search', 'action' => 'listopening'));
+	
 	Router::connect('/test/', array('controller' => 'user', 'action' => 'test'));
 	
 	Router::parseExtensions('json');

app/Controller/AppController.php

@@ -34,7 +34,5 @@ class AppController extends Controller {
 
 	public $components = array('Security','MiconwareSession');
 		
-	function beforeFilter(){
+	
-		parent::beforeFilter();
-	}
 }

app/Controller/Component/MiconwareSessionComponent.php

@@ -19,7 +19,7 @@ class MiconwareSessionComponent extends Component {
 			$controller->set("COMPANY",($this->self_company_obj)?$this->self_company_obj:false);
 		}
 		$controller->set("isStaff",$this->isStaff());
-		$controller->set("MEDIA_URL","http://dev.dreamjob.cc/media/");
+		$controller->set("MEDIA_URL","/");
 		$controller->set('default_sForm',array(
 			'inputDefaults' => array(
 				'div' => array('class' => 'control-group'),
@@ -30,11 +30,9 @@ class MiconwareSessionComponent extends Component {
 			);
 		$controller->set('default_hForm',array(
 			'inputDefaults' => array(
-				'div' => array('class' => 'form-group'),
+				'div' => false,
-				'label' => array('class' => 'col-sm-3 control-label'),
+				'label' => false,
-				'between' => '<div class="col-sm-9">',
+				'error' => false,
-				'after' => '</div>',
-				'error' => array('attribute'=>array('wrap'=>'span','class'=>'help-block')),
 				'class' => 'form-control '),
 			'class'=>'hide-form hide-input'
 			)
@@ -108,6 +106,20 @@ class MiconwareSessionComponent extends Component {
 			'conditions' => array('AppUser.user_id' => $user_id)
 		));
 	}
+	
+	
+	
+	public static function getOpeningCondition(){
+		return array('and'=>array(
+			'DreamjobJobOpening.active'=>true,
+			'DreamjobJobOpening.startdate <='=> date("Y-m-d"),
+			'DreamjobJobOpening.enddate >='=> date("Y-m-d", strtotime("+1 day"))
+		));
+	}
+	
+	
+	
+	
 	/**
 	 * PasswordHasg
 	 */

app/Controller/HomeController.php

@@ -20,11 +20,14 @@ class HomeController extends AppController {
 	 * @throws NotFoundException When the view file could not be found
 	 *	or MissingViewException in debug mode.
 	 */
-	private  $home_opening_condition = array('contitions'=>array('active'=>true),'order'=>'DreamjobJobOpening.id DESC','limit'=>3);
+	
+	private $opening_limit = 3;
+	
 	public function home() {
 		$this->MiconwareSession->init($this);
 		$this->MiconwareSession->initWeb($this);
-		$openings = $this->DreamjobJobOpening->find('all',$this->home_opening_condition);
+		$openings = $this->DreamjobJobOpening->find('all',array('conditions'=>$this->MiconwareSession->getOpeningCondition(),
+		'order'=>'DreamjobJobOpening.id DESC','limit'=> $this->opening_limit));
 		$this->set('openings',$openings);
 		$this->set('title', 'dreamjob.startpage');
 		$this->set('MENU_START', true);
@@ -51,7 +54,8 @@ class HomeController extends AppController {
 		
 		
 		$this->MiconwareSession->initWeb($this);
-		$openings = $this->DreamjobJobOpening->find('all',$this->home_opening_condition);
+		$openings = $this->DreamjobJobOpening->find('all',array('conditions'=>$this->MiconwareSession->getOpeningCondition(),
+		'order'=>'DreamjobJobOpening.id DESC','limit'=> $this->opening_limit));
 		$this->set('openings',$openings);
 		$this->set('title', 'dreamjob.startpage');
 		$this->set('MENU_START', true);
@@ -67,7 +71,8 @@ class HomeController extends AppController {
 			$this->MiconwareSession->setFlash('dreamjob.loggingoutError','flash',array('alert'=>'danger'));
 		
 		$this->MiconwareSession->initWeb($this);
-		$openings = $this->DreamjobJobOpening->find('all',$this->home_opening_condition);
+		$openings = $this->DreamjobJobOpening->find('all',array('conditions'=>$this->MiconwareSession->getOpeningCondition(),
+		'order'=>'DreamjobJobOpening.id DESC','limit'=> $this->opening_limit));
 		$this->set('openings',$openings);
 		$this->set('title', 'dreamjob.startpage');
 		$this->set('MENU_START', true);
@@ -91,7 +96,7 @@ class HomeController extends AppController {
 	}
 
 
-	public function iagb() {
+	public function agb() {
 		$this->MiconwareSession->init($this);
 		$this->MiconwareSession->initWeb($this);
 		$this->set('title', 'dreamjob.agb');

app/Controller/JobController.php

@@ -10,7 +10,7 @@ class JobController extends AppController {
 	 * @var array
 	 */
 	 
-	public $uses = array('DreamjobJobOpening','DreamjobJobFavority','DreamjobJobApplication','DreamjobPageText','DreamjobPageImage','DreamjobJobMsg','DreamjobCvCategory');
+	public $uses = array('DreamjobJobOpening','DreamjobJobFavority','DreamjobJobApplication','DreamjobPageText','DreamjobPageImage','DreamjobJobMsg','DreamjobCvCategory','DreamjobListBranch');
 	
 	/**
 	 * Displays a view
@@ -61,6 +61,7 @@ class JobController extends AppController {
 			}
 			$this->set('kindofjobs', $this->DreamjobJobOpening->DreamjobListKindofjob->find('list'));
 			$this->set('graducations', $this->DreamjobJobOpening->DreamjobListGraducation->find('list'));
+			$this->set('branches',$this->DreamjobListBranch->find('list'));
 			$this->render('/Job/opening_edit');
 		}else{
 			$this->set('error', 'dreamjob.error.noCompany');
@@ -95,6 +96,7 @@ class JobController extends AppController {
 		    $this->request->data=$load;
 			$this->set('kindofjobs', $this->DreamjobJobOpening->DreamjobListKindofjob->find('list'));
 			$this->set('graducations', $this->DreamjobJobOpening->DreamjobListGraducation->find('list'));
+			$this->set('branches',$this->DreamjobListBranch->find('list'));
 		}
 		
 		if(empty($this->request->data['DreamjobJobOpening'])){
@@ -133,7 +135,9 @@ class JobController extends AppController {
 					$this->MiconwareSession->setFlash('dreamjob.opening.fav.add','flash',array('alert'=>'success'));
 				}
 			}
-			$opening = $this->DreamjobJobOpening->find('first',array('conditions' => array('DreamjobJobOpening.id' => $this->request->params['id'])));
+			$con = $this->MiconwareSession->getOpeningCondition();
+			$con['DreamjobJobOpening.id'] = $this->request->params['id'];
+			$opening = $this->DreamjobJobOpening->find('first',array('conditions' => $con));
 		}
 		
 		
@@ -161,7 +165,9 @@ class JobController extends AppController {
 			$fav_id = array();
 			foreach($self['Favority'] as $fav)
 				$fav_id[]=$fav['id'];
-			$openings = $this->DreamjobJobOpening->find('all',array('conditions' => array('DreamjobJobOpening.id' =>$fav_id)));
+			$con = $this->MiconwareSession->getOpeningCondition();
+			$con['DreamjobJobOpening.id'] =$fav_id;
+			$openings = $this->DreamjobJobOpening->find('all',array('conditions' => $con));
 			$this->set('openings',$openings);
 			$this->set('opening_MINI',true);
 			$this->render('/Job/favorite');
@@ -310,7 +316,9 @@ class JobController extends AppController {
 		if(!empty($w)){
 			$opening = null;
 			if(!empty($this->request->params['id'])){
-				$opening = $this->DreamjobJobOpening->find('first',array('conditions' => array('DreamjobJobOpening.id' => $this->request->params['id'])));
+				$con = $this->MiconwareSession->getOpeningCondition();
+				$con['DreamjobJobOpening.id'] = $this->request->params['id'];
+				$opening = $this->DreamjobJobOpening->find('first',array('conditions' => $con));
 			}
 			if(!is_array($opening) or count($opening) <= 0 ){
 				$this->set('error', 'dreamjob.error.opening.notFound');

app/Controller/SearchController.php

@@ -0,0 +1,42 @@
+<?php
+
+App::uses('AppController', 'Controller');
+
+class SearchController extends AppController {
+
+	/**
+	 * This controller use User Model
+	 *
+	 * @var array
+	 */
+	 
+	public $uses = array('DreamjobWorker','DreamjobJobOpening');
+	public $components = array('MiconwareSession');
+	
+	/**
+	 * Displays a view
+	 *
+	 * @param mixed What page to display
+	 * @return void
+	 * @throws NotFoundException When the view file could not be found
+	 *	or MissingViewException in debug mode.
+	 */
+	
+	
+	public function listopening() {
+		$this->MiconwareSession->init($this);
+		
+		$this->MiconwareSession->initWeb($this);
+		$profil = $this->MiconwareSession->getCompany();
+		if(!empty($profil) and count($profil) > 0){
+			$workers = $this->DreamjobWorker->find('all',array('conditions' => array('DreamjobWorker.searchhidden'=>false)));
+			$this->set("workers",$workers);
+			$this->render('/Search/listworkers');
+		}else{
+			$con = $this->MiconwareSession->getOpeningCondition();
+			$openings = $this->DreamjobJobOpening->find('all',array('conditions' => $con));
+			$this->set("openings",$openings);
+			$this->render('/Search/listopenings');
+		}
+	}
+}

app/Controller/UserController.php

@@ -10,7 +10,7 @@ class UserController extends AppController {
 	 * @var array
 	 */
 	 
-	public $uses = array('DreamjobListGraducation', 'DreamjobWorker', 'DreamjobCompany', 'DreamjobPageText','DreamjobPageInh', 'DreamjobPageImage', 'DreamjobJobOpening', 'DreamjobCvCategory', 'DreamjobListGraducation', 'Mannerofaddress');
+	public $uses = array('DreamjobListGraducation', 'DreamjobWorker', 'DreamjobCompany', 'DreamjobPageText','DreamjobPageInh', 'DreamjobPageImage', 'DreamjobJobOpening', 'DreamjobCvCategory', 'DreamjobListGraducation', 'DreamjobListJob','DreamjobListKindofjob','DreamjobListBranch','Mannerofaddress','DreamjobISearch');
 	public $components = array('MiconwareSession','RequestHandler');
 	
 	/**
@@ -21,6 +21,14 @@ class UserController extends AppController {
 	 * @throws NotFoundException When the view file could not be found
 	 *	or MissingViewException in debug mode.
 	 */
+	function beforeFilter(){
+		$this->Security->unlockedActions[]="settings_isearch";
+		/*if($this->request->action=="settings_isearch")
+			$this->Security->=false;*/
+		parent::beforeFilter();
+	}
+	
+	
 	public function profil() {
 		$this->MiconwareSession->init($this);
 		
@@ -99,7 +107,9 @@ class UserController extends AppController {
 		$this->set('page',$page);
 		if(!$hard_error)
 			if($company){
-				$openings = $this->DreamjobJobOpening->find('all',array('conditions' => array('DreamjobJobOpening.company_id' => $profil['AppUser']['id'],'DreamjobJobOpening.active'=>1)));
+				$con = $this->MiconwareSession->getOpeningCondition();
+				$con['DreamjobJobOpening.company_id'] = $profil['AppUser']['id'];
+				$openings = $this->DreamjobJobOpening->find('all',array('conditions' => $con));
 				$this->set("openings",$openings);
 				$this->render('/User/company');
 			}else
@@ -234,7 +244,7 @@ class UserController extends AppController {
 					if($company){
 						$profil['DreamjobCompany']['corporateform'] = $this->request->data['DreamjobCompany']['corporateform'];
 						$profil['DreamjobCompany']['owner'] = $this->request->data['DreamjobCompany']['owner'];
-						$profil['DreamjobCompany']['branch'] = $this->request->data['DreamjobCompany']['branch'];
+						$profil['DreamjobCompany']['branch_id'] = $this->request->data['DreamjobCompany']['branch_id'];
 						$profil['DreamjobCompany']['headcount'] = $this->request->data['DreamjobCompany']['headcount'];
 						$profil['DreamjobCompany']['bank_details'] = $this->request->data['DreamjobCompany']['bank_details'];
 						$profil['DreamjobCompany']['website'] = $this->request->data['DreamjobCompany']['website'];
@@ -245,6 +255,7 @@ class UserController extends AppController {
 						$profil['DreamjobWorker']['iam'] = $this->request->data['DreamjobWorker']['iam'];
 						$profil['DreamjobWorker']['graducation_id'] = $this->request->data['DreamjobWorker']['graducation_id'];
 						$profil['DreamjobWorker']['searchhidden'] = $this->request->data['DreamjobWorker']['searchhidden'];
+						$profil['DreamjobWorker']['workexperience'] = $this->request->data['DreamjobWorker']['workexperience'];
 						$result = $this->DreamjobWorker->saveSettings($profil);
 					}
 				
@@ -263,11 +274,13 @@ class UserController extends AppController {
 			$this->request->data = $profil;
 			$this->set('profil',$profil);
 			$this->set('graducations',$this->DreamjobListGraducation->find('list'));
-			$this->set('mannerofaddresss',$this->Mannerofaddress->find('list'));
+			$this->set('branches',$this->DreamjobListBranch->find('list'));
+			$this->set('mannerofaddresses',$this->Mannerofaddress->find('list'));
 			$this->render('/User/settings_account');
 		}
 	}
-	public function settings_pages() {
+	public function settings_pageInh() {
+		
 		$this->MiconwareSession->init($this);
 		
 		$this->MiconwareSession->initWeb($this);
@@ -275,7 +288,7 @@ class UserController extends AppController {
 		$this->layout = 'default';
 		$this->RequestHandler->setContent('html', 'application/html' );
 		
-		
+		$result = false;
 		
 		$profil = $this->MiconwareSession->getWorker();
 		if(empty($profil) or count($profil) <= 0)
@@ -286,24 +299,103 @@ class UserController extends AppController {
 				$this->set('error', 'dreamjob.error.noPermision');
 				$this->render('/Home/error');
 		}else{
-			var_dump($this->request->data);
+			//PAGE BEARBEITEN
 			if(!empty($this->request->params['page'])){
+				$image = false;
 				$page = $this->DreamjobPageText->find('first',
 						array('conditions' => array("DreamjobPageInh.id" => $this->request->params['page'],'DreamjobPageInh.user_id' => $profil['AppUser']['id']))
 					);
-				if(!is_array($page) or count($page)<= 0)
+				if(!is_array($page) or count($page)<= 0){
 					$page = $this->DreamjobPageImage->find('first',
 						array('conditions' => array("DreamjobPageInh.id" => $this->request->params['page'],'DreamjobPageInh.user_id' => $profil['AppUser']['id']))
 					);
-				if($this->request->is('post')){
+					$image = true;
-					$this->MiconwareSession->setFlash(__('dreamjob.page.save'),'flash',array('alert'=>'success'));	
 				}
+				if(!empty($page) and count($page)> 0){
+					if($this->request->is('post')){
+						$this->request->data['DreamjobPageInh']['user_id']=$profil['AppUser']['id'];
+						if($image){
+							$this->request->data['DreamjobPageInh']['id']=$page['DreamjobPageInh']['id'];
+							$this->request->data['DreamjobPageImage']['page_ptr_id']=$page['DreamjobPageInh']['id'];
+							$result = $this->DreamjobPageImage->saveAndUpload($this->request->data);
+						}else{
+							$this->request->data['DreamjobPageInh']['id']=$page['DreamjobPageInh']['id'];
+							$this->request->data['DreamjobPageText']['page_ptr_id']=$page['DreamjobPageInh']['id'];
+							$result = $this->DreamjobPageText->saveAssociated($this->request->data);
+						}
+						if(!$result)
+							$this->MiconwareSession->setFlash(__('dreamjob.page.save.error'),'flash',array('alert'=>'danger'));
+					}else
 						$this->request->data=$page;
 					$this->set('page',$page);
+				}else
+					$this->MiconwareSession->setFlash(__('dreamjob.error.page.notFound'),'flash',array('alert'=>'danger'));
 			}else{
-				if($this->request->is('post')){
+				// PAGE LOESCHEN
-					$this->MiconwareSession->setFlash(__('dreamjob.page.save'),'flash',array('alert'=>'success'));	
+				if(!empty($this->request->query['del'])){
+					$image = false;
+					$page = $this->DreamjobPageText->find('first',
+							array('conditions' => array("DreamjobPageInh.id" => $this->request->query['del'],'DreamjobPageInh.user_id' => $profil['AppUser']['id']))
+						);
+					if(!is_array($page) or count($page)<= 0){
+						$page = $this->DreamjobPageImage->find('first',
+							array('conditions' => array("DreamjobPageInh.id" => $this->request->query['del'],'DreamjobPageInh.user_id' => $profil['AppUser']['id']))
+						);
+						$image = true;
 					}
+					$result = false;
+					if(!empty($page) and count($page)> 0){
+						$path = null;
+						if($image){
+							$path = WWW_ROOT.$page['DreamjobPageImage']['image'];
+							$result = $this->DreamjobPageImage->delete($page['DreamjobPageInh']['id'],false);
+						}else
+							$result = $this->DreamjobPageText->delete($page['DreamjobPageInh']['id'],false);
+						if($result){
+							$result = $this->DreamjobPageInh->delete($page['DreamjobPageInh']['id'],false);
+						}
+						if($path!=null and $result){
+							$result = unlink($path);
+						}
+						if($result){
+							$this->MiconwareSession->refreshCache();
+							$profil = $this->MiconwareSession->getWorker();
+							if(empty($profil) or count($profil) <= 0)
+								$profil = $this->MiconwareSession->getCompany();
+							$this->MiconwareSession->setFlash('dreamjob.pages.delete','flash',array('alert'=>'success'));
+						}else{
+							$this->MiconwareSession->setFlash('dreamjob.pages.delete.error','flash',array('alert'=>'danger'));
+						}
+					}
+					$result = false;
+				}
+				// NEW PAGE
+				if($this->request->is('post')){
+					if(!empty($this->request->data['DreamjobPageText']['text']) and $this->request->data['DreamjobPageImage']['image']['error']==0){
+						$this->MiconwareSession->setFlash(__('dreamjob.page.oneType'),'flash',array('alert'=>'danger'));
+					}else{
+						$this->request->data['DreamjobPageInh']['user_id']=$profil['AppUser']['id'];
+						if($this->request->data['DreamjobPageImage']['image']['error']==0){
+							unset($this->request->data['DreamjobPageText']);
+							$this->DreamjobPageImage->create();
+							$result = $this->DreamjobPageImage->saveAndUpload($this->request->data);
+						}else{
+							unset($this->request->data['DreamjobPageImage']);
+							$this->DreamjobPageText->create();
+							$result = $this->DreamjobPageText->saveAssociated($this->request->data);
+						}
+						
+						if(!$result)
+							$this->MiconwareSession->setFlash(__('dreamjob.page.save.error'),'flash',array('alert'=>'danger'));
+					}
+				}
+			}
+			if($result){
+				$this->MiconwareSession->refreshCache();
+				$this->MiconwareSession->setFlash(__('dreamjob.page.save'),'flash',array('alert'=>'success'));
+				$profil = $this->MiconwareSession->getWorker();
+				if(empty($profil) or count($profil) <= 0)
+					$profil = $this->MiconwareSession->getCompany();
 			}
 			$this->set('profil',$profil);
 			$this->render('/User/settings_pages');
@@ -326,7 +418,23 @@ class UserController extends AppController {
 				$this->set('error', 'dreamjob.error.noPermision');
 				$this->render('/Home/error');
 		}else{
+			if($this->request->is('post')){
+				$tosave = $this->request->data['DreamjobISearch'];
+				foreach($tosave as $i => $a)
+					$tosave[$i]['worker_id']=$profil['AppUser']['id'];
+				$result = $this->DreamjobISearch->saveAndDelete($tosave,$profil['DreamjobISearch']);
+				if($result){
+					$this->MiconwareSession->refreshCache();
+					$profil = $this->MiconwareSession->getWorker();
+					$this->MiconwareSession->setFlash('dreamjob.settings.save','flash',array('alert'=>'success'));
+				}else{
+					$this->MiconwareSession->setFlash('dreamjob.settings.save.error','flash',array('alert'=>'danger'));
+				}
+			}
 			$this->request->data = $profil;
+			$this->set('kindofjobs',$this->DreamjobListKindofjob->find('list'));
+			$this->set('jobs',$this->DreamjobListJob->find('list'));
+			$this->set('branches',$this->DreamjobListBranch->find('list'));
 			$this->set('profil',$profil);
 			$this->render('/User/settings_isearch');
 		}

app/Locale/cake.pot

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
-"POT-Creation-Date: 2014-03-23 10:27+0100\n"
+"POT-Creation-Date: 2014-03-30 10:34+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-03-23 10:27+0100\n"
+"POT-Creation-Date: 2014-03-30 10:34+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-03-23 10:27+0100\n"
+"POT-Creation-Date: 2014-03-30 10:34+0200\n"
 "PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n"
 "Last-Translator: NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <EMAIL@ADDRESS>\n"
@@ -14,23 +14,31 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: Controller/UserController.php:87;96;169;216;285;325
+#: Controller/UserController.php:95;104;179;226;298;332;417
 msgid "dreamjob.error.page.notFound"
 msgstr ""
 
-#: Controller/UserController.php:187
+#: Controller/UserController.php:197
 msgid "dreamjob.error.page.order.saved"
 msgstr ""
 
-#: Controller/UserController.php:190
+#: Controller/UserController.php:200
 msgid "dreamjob.error.page.order.error"
 msgstr ""
 
-#: Controller/UserController.php:259
+#: Controller/UserController.php:270
 msgid "dreamjob.error.password.notEqual"
 msgstr ""
 
-#: Controller/UserController.php:299;305
+#: Controller/UserController.php:327;389
+msgid "dreamjob.page.save.error"
+msgstr ""
+
+#: Controller/UserController.php:375
+msgid "dreamjob.page.oneType"
+msgstr ""
+
+#: Controller/UserController.php:395
 msgid "dreamjob.page.save"
 msgstr ""
 
@@ -53,12 +61,14 @@ msgstr ""
 #: View/Job/opening_edit.ctp:35
 #: View/User/company.ctp:71
 #: View/User/settings_account.ctp:67
+#: View/User/settings_isearch.ctp:30
 msgid "dreamjob.branch"
 msgstr ""
 
 #: View/Elements/job_opening_head_extra.ctp:10
 #: View/Elements/job_opening_item.ctp:69
 #: View/Job/opening_edit.ctp:33
+#: View/User/settings_isearch.ctp:32
 msgid "dreamjob.kindofjob"
 msgstr ""
 
@@ -145,33 +155,26 @@ msgid "dreamjob.search"
 msgstr ""
 
 #: View/Elements/navbar.ctp:10
-#: View/User/settings_account.ctp:18;29
-#: View/User/settings_isearch.ctp:17
-#: View/User/settings_pages.ctp:35
-msgid "dreamjob.settings"
-msgstr ""
-
-#: View/Elements/navbar.ctp:11
 msgid "dreamjob.service"
 msgstr ""
 
-#: View/Elements/navbar.ctp:12
+#: View/Elements/navbar.ctp:11
 msgid "dreamjob.logout"
 msgstr ""
 
-#: View/Elements/navbar.ctp:25
+#: View/Elements/navbar.ctp:24
 #: View/Elements/user_worker_header.ctp:36
 #: View/User/company.ctp:35;58
 #: View/User/settings_account.ctp:36
 msgid "dreamjob.mail"
 msgstr ""
 
-#: View/Elements/navbar.ctp:27
+#: View/Elements/navbar.ctp:26
 #: View/User/settings_account.ctp:38
 msgid "dreamjob.password"
 msgstr ""
 
-#: View/Elements/navbar.ctp:29
+#: View/Elements/navbar.ctp:28
 msgid "dreamjob.login"
 msgstr ""
 
@@ -226,6 +229,10 @@ msgstr ""
 msgid "dreamjob.years"
 msgstr ""
 
+#: View/Elements/user_worker_item.ctp:74
+msgid "dreamjob.details"
+msgstr ""
+
 #: View/Home/home.ctp:22
 msgid "dreamjob.registration.to"
 msgstr ""
@@ -253,7 +260,7 @@ msgid "dreamjob.my.application"
 msgstr ""
 
 #: View/Job/application.ctp:16
-#: View/User/company.ctp:97;99;123
+#: View/User/company.ctp:97;99;118
 msgid "dreamjob.opening"
 msgstr ""
 
@@ -289,11 +296,11 @@ msgstr ""
 msgid "dreamjob.application.addPages"
 msgstr ""
 
-#: View/Job/application_send.ctp:32
+#: View/Job/application_send.ctp:33
 msgid "dreamjob.agb.accept"
 msgstr ""
 
-#: View/Job/application_send.ctp:35
+#: View/Job/application_send.ctp:36
 msgid "dreamjob.application.send"
 msgstr ""
 
@@ -388,6 +395,12 @@ msgstr ""
 msgid "dreamjob.website"
 msgstr ""
 
+#: View/User/settings_account.ctp:18;29
+#: View/User/settings_isearch.ctp:17
+#: View/User/settings_pages.ctp:35
+msgid "dreamjob.settings"
+msgstr ""
+
 #: View/User/settings_account.ctp:19
 #: View/User/settings_isearch.ctp:18
 #: View/User/settings_pages.ctp:36;46
@@ -413,7 +426,7 @@ msgid "dreamjob.worker"
 msgstr ""
 
 #: View/User/settings_account.ctp:45
-msgid "dreamjob.mannerofaddress_id"
+msgid "dreamjob.mannerofaddress"
 msgstr ""
 
 #: View/User/settings_account.ctp:46
@@ -445,19 +458,31 @@ msgid "dreamjob.country"
 msgstr ""
 
 #: View/User/settings_account.ctp:82
-#: View/User/settings_pages.ctp:90
+#: View/User/settings_pages.ctp:94
 msgid "dreamjob.settings.save"
 msgstr ""
 
+#: View/User/settings_isearch.ctp:31
+msgid "dreamjob.job"
+msgstr ""
+
+#: View/User/settings_isearch.ctp:33
+msgid "dreamjob.options"
+msgstr ""
+
+#: View/User/settings_isearch.ctp:42;43;45;46;53;54;55
+msgid "dreamjob.form.chooseOne"
+msgstr ""
+
 #: View/User/settings_pages.ctp:57
 msgid "dreamjob.page.new"
 msgstr ""
 
-#: View/User/settings_pages.ctp:70
+#: View/User/settings_pages.ctp:72
 msgid "dreamjob.pages.types"
 msgstr ""
 
-#: View/User/settings_pages.ctp:87
+#: View/User/settings_pages.ctp:91
 msgid "dreamjob.page.del"
 msgstr ""
 
@@ -475,14 +500,15 @@ msgid "naturalNumber"
 msgstr ""
 
 #: Model/AppUser.php:validation for field user_id
-#: Model/DreamjobCompany.php:validation for field djaccount_ptr_id;validation for field pro_user
+#: Model/DreamjobCompany.php:validation for field djaccount_ptr_id;validation for field branch_id;validation for field pro_user
 #: Model/DreamjobCvCategory.php:validation for field id;validation for field worker_id;validation for field category_id
 #: Model/DreamjobCvEntry.php:validation for field category_id
+#: Model/DreamjobISearch.php:validation for field worker_id;validation for field branch_id;validation for field job_id;validation for field kindofjob_id
 #: Model/DreamjobJobApplication.php:validation for field id;validation for field stars;validation for field worker_id;validation for field opening_id
 #: Model/DreamjobJobApplicationPage.php:validation for field id;validation for field application_id;validation for field page_id
 #: Model/DreamjobJobFavority.php:validation for field worker_id;validation for field opening_id
 #: Model/DreamjobJobMsg.php:validation for field application_id
-#: Model/DreamjobJobOpening.php:validation for field id;validation for field company_id;validation for field graducation_id;validation for field kindofjob_id
+#: Model/DreamjobJobOpening.php:validation for field id;validation for field company_id;validation for field branch_id;validation for field graducation_id;validation for field kindofjob_id
 #: Model/DreamjobPageImage.php:validation for field page_ptr_id
 #: Model/DreamjobPageInh.php:validation for field position
 #: Model/DreamjobPageText.php:validation for field page_ptr_id
@@ -519,11 +545,11 @@ msgstr ""
 msgid "multiple"
 msgstr ""
 
-#: Model/DreamjobCompany.php:validation for field corporateform;validation for field owner;validation for field branch
+#: Model/DreamjobCompany.php:validation for field corporateform;validation for field owner
 #: Model/DreamjobCvEntry.php:validation for field title;validation for field place
 #: Model/DreamjobJobApplication.php:validation for field text
 #: Model/DreamjobJobMsg.php:validation for field text
-#: Model/DreamjobJobOpening.php:validation for field street;validation for field city;validation for field postcode;validation for field title;validation for field branch;validation for field text
+#: Model/DreamjobJobOpening.php:validation for field street;validation for field city;validation for field postcode;validation for field title;validation for field text
 #: Model/DreamjobListBranch.php:validation for field name
 #: Model/DreamjobListCity.php:validation for field name
 #: Model/DreamjobListCountry.php:validation for field name
@@ -545,6 +571,14 @@ msgstr ""
 msgid "date"
 msgstr ""
 
+#: Model/DreamjobPageImage.php:validation for field image
+msgid "Something went wrong with the file upload"
+msgstr ""
+
+#: Model/DreamjobPageImage.php:validation for field image
+msgid "Invalid file, only images allowed"
+msgstr ""
+
 #: Model/User.php:validation for field last_login;validation for field date_joined
 msgid "datetime"
 msgstr ""
@@ -557,3 +591,19 @@ msgstr ""
 msgid "url"
 msgstr ""
 
+#: View/Errors/error500.ctp:8
+msgid "Error"
+msgstr ""
+
+#: View/Errors/error500.ctp:9
+msgid "An Internal Error Has Occurred."
+msgstr ""
+
+#: View/Layouts/error.ctp:19
+msgid "CakePHP: the rapid development php framework"
+msgstr ""
+
+#: webroot/test.php:93
+msgid "Debug setting does not allow access to this url."
+msgstr ""
+

app/Model/DreamjobCompany.php

@@ -72,7 +72,7 @@ class DreamjobCompany extends AppModel {
 		if($result)
 			$result = $this->saveField('owner',$data['DreamjobCompany']['owner']);
 		if($result)
-			$result = $this->saveField('branch',$data['DreamjobCompany']['branch']);
+			$result = $this->saveField('branch_id',$data['DreamjobCompany']['branch_id']);
 		if($result)
 			$result = $this->saveField('headcount',$data['DreamjobCompany']['headcount']);
 		if($result)
@@ -149,9 +149,9 @@ class DreamjobCompany extends AppModel {
 				//'on' => 'create', // Limit validation to 'create' or 'update' operations
 			),
 		),
-		'branch' => array(
+		'branch_id' => array(
-			'notEmpty' => array(
+			'numeric' => array(
-				'rule' => array('notEmpty'),
+				'rule' => array('numeric'),
 				//'message' => 'Your custom message here',
 				//'allowEmpty' => false,
 				//'required' => false,
@@ -170,7 +170,15 @@ class DreamjobCompany extends AppModel {
 			),
 		),
 	);
-	
+	public $belongsTo = array(
+		'DreamjobListBranch' => array(
+			'className' => 'DreamjobListBranch',
+			'foreignKey' => 'branch_id',
+			'conditions' => '',
+			'fields' => '',
+			'order' => ''
+		),
+	);
 	
 	public $hasAndBelongsToMany = array(
         'User' =>

app/Model/DreamjobISearch.php

@@ -0,0 +1,144 @@
+<?php
+App::uses('AppModel', 'Model');
+/**
+ * MicDjAccountIsearch Model
+ *
+ * @property Worker $Worker
+ * @property Kindofjob $Kindofjob
+ */
+class DreamjobISearch extends AppModel {
+
+/**
+ * Use database config
+ *
+ * @var string
+ */
+	public $useDbConfig = 'dreamjobMain';
+
+/**
+ * Use table
+ *
+ * @var mixed False or table name
+ */
+	public $useTable = 'mic_dj_account_isearch';
+
+/**
+ * Display field
+ *
+ * @var string
+ */
+	public $displayField = 'id';
+
+/**
+ * Validation rules
+ *
+ * @var array
+ */
+	public function saveAndDelete($data,$old){
+		$dataSource = $this->getDataSource();
+		$dataSource->begin();
+		
+		$result = $this->saveMany($data);
+		if($result){
+			$array1 = array();
+			$array2 = array();
+			foreach($data as $a)
+				if(isset($a['id']))
+					$array1[]=$a['id'];
+			foreach($old as $a)
+				if(isset($a['id']))
+					$array2[]=$a['id'];
+			$diff=array_diff($array2, $array1);
+			if(count($diff)>0)
+				$result = $this->delete($diff);
+		}
+		
+		if ($result) {
+			$dataSource->commit();
+			return true;
+		} else {
+			$dataSource->rollback();
+		}
+		return false;
+	}
+	public $validate = array(
+		'worker_id' => array(
+			'numeric' => array(
+				'rule' => array('numeric'),
+				//'message' => 'Your custom message here',
+				//'allowEmpty' => false,
+				//'required' => false,
+				//'last' => false, // Stop validation after this rule
+				//'on' => 'create', // Limit validation to 'create' or 'update' operations
+			),
+		),
+		'branch_id' => array(
+			'numeric' => array(
+				'rule' => array('numeric'),
+				//'message' => 'Your custom message here',
+				//'allowEmpty' => false,
+				//'required' => false,
+				//'last' => false, // Stop validation after this rule
+				//'on' => 'create', // Limit validation to 'create' or 'update' operations
+			),
+		),
+		'job_id' => array(
+			'numeric' => array(
+				'rule' => array('numeric'),
+				//'message' => 'Your custom message here',
+				//'allowEmpty' => false,
+				//'required' => false,
+				//'last' => false, // Stop validation after this rule
+				//'on' => 'create', // Limit validation to 'create' or 'update' operations
+			),
+		),
+		'kindofjob_id' => array(
+			'numeric' => array(
+				'rule' => array('numeric'),
+				//'message' => 'Your custom message here',
+				//'allowEmpty' => false,
+				//'required' => false,
+				//'last' => false, // Stop validation after this rule
+				//'on' => 'create', // Limit validation to 'create' or 'update' operations
+			),
+		),
+	);
+
+	//The Associations below have been created with all possible keys, those that are not needed can be removed
+
+/**
+ * belongsTo associations
+ *
+ * @var array
+ */
+	public $belongsTo = array(
+		'DreamjobWorker' => array(
+			'className' => 'DreamjobWorker',
+			'foreignKey' => 'worker_id',
+			'conditions' => '',
+			'fields' => '',
+			'order' => ''
+		),
+		'DreamjobListKindofjob' => array(
+			'className' => 'DreamjobListKindofjob',
+			'foreignKey' => 'kindofjob_id',
+			'conditions' => '',
+			'fields' => '',
+			'order' => ''
+		),
+		'DreamjobListBranch' => array(
+			'className' => 'DreamjobListBranch',
+			'foreignKey' => 'branch_id',
+			'conditions' => '',
+			'fields' => '',
+			'order' => ''
+		),
+		'DreamjobListJob' => array(
+			'className' => 'DreamjobListJob',
+			'foreignKey' => 'job_id',
+			'conditions' => '',
+			'fields' => '',
+			'order' => ''
+		)
+	);
+}

app/Model/DreamjobJobFavority.php

@@ -10,7 +10,7 @@ class DreamjobJobFavority extends AppModel {
 
 	public $useDbConfig = 'dreamjobMain';
 
-	public $useTable = 'mic_dj_job_opening_worker';
+	public $useTable = 'mic_dj_jobs_opening_worker';
 	
 		public $validate = array(
 		'worker_id' => array(

app/Model/DreamjobJobOpening.php

@@ -96,9 +96,9 @@ class DreamjobJobOpening extends AppModel {
 				//'on' => 'create', // Limit validation to 'create' or 'update' operations
 			),
 		),
-		'branch' => array(
+		'branch_id' => array(
-			'notEmpty' => array(
+			'numeric' => array(
-				'rule' => array('notEmpty'),
+				'rule' => array('numeric'),
 				//'message' => 'Your custom message here',
 				//'allowEmpty' => false,
 				//'required' => false,
@@ -201,6 +201,13 @@ class DreamjobJobOpening extends AppModel {
 			'conditions' => '',
 			'fields' => '',
 			'order' => ''
+		),
+		'DreamjobListBranch' => array(
+			'className' => 'DreamjobListBranch',
+			'foreignKey' => 'branch_id',
+			'conditions' => '',
+			'fields' => '',
+			'order' => ''
 		)
 	);
 	

app/Model/DreamjobPageImage.php

@@ -35,6 +35,8 @@ class DreamjobPageImage extends AppModel {
  */
 	public $displayField = 'page_ptr_id';
 	
+	
+
 /**
  * Validation rules
  *
@@ -59,28 +61,93 @@ class DreamjobPageImage extends AppModel {
 				//'on' => 'create', // Limit validation to 'create' or 'update' operations
 			),
 		),
-/*		'image' => array(
+		'image' => array(
-			'notEmpty' => array(
+			// http://book.cakephp.org/2.0/en/models/data-validation.html#Validation::uploadError
-				'rule' => array('notEmpty'),
+				'uploadError' => array(
-				//'message' => 'Your custom message here',
+					'rule' => 'uploadError',
-				//'allowEmpty' => false,
+					'message' => 'Something went wrong with the file upload',
-				//'required' => false,
+					'required' => FALSE,
-				//'last' => false, // Stop validation after this rule
+					'allowEmpty' => TRUE,
-				//'on' => 'create', // Limit validation to 'create' or 'update' operations
 				), 
-			'alphaNumeric' => array(
+				// http://book.cakephp.org/2.0/en/models/data-validation.html#Validation::mimeType
-				'rule' => array('alphaNumeric'),
+				'mimeType' => array(
-				//'message' => 'Your custom message here',
+					'rule' => array('mimeType', array('image/gif','image/png','image/jpg','image/jpeg')),
-				//'allowEmpty' => false,
+					'message' => 'Invalid file, only images allowed',
-				//'required' => false,
+					'required' => FALSE,
-				//'last' => false, // Stop validation after this rule
+					'allowEmpty' => TRUE,
-				//'on' => 'create', // Limit validation to 'create' or 'update' operations
 				),
-		),*/
+				'processUpload' => array(
+					'rule' => 'processUpload',
+					'message' => 'Something went wrong with the file upload',
+					'required' => FALSE,
+					'allowEmpty' => TRUE,
+					'last' => TRUE,
+				)
+			)
 	);
 
 	//The Associations below have been created with all possible keys, those that are not needed can be removed
+	/**
+* Upload Directory relative to WWW_ROOT
+* @param string
+*/
+public $uploadDir = 'uploads';
 
+/**
+* Before Validation Callback
+* @param array $options
+* @return boolean
+*/
+public function beforeValidate($options = array()) {
+	// ignore empty file - causes issues with form validation when file is empty and optional
+	if (!empty($this->data[$this->alias]['image']['error']) && $this->data[$this->alias]['image']['error']==4 && $this->data[$this->alias]['image']['size']==0) {
+		unset($this->data[$this->alias]['image']);
+	}
+	return parent::beforeValidate($options);
+}
+
+/**
+ * Process the Upload
+ * @param array $check
+ * @return boolean
+ */
+public function processUpload($check=array()) {
+	// deal with uploaded file
+	if (!empty($check['image']['tmp_name'])) {
+
+		// check file is uploaded
+		if (!is_uploaded_file($check['image']['tmp_name'])) {
+			return FALSE;
+		}
+		$this->data[$this->alias]['image'] = "onUpload";
+	}
+	return TRUE;
+}
+ 
+ 
+public function saveAndUpload($data){
+	$dataSource = $this->getDataSource();
+	$dataSource->begin();
+	$result = $this->saveAssociated($data);
+	if($result){
+		$filename = $data["DreamjobPageInh"]['user_id'] . "_-page-_" . $this->id .".". pathinfo($data[$this->alias]['image']['name'], PATHINFO_EXTENSION);
+		$filename = WWW_ROOT . $this->uploadDir . DS . $filename;
+	
+		if (!move_uploaded_file($data[$this->alias]['image']['tmp_name'], $filename)) {
+			$result = false;
+		} else {
+			$this->saveField('image', str_replace(DS, "/", str_replace(WWW_ROOT, "", $filename) ));
+		}
+	}
+	
+	if ($result) {
+		$dataSource->commit();
+		return true;
+	} else {
+		$dataSource->rollback();
+	}
+	return false;
+}
 /**
  * belongsTo associations
  *

app/Model/DreamjobWorker.php

@@ -239,6 +239,10 @@ class DreamjobWorker extends AppModel {
 		'DreamjobJobApplication' => array(
 			'className' => 'DreamjobJobApplication',
 			'foreignKey' => 'worker_id'
+		),
+		'DreamjobISearch' => array(
+			'className' => 'DreamjobISearch',
+			'foreignKey' => 'worker_id'
 		)
 	);
 }

app/View/Elements/job_opening_head_extra.ctp

@@ -6,7 +6,7 @@
 <p>
 	<h4><?=__("dreamjob.opening.titleinfo");?></h4>
 	<?=__("dreamjob.graducation.company");?>: <?=$opening['DreamjobListGraducation']['name'];?><br/>
-	<?=__("dreamjob.branch");?>: <?=$opening['DreamjobJobOpening']['branch'];?><br/>
+	<?=__("dreamjob.branch");?>: <?=$opening['DreamjobListBranch']['name'];?><br/>
 	<?=__("dreamjob.kindofjob");?>: <?=$opening['DreamjobListKindofjob']['name'];?><br/>
 	<span<?php if( time() > strtotime($opening['DreamjobJobOpening']['enddate'])){ ?> class="opening_outdate"<?php } ?>><?=__("dreamjob.opening.enddate");?>: <?=$this->Time->format('d.m.Y', $opening['DreamjobJobOpening']['enddate']);?></span>
 	</p>

app/View/Elements/job_opening_item.ctp

@@ -64,7 +64,7 @@ if($opening['AppUser']['take_systemwide']){
 		<?php } ?>
         <div class="left">
             <span><?=__("dreamjob.graducation.company");?>: <?=$opening['DreamjobListGraducation']['name'];?></span>
-            <span><?=__("dreamjob.branch");?>: <?=$opening['DreamjobJobOpening']['branch'];?></span>
+            <span><?=__("dreamjob.branch");?>: <?=$opening['DreamjobListBranch']['name'];?></span>
             <span><?=__("dreamjob.city");?>: <?=$opening['DreamjobJobOpening']['city'];?></span>
             <span><?=__("dreamjob.kindofjob");?>: <?=$opening['DreamjobListKindofjob']['name'];?></span>
             <span<?php if( time() > strtotime($opening['DreamjobJobOpening']['enddate'])){ ?> class="opening_outdate"<?php } ?>><?=__("dreamjob.opening.enddate");?>: <?=$this->Time->format('d.m.Y', $opening['DreamjobJobOpening']['enddate']);?></span>

app/View/Elements/navbar.ctp

@@ -7,7 +7,6 @@ if(!empty($isLoggedin)){
     <?php } ?>
     <li<?php if(isset($MENU_START)){?> class="active"<?php } ?>><?=$this->Html->link(__('dreamjob.startpage'),array('controller'=>'home','action'=>'home'));?></li>
     <li<?php if(isset($MENU_SEARCH)){?> class="active"<?php } ?>><?=$this->Html->link(__('dreamjob.search'),'/search/');?></li>
-    <li<?php if(isset($MENU_SETTINGS)){?> class="active"<?php } ?>><?=$this->Html->link(__('dreamjob.settings'),'/settings/');?></li>
     <li<?php if(isset($MENU_SERVICE)){?> class="active"<?php } ?>><?=$this->Html->link(__('dreamjob.service'),'/service/');?></li>
     <li><?=$this->Html->link(__('dreamjob.logout'),array('controller'=>'home','action'=>'logout'));?></li>
 </ul>

app/View/Elements/user_worker_item.ctp

@@ -6,7 +6,7 @@
  $DreamjobUser = 'DreamjobUser';
  $AppUser = 'AppUser';
  $DreamjobListGraducation = 'DreamjobListGraducation';
- if($enableOpening){
+ if(isset($enableOpening) and $enableOpening){
 	$User = 'WorkerUser';
 	$DreamjobUser = 'DreamjobUserWorker';
  	$AppUser = 'AppUserWorker';
@@ -43,14 +43,14 @@
 		<?php if($profil['DreamjobWorker']['workexperience']){ ?>
 		<span><?=__('dreamjob.workexperience').': '.$profil['DreamjobWorker']['workexperience'].' ',__('dreamjob.years');?></span>
 		<?php } ?>
-		<?php if($enableOpening){ ?>
+		<?php if(isset($enableOpening) and $enableOpening){ ?>
 			<span><?=$this->Time->format('d.m.Y H:i', $profil['DreamjobJobApplication']['created']);?></span>
 		<?php } ?>
 	</div>
 	<div class="right">
 		<div class="btn-group-vertical">
 		<?php
-		 if($enableOpening){
+		 if(isset($enableOpening) and $enableOpening){
 			$status = 'dreamjob.application.close';
 			$statusApp = null;
 			$archiv = array("archiv"=> $profil['DreamjobJobApplication']['id']);
@@ -70,6 +70,8 @@
 			}
 			echo $this->Html->link(__($status),array('controller'=>'job', 'action'=>'applicationByOpening', 'id'=> $profil['DreamjobJobApplication']['opening_id'],'?'=>$archiv),array("class" => "btn btn-default",'escape' => true));
 			echo $this->Html->link($statusApp,array('controller'=>'job', 'action'=>'applicationGet', 'id'=> $profil['DreamjobJobApplication']['id']),array("class" => "btn btn-default",'escape' => true));
+		 }else{
+		 echo $this->Html->link(__('dreamjob.details'),array('controller'=>'user', 'action'=>'profil', 'id'=> $profil[$AppUser]['id']),array("class" => "btn btn-default"));
 		 }
 		?>
 		</div>

app/View/Job/application_send.ctp

@@ -29,10 +29,11 @@
 			 ?>
 			<div class="buttonrow">
 				<div class="checkbox" style="width:20%;display:inline-block;">
-					<?=$this->Form->checkbox('agb').__("dreamjob.agb.accept");?>
+					<?=$this->Form->checkbox('agb');?>
+					<?=$this->Html->link(__("dreamjob.agb.accept"),array('controller'=>'home','action'=>'agb'),array('ref'=>'external'));?></span>
 				</div>
 				<br/>
-				<?=$this->Form->button(__('dreamjob.application.send'),array('div' => false,'class'=>"btn btn-default ",'type' => 'submit'));?>
+				<?=$this->Form->button(__('dreamjob.application.send'),array('div' => false,'class'=>"btn btn-primary ",'type' => 'submit'));?>
 			</div>
 		</fieldset>
 	<?php echo $this->Form->end(); ?>

app/View/Job/opening_edit.ctp

@@ -32,7 +32,7 @@ echo $this->Form->create('DreamjobJobOpening',$default_Form);
 			  echo $this->Form->input('DreamjobJobOpening.enddate',array('label'=>array('text'=>__("dreamjob.opening.enddate"),"class"=>$default_Form['inputDefaults']['label']['class']),"style"=>'width:20%;display:inline-block;')); 
 			  echo $this->Form->input('DreamjobJobOpening.kindofjob_id',array('label'=>array('text'=>__("dreamjob.kindofjob"),"class"=>$default_Form['inputDefaults']['label']['class']))); 
         	  echo $this->Form->input('DreamjobJobOpening.graducation_id',array('label'=>array('text'=>__("dreamjob.graducation"),"class"=>$default_Form['inputDefaults']['label']['class']))); 
-        	  echo $this->Form->input('DreamjobJobOpening.branch',array('label'=>array('text'=>__("dreamjob.branch"),"class"=>$default_Form['inputDefaults']['label']['class']))); ?>
+        	  echo $this->Form->input('DreamjobJobOpening.branch_id',array('label'=>array('text'=>__("dreamjob.branch"),"class"=>$default_Form['inputDefaults']['label']['class']))); ?>
 		<div class="form-group">
 			<label class="col-sm-3 control-label"><?=__("dreamjob.opening.active");?></label>
 			<div class="col-sm-9" style="text-align:left;">
@@ -46,7 +46,7 @@ echo $this->Form->create('DreamjobJobOpening',$default_Form);
         <legend><?=__("dreamjob.text");?></legend>
         <?php echo $this->Form->textarea('DreamjobJobOpening.text',array("class"=>'form-control',"rows"=>10)); ?>
         <div class="buttonrow">
-        	<?=$this->Form->button(__('dreamjob.save'),array('div' => false,'class'=>"btn btn-default",'type' => 'submit'));?>
+        	<?=$this->Form->button(__('dreamjob.save'),array('div' => false,'class'=>"btn btn-primary",'type' => 'submit'));?>
     	</div>
     </fieldset>
 	<?php echo $this->Form->end(); ?>

app/View/Layouts/default.ctp

@@ -79,29 +79,29 @@
 					<tr>
 						<td>
 							<ul class="list-unstyled">
-								<li><?=__('dreamjob.help');?></li>
+								<!--<li><?=__('dreamjob.help');?></li>-->
-								<li><?=__('dreamjob.faq');?></li>
+								<!--<li><?=__('dreamjob.faq');?></li>-->
 							</ul>
 						</td>
 						<td>
 							<ul class="list-unstyled">
-								<li><?=__('dreamjob.sponsorus');?></li>
+								<!--<li><?=__('dreamjob.sponsorus');?></li>
 								<li><?=__('dreamjob.cooperators');?></li>
-								<li><?=__('dreamjob.advertisers');?></li>
+								<li><?=__('dreamjob.advertisers');?></li>-->
 							</ul>
 						</td>
 						<td></td>
 						<td>
 							<ul class="list-unstyled">
 								<li><?=$this->Html->link(__('dreamjob.contact'),array('controller'=>'home','action'=>'contact'));?></li>
-								<li><?=$this->Html->link(__('dreamjob.uscompany'),'http://www.miconware.de/',array('rel'=>"external", 'target'=>"_blank"));?></li>
+								<!--<li><?=$this->Html->link(__('dreamjob.uscompany'),'http://www.miconware.de/',array('rel'=>"external", 'target'=>"_blank"));?></li>-->
 							</ul>
 						</td>
 						<td>
 							<ul class="list-unstyled">
-								<li><?=__('dreamjob.agb');?></li>
+								<li><?=$this->Html->link(__('dreamjob.agb'),array('controller'=>'home','action'=>'agb'));?></li>
 								<li><?=$this->Html->link(__('dreamjob.impressum'),array('controller'=>'home','action'=>'impressum'));?></li>
-								<li><?=__('dreamjob.advbyus');?></li>
+								<!--<li><?=__('dreamjob.advbyus');?></li>-->
 							</ul>
 						</td>
 					</tr>

app/View/Search/listopenings.ctp

@@ -0,0 +1,15 @@
+<?php
+ /*
+  *
+  */
+?>
+<div class="box">
+	<h1>Tempor&auml;re Suche</h1>
+	<div class="openinggroup">
+		<?php
+		foreach($openings as $opening){
+			echo $this->element('job_opening_item',array('opening' => $opening));
+		}
+		?>
+	</div>
+</div>

app/View/Search/listworkers.ctp

@@ -0,0 +1,15 @@
+<?php
+ /*
+  *
+  */
+?>
+<div class="box">
+	<h1>Tempor&auml;re Suche</h1>
+	<div class="openinggroup">
+		<?php
+		foreach($workers as $worker){
+			echo $this->element('user_worker_item',array('profil' => $worker));
+		}
+		?>
+	</div>
+</div>

app/View/User/company.ctp

@@ -69,7 +69,7 @@ if($profil['AppUser']['take_systemwide']){
                 </p>
                 <p>
 					<?=__("dreamjob.branch");?>:<br/>
-	                <?=$profil['DreamjobCompany']['branch'];?>
+	                <?=$profil['DreamjobListBranch']['name'];?>
                 </p>
             </div>
             <div class="bar">
@@ -111,11 +111,6 @@ if($profil['AppUser']['take_systemwide']){
         </ul>
     </div>
     <?php
-	if(!empty($edit)){
-	?>
-        Bearbeiten.
-	<?php
-	}
 	if(!empty($page)){
 		echo $this->element('user_page');
 	}else{

app/View/User/settings_account.ctp

@@ -16,7 +16,7 @@ if($profil['AppUser']['take_systemwide']){
 	<div class="tabs-below">
 		<ul class="nav nav-tabs pull-right">
 			<li class="active"><?=$this->Html->link(__("dreamjob.settings"),array('controller'=>'user','action'=>'settings_account'));?></li>
-			<li><?=$this->Html->link(__("dreamjob.settings.pages"),array('controller'=>'user','action'=>'settings_pages'));?></li>
+			<li><?=$this->Html->link(__("dreamjob.settings.pages"),array('controller'=>'user','action'=>'settings_pageInh'));?></li>
 			<?php
 			 if(!empty($WORKER) and count($WORKER)>0){
 			?>
@@ -42,7 +42,7 @@ if($profil['AppUser']['take_systemwide']){
 		?>
 		<legend><?=__("dreamjob.worker");?></legend>
 		<?php
-			echo $this->Form->input('AppUser.mannerofaddress_id',array('label'=>array('text'=>__("dreamjob.mannerofaddress_id"),"class"=>$default_Form['inputDefaults']['label']['class'])));
+			echo $this->Form->input('AppUser.mannerofaddress_id',array('label'=>array('text'=>__("dreamjob.mannerofaddress"),"class"=>$default_Form['inputDefaults']['label']['class'])));
 			echo $this->Form->input('AppUser.first_name',array('label'=>array('text'=>__("dreamjob.first_name"),"class"=>$default_Form['inputDefaults']['label']['class'])));
 			echo $this->Form->input('AppUser.last_name',array('label'=>array('text'=>__("dreamjob.last_name"),"class"=>$default_Form['inputDefaults']['label']['class'])));
 			echo $this->Form->input('AppUser.bday',array('label'=>array('text'=>__("dreamjob.bday"),"class"=>$default_Form['inputDefaults']['label']['class']),"style"=>'width:20%;display:inline-block;'));
@@ -64,7 +64,7 @@ if($profil['AppUser']['take_systemwide']){
 			echo $this->Form->input('AppUser.nickname',array('label'=>array('text'=>__("dreamjob.company.nickname"),"class"=>$default_Form['inputDefaults']['label']['class'])));
 			echo $this->Form->input('DreamjobCompany.corporateform',array('label'=>array('text'=>__("dreamjob.corporateform"),"class"=>$default_Form['inputDefaults']['label']['class'])));
 			echo $this->Form->input('DreamjobCompany.owner',array('label'=>array('text'=>__("dreamjob.owner"),"class"=>$default_Form['inputDefaults']['label']['class'])));
-			echo $this->Form->input('DreamjobCompany.branch',array('label'=>array('text'=>__("dreamjob.branch"),"class"=>$default_Form['inputDefaults']['label']['class'])));
+			echo $this->Form->input('DreamjobCompany.branch_id',array('label'=>array('text'=>__("dreamjob.branch"),"class"=>$default_Form['inputDefaults']['label']['class'])));
 			echo $this->Form->input('DreamjobCompany.headcount',array('label'=>array('text'=>__("dreamjob.headcount"),"class"=>$default_Form['inputDefaults']['label']['class'])));
 			//echo $this->Form->input('DreamjobCompany.bank_details',array('label'=>array('text'=>__("dreamjob.bank_details"),"class"=>$default_Form['inputDefaults']['label']['class'])));
 			echo $this->Form->input('DreamjobCompany.website',array('label'=>array('text'=>__("dreamjob.website"),"class"=>$default_Form['inputDefaults']['label']['class'])));
@@ -79,7 +79,7 @@ if($profil['AppUser']['take_systemwide']){
 			echo $this->Form->input('DreamjobWorker.country',array('label'=>array('text'=>__("dreamjob.country"),"class"=>$default_Form['inputDefaults']['label']['class'])));
 		?>
 		<div class="buttonrow">
-			<?=$this->Form->button(__('dreamjob.settings.save'),array('div' => false,'class'=>"btn btn-default ",'type' => 'submit'));?>
+			<?=$this->Form->button(__('dreamjob.settings.save'),array('div' => false,'class'=>"btn btn-primary ",'type' => 'submit'));?>
 		</div>
 	</fieldset>
 	<?php echo $this->Form->end(); ?>

app/View/User/settings_isearch.ctp

@@ -15,9 +15,46 @@ if($profil['AppUser']['take_systemwide']){
 	<div class="tabs-below">
 		<ul class="nav nav-tabs pull-right">
 			<li><?=$this->Html->link(__("dreamjob.settings"),array('controller'=>'user','action'=>'settings_account'));?></li>
-			<li><?=$this->Html->link(__("dreamjob.settings.pages"),array('controller'=>'user','action'=>'settings_pages'));?></li>
+			<li><?=$this->Html->link(__("dreamjob.settings.pages"),array('controller'=>'user','action'=>'settings_pageInh'));?></li>
 			<li class="active"><?=$this->Html->link(__("dreamjob.settings.isearch"),array('controller'=>'user','action'=>'settings_isearch'));?></li>
 		</ul>
 	</div>
 	<h1><?=__("dreamjob.settings.isearch");?></h1>
+	<?php
+		$default_hForm['class']=array('tableForm');
+		echo $this->Form->create("DreamjobISearch",$default_hForm);
+	?>
+	<table class="table table-striped">
+		<thead>
+			<tr>
+				<th><?=__('dreamjob.branch');?></th>
+				<th><?=__('dreamjob.job');?></th>
+				<th><?=__('dreamjob.kindofjob');?></th>
+				<th><?=__('dreamjob.options');?></th>
+			</tr>
+		</thead>
+		<tbody>
+		<?php
+			foreach($this->data['DreamjobISearch'] as $i => $egal) {
+			?>
+			<tr data="set">
+				<td>
+					<?=$this->Form->hidden("DreamjobISearch.$i.id",array('empty' => __('dreamjob.form.chooseOne')));?>
+					<?=$this->Form->input("DreamjobISearch.$i.branch_id",array('empty' => __('dreamjob.form.chooseOne')));?>
+				</td>
+				<td><?=$this->Form->input("DreamjobISearch.$i.job_id",array('empty' =>__('dreamjob.form.chooseOne')));?></td>
+				<td><?=$this->Form->input("DreamjobISearch.$i.kindofjob_id",array('empty' => __('dreamjob.form.chooseOne')));?></td>
+				<td><a class="btn btn-default btn-del rmEvnt" ref="eventOff"><span class="glyphicon glyphicon-trash"></span></a></td>
+			</tr>
+			<?php
+			}
+		?>
+		<tr class="new">
+				<td><?=$this->Form->input('DreamjobISearch..branch_id',array('empty' => __('dreamjob.form.chooseOne')));?></td>
+				<td><?=$this->Form->input('DreamjobISearch..job_id',array('empty' =>__('dreamjob.form.chooseOne')));?></td>
+				<td><?=$this->Form->input('DreamjobISearch..kindofjob_id',array('empty' => __('dreamjob.form.chooseOne')));?></td>
+				<td><a class="btn btn-default btn-del" ref="eventOff"><span class="glyphicon glyphicon-trash"></span></a></td>
+		</tr>
+		</tbody>
+	</table>
 </div>

app/View/User/settings_pages.ctp

@@ -33,7 +33,7 @@ if($profil['AppUser']['take_systemwide']){
 	<div class="tabs-below">
 		<ul class="nav nav-tabs pull-right">
 			<li><?=$this->Html->link(__("dreamjob.settings"),array('controller'=>'user','action'=>'settings_account'));?></li>
-			<li class="active"><?=$this->Html->link(__("dreamjob.settings.pages"),array('controller'=>'user','action'=>'settings_pages'));?></li>
+			<li class="active"><?=$this->Html->link(__("dreamjob.settings.pages"),array('controller'=>'user','action'=>'settings_pageInh'));?></li>
 			<?php
 			 if(!empty($WORKER) and count($WORKER)>0){
 			?>
@@ -48,18 +48,20 @@ if($profil['AppUser']['take_systemwide']){
 	<?php foreach($profil['DreamjobPageInh'] as $pag){ ?>
 		<li<?php if(isset($page['DreamjobPageInh']['id'])) if ($page['DreamjobPageInh']['id'] == $pag['id']){?> class="active"<?php } ?> page="<?=$pag['id'];?>">
 		<?php
-		 echo $this->Html->link('<span class="glyphicon glyphicon-move"></span> '.$pag['title'],array('controller'=>'user','action'=>'settings_pages','page'=> $pag['id'] ),array('escape'=>false));
+		 echo $this->Html->link('<span class="glyphicon glyphicon-move"></span> '.$pag['title'],array('controller'=>'user','action'=>'settings_pageInh','page'=> $pag['id'] ),array('escape'=>false));
 		?>
 		
 		</li>
 	<?php } ?>
 	<li<?php if(empty($page)){?> class="active"<?php } ?>>
-		<?php echo $this->Html->link('<span class="glyphicon glyphicon-plus"></span> '.__('dreamjob.page.new'),array('controller'=>'user','action'=>'settings_pages'),array('escape'=>false));
+		<?php echo $this->Html->link('<span class="glyphicon glyphicon-plus"></span> '.__('dreamjob.page.new'),array('controller'=>'user','action'=>'settings_pageInh'),array('escape'=>false));
 	?></li>
 </ul>
 <legend></legend>
 
 <?php
+ if(empty($page) or !isset($page['DreamjobPageText']))
+	$default_Form['type']='file';
  echo $this->Form->create(false,$default_Form);
 ?>
 <fieldset>
@@ -70,24 +72,26 @@ if($profil['AppUser']['take_systemwide']){
 <legend><?=__('dreamjob.pages.types');?></legend>
 <fieldset>
 <?php
- $extra = array('type'=>'file');
+ if(empty($page) or isset($page['DreamjobPageImage']))
- if(!empty($page) and !isset($page['DreamjobPageImage']))
+	echo $this->Form->input('DreamjobPageImage.image',array('type'=>'file'));
- 	$extra['disabled'] = 'disabled';
+
- echo $this->Form->input('DreamjobPageImage.image',$extra);
+ if(empty($page)){
- $extra = array();
-  if(!empty($page) and !isset($page['DreamjobPageText']))
- 	$extra['disabled'] = 'disabled';
 ?>
 <div>Oder:</div>
-<?=$this->Form->input('DreamjobPageText.text',$extra);?>
+<?php
+ }
+
+ if(empty($page) or isset($page['DreamjobPageText']))
+	echo $this->Form->input('DreamjobPageText.text');
+?>
  </fieldset>
 <div class="buttonrow">
 	<?php
 	 if(!empty($page)){
-		echo $this->Html->link('<span class="glyphicon glyphicon-trash"></span> '.__('dreamjob.page.del'),array('controller'=>'user','action'=>'settings_pages','?'=>array('del'=> $pag['id'])),array('escape'=>false,'class'=>'btn btn-default'));
+		echo $this->Html->link('<span class="glyphicon glyphicon-trash"></span> '.__('dreamjob.page.del'),array('controller'=>'user','action'=>'settings_pageInh','?'=>array('del'=> $pag['id'])),array('escape'=>false,'class'=>'btn btn-default'));
 	}
 	?>
-	<?=$this->Form->button('<span class="glyphicon glyphicon-floppy-disk"></span> '.__('dreamjob.settings.save'),array('div' => false,'class'=>"btn btn-default ",'type' => 'submit'));?>
+	<?=$this->Form->button('<span class="glyphicon glyphicon-floppy-disk"></span> '.__('dreamjob.settings.save'),array('div' => false,'class'=>"btn btn-primary ",'type' => 'submit'));?>
 </div>
 <?php
  echo $this->Form->end();

app/webroot/css/dreamjob.css

@@ -204,14 +204,12 @@ body.loading #container{
 .box-extra-left{
     display:table-cell;
     width:240px;
-    height: 220px;
+    min-height: 220px;
     float:left;
 }
 .box-extra-left > .box{
     width:200px;
     height: 200px;
-    margin:0px;
-    margin-right: 20px;
     padding: 10px;
     vertical-align: middle;
     display:table-cell;
@@ -233,6 +231,7 @@ body.loading #container{
     margin-top:6px;
     margin-bottom: 24px;
     display:table;
+    width:100%;
 }
 .box-title h1{
     text-align: center;
@@ -402,8 +401,10 @@ body.loading #container{
 .infofield{
     color:black;
 }
-.btn.btn-primary{
+.table > thead > tr > th {
-	background-color:red;
+	color:black;
-	border-color:orange;
+}
+.tableForm  tbody tr.new .btn-del{
+	display:none;
 }
 

app/webroot/js/dreamjob.js

@@ -15,7 +15,7 @@
             $(where+'.dropdown-toggle').dropdown();
             
             $(where+" a").each(function(that){
-                if($(this).attr("rel")!=="external")
+                if($(this).attr("rel")!=="external" && $(this).attr("ref")!=="eventOff")
                     $(this).click(function(e){
                         load($(this).attr('href'),{},($(this).attr('rel')=="tab"));
                         return false;  
@@ -23,11 +23,10 @@
             });
             
             
-            $(where+" form:not(.hide-form)").submit(function(e){
+            $(where+" form").submit(function(e){
+				if(!$(this).hasClass("hide-form") && $(this).attr('enctype')!='multipart/form-data' ){
 					e.stopPropagation();
 					//e.preventDefault();
-                
-				if(!$(this).hasClass("hide-form")){
 					if($(this).attr("back"))
 						back=window.location.href;
 					else
@@ -37,7 +36,79 @@
 				}
 			});
 
+			$("form[ enctype *= 'multipart/form-data' ]").each(function(evt){
+				if (!$('#fileUpload').length)
+					$('body').append('<iframe id="fileUpload" name="fileUpload" style="display:none" />');
+				$(this).attr('target','fileUpload');
+				$(this).submit(function(){
+					frame = $('#fileUpload').load(function(){
+						setContent(frame.contents().find('body').html());
+						frame.unbind('load');
+						setTimeout(function (){frame.html('');}, 1);
+					});
+				});
+			});
+			$(where+" form.tableForm tbody").each(function(evt){
+				that = this;
+				newRow = $(".new").html();
+				$(this).change(function(){
+					tosave = true;
+					$("tr",that).each(function(){
+						see = true;
+						$("select",this).each(function(){
+							if(see)
+								see = $(this).val()=='';
+						});
+						if(see && $(this).attr("data")=="set"){
+							$(this).attr("data","");
+							$(this).remove();
+						}
+						if(!see && $(this).attr("data")!="set"){
+							$(this).attr("data","set");
+							$("tr",that).removeClass("new");
+							$(that).append("<tr class=\"new\">"+newRow+"</tr>");
+							evet();
+						}
 						
+						save = true;
+						that2=this;
+						$("select",this).each(function(){
+							if(save && !$(that2).hasClass("new")){
+								save = $(this).val()!='';
+							}
+						});
+						if(tosave && !$(that2).hasClass("new")){
+							tosave = save;
+						}
+					});
+					if(tosave)
+						saveForm();
+				});
+				//ZUOFT WIRD GESPEICHERT
+				
+				function evet(){
+					$("tr:not(.new)",that).each(function(){
+						var that2 = this;
+						$(".btn-del",this).unbind("click").click(function(evt){
+							$(that2).remove();
+							saveForm();
+						});
+					});
+				}
+				evet();
+				function saveForm(){
+					i = 0;
+					$("tr.new",that).remove();
+					$("tr",that).each(function(){
+						$("select,input",this).each(function(){
+							str = $(this).attr("name").replace(/data\[(.*)\]\[.*\]\[(.*)\]/g,'data[$1]['+i+'][$2]');
+							$(this).attr("name",str);
+						});
+						i++;
+					});
+					load($(that).attr("action"),{data:$(that).parents("form").serialize(), type:'POST'},false);
+				}
+			});
 			$(where+" form.hide-form").each(function(evt){
 				that = this;
 				$('span.edit.label',this).click(function(evt){
@@ -74,22 +145,7 @@
             
             //$(where+" form label.has-error").parent(".form-group").addClass("has-error")
         }
-        function load(pageurl,conf,tab){
+        function setContent(data,back,tab){
-            data = {};
-            typemethode = "GET";
-            back = false;
-            if(conf['data'])
-                data = conf['data'];
-            if(conf['type'])
-                typemethode = conf['type'];
-            if(conf['back'] && conf['back'].indexOf("logout")== -1 && conf['back'].indexOf("login")== -1 )
-                back = conf['back'];
-            //e.preventDefault(); 
-            /*	
-            if uncomment the above line, html5 nonsupported browers won't change the url but will display the ajax content;
-            if commented, html5 nonsupported browers will reload the page to the specified link. 
-            */	
-            $.ajax({url:pageurl,data:data,type:typemethode,success: function(data){
                 alert = data.split('<!-- alert -->')[1].split('<!-- /alert -->')[0];
                 if( alert.trim().length > 0){
                     $('#alert').html(alert);
@@ -122,7 +178,8 @@
                     navbar = data.split('<!-- extraScript -->')[1].split('<!-- /extraScript -->')[0];
                     eval($(navbar).html());
                 }
-            },error:function(data){
+            }
+           function setContentError(data,back,tab){
                 alert = "<div class=\"alert alert-danger\">"+data.statusText+
                         "<button type=\"button\" class=\"close\" data-dismiss=\"alert\">&times;</button>"
                         + "</div>";
@@ -130,7 +187,23 @@
                 event("#alert");
                     $('#container').html(data.responseText);
                     event("#container");
-            }});
+            }
+        function load(pageurl,conf,tab){
+            data = {};
+            typemethode = "GET";
+            back = false;
+            if(conf['data'])
+                data = conf['data'];
+            if(conf['type'])
+                typemethode = conf['type'];
+            if(conf['back'] && conf['back'].indexOf("logout")== -1 && conf['back'].indexOf("login")== -1 )
+                back = conf['back'];
+            //e.preventDefault(); 
+            /*	
+            if uncomment the above line, html5 nonsupported browers won't change the url but will display the ajax content;
+            if commented, html5 nonsupported browers will reload the page to the specified link. 
+            */	
+            $.ajax({url:pageurl,data:data,type:typemethode,success:function(data){setContent(data,back,tab);} ,error:function(data){setContentError(data,back,tab);}});
             if(pageurl!=window.location){
                     window.history.pushState({path:pageurl},'',pageurl);	
             }

update.sql

@@ -10,14 +10,14 @@
 
 
 
-CREATE TABLE IF NOT EXISTS `mic_dj_job_opening_worker` (
+CREATE TABLE IF NOT EXISTS `mic_dj_jobs_opening_worker` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `opening_id` int(11) NOT NULL,
   `worker_id` int(11) NOT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `opening_id` (`opening_id`,`worker_id`),
-  KEY `mic_dj_job_opening_worker_favOpening` (`opening_id`),
+  KEY `mic_dj_jobs_opening_worker_favOpening` (`opening_id`),
-  KEY `mic_dj_job_opening_worker_favWorker` (`worker_id`)
+  KEY `mic_dj_jobs_opening_worker_favWorker` (`worker_id`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
 
 
@@ -36,6 +36,33 @@ ALTER TABLE `mic_dj_account_cmpy` ADD `pro_user` INT NOT NULL ;
 --
 -- Constraints der Tabelle `mic_dj_job_opening_worker`
 --
-ALTER TABLE `mic_dj_job_opening_worker`
+ALTER TABLE `mic_dj_jobs_opening_worker`
-  ADD CONSTRAINT `mic_dj_job_opening_worker_favOpening` FOREIGN KEY (`opening_id`) REFERENCES `mic_dj_jobs_opening` (`id`),
+  ADD CONSTRAINT `mic_dj_jobs_opening_worker_favOpening` FOREIGN KEY (`opening_id`) REFERENCES `mic_dj_jobs_opening` (`id`),
-  ADD CONSTRAINT `mic_dj_job_opening_worker_favWorker` FOREIGN KEY (`worker_id`) REFERENCES `mic_dj_account_wrk` (`djaccount_ptr_id`);
+  ADD CONSTRAINT `mic_dj_jobs_opening_worker_favWorker` FOREIGN KEY (`worker_id`) REFERENCES `mic_dj_account_wrk` (`djaccount_ptr_id`);
+  
+  
+  
+  
+-- ACHTUNG:
+-- 3/15
+update `mic_dj_account_cmpy` left join `mic_dj_list_branch` on `name`=`branch` set `branch`=`mic_dj_list_branch`.`id`;
+ALTER TABLE `mic_dj_account_cmpy` CHANGE `branch` `branch_id` INT(11) NOT NULL;
+
+-- 2/4
+update `mic_dj_jobs_opening` left join `mic_dj_list_branch` on `name`=`branch` set `branch`=`mic_dj_list_branch`.`id`;
+ALTER TABLE `mic_dj_jobs_opening` CHANGE `branch` `branch_id` INT(11) NOT NULL;
+
+
+-- LOLA
+-- 15/70
+update `mic_dj_account_isearch` left join `mic_dj_list_job` on `name`=`job` set `job`=`mic_dj_list_job`.`id`
+update `mic_dj_account_isearch` left join `mic_dj_list_branch` on `name`=`branch` set `job`=`mic_dj_list_branch`.`id`
+
+ALTER TABLE `mic_dj_account_isearch` CHANGE `branch` `branch_id` INT(11) NOT NULL;
+ALTER TABLE `mic_dj_account_isearch` CHANGE `job` `job_id` INT(11) NOT NULL;
+
+ALTER TABLE `mic_dj_account_isearch`
+  ADD CONSTRAINT `mic_dj_account_isearch_branch` FOREIGN KEY (`branch_id`) REFERENCES `mic_dj_list_branch` (`id`),
+  ADD CONSTRAINT `mic_dj_account_isearch_job` FOREIGN KEY (`job_id`) REFERENCES `mic_dj_list_job` (`id`);
+
+