Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci

application/controllers/api/v1/CheckUserAuth.php

@@ -0,0 +1,44 @@
+<?php
+/**
+ * FH-Complete
+ *
+ * @package		FHC-API
+ * @author		FHC-Team
+ * @copyright	Copyright (c) 2016, fhcomplete.org
+ * @license		GPLv3
+ * @link		http://fhcomplete.org
+ * @since		Version 1.0
+ * @filesource
+ */
+// ------------------------------------------------------------------------
+
+if (!defined('BASEPATH')) exit('No direct script access allowed');
+
+class CheckUserAuth extends APIv1_Controller
+{
+	/**
+	 * Course API constructor.
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->load->model('CheckUserAuth_model', 'CheckUserAuthModel');
+	}
+	
+	public function getCheckByUsernamePassword()
+    {
+		$username = $this->get("username");
+		$password = $this->get("password");
+		
+		if (isset($username) && isset($password))
+		{
+			$result = $this->CheckUserAuthModel->checkByUsernamePassword($username, $password);
+			
+			$this->response($result, REST_Controller::HTTP_OK);
+		}
+		else
+		{
+			$this->response();
+		}
+    }
+}

application/controllers/api/v1/crm/Akte.php

@@ -46,6 +46,28 @@ class Akte extends APIv1_Controller
 			$this->response();
 		}
 	}
+	
+	/**
+	 * @return void
+	 */
+	public function getAkten()
+	{
+		$person_id = $this->get('person_id');
+		$dokument_kurzbz = $this->get('dokument_kurzbz');
+		$stg_kz = $this->get('stg_kz');
+		$prestudent_id = $this->get('prestudent_id');
+		
+		if (isset($person_id))
+		{
+			$result = $this->AkteModel->getAkten($person_id, $dokument_kurzbz, $stg_kz, $prestudent_id);
+			
+			$this->response($result, REST_Controller::HTTP_OK);
+		}
+		else
+		{
+			$this->response();
+		}
+	}
 
 	/**
 	 * @return void

application/controllers/api/v1/person/Kontakt.php

@@ -53,6 +53,22 @@ class Kontakt extends APIv1_Controller
 		}
     }
 	
+	public function getOnlyKontakt()
+    {
+		$kontakt_id = $this->get("kontakt_id");
+		
+		if (isset($kontakt_id))
+		{
+			$result = $this->KontaktModel->loadWhere(array('kontakt_id' => $kontakt_id));
+			
+			$this->response($result, REST_Controller::HTTP_OK);
+		}
+		else
+		{
+			$this->response();
+		}
+    }
+	
 	public function getKontaktByPersonID()
     {
 		$person_id = $this->get("person_id");