Merge branch 'master' into permissions

- Added new core controller called Auth_Controller that extends FHC_Controller and manage the authentication
- All the controllers that were extending the CI_Controller now they extend the FHC_Controller
- All the controllers that were extending the FHC_Controller now they extend the Auth_Controller
- Added the method isAllowed to the FiltersLib to check if the authenticated user has the required permissions
- FilterWidget and controller Filters are using the method isAllowed from the FiltersLib

application/models/system/Filters_model.php

@@ -44,7 +44,6 @@ class Filters_model extends DB_Model
 		$filterParametersArray = array(
 			'app' => $app,
 			'dataset_name' => $dataset_name,
-			'default_filter' => false,
 			'array_length(description, 1) >' => 0,
 			'uid' => $uid
 		);

application/models/system/PersonLog_model.php

@@ -80,4 +80,36 @@ class PersonLog_model extends CI_Model
 
 		return success($result->result());
 	}
+
+	/**
+	 * Gets all logs with zeitpunkt > today
+	 * @param $person_id
+	 * @return array
+	 */
+	public function getLogsInFuture($person_id)
+	{
+		$this->db->order_by('zeitpunkt', 'DESC');
+		$this->db->order_by('log_id', 'DESC');
+
+		$where = "logtype_kurzbz = 'Processstate' 
+					AND person_id=".$this->db->escape($person_id)."
+					AND zeitpunkt >= now()";
+
+		$result = $this->db->get_where($this->dbTable, $where);
+
+		return success($result->result());
+	}
+
+	/**
+	 * Deletes a log
+	 * @param $log_id
+	 * @return array
+	 */
+	public function deleteLog($log_id)
+	{
+		$this->db->where('log_id', $log_id);
+		$result = $this->db->delete($this->dbTable);
+
+		return success($result);
+	}
 }

application/models/system/Phrase_model.php

@@ -71,4 +71,32 @@ class Phrase_model extends DB_Model
 
 		return $this->execQuery($query, array($categories, $language));
 	}
+
+	/**
+	 * Loads phrases using category(s) and language as keys using associative category array
+	 * that contains also phrases for each category
+	 */
+	public function getPhrasesByCategoryAndPhrasesAndLanguage($phrasesParams, $language)
+	{
+		$query = '
+			SELECT p.category, p.phrase, pt.orgeinheit_kurzbz, pt.orgform_kurzbz, pt.text
+			  FROM system.tbl_phrase p
+		INNER JOIN system.tbl_phrasentext pt USING(phrase_id)
+			 WHERE pt.sprache = ? AND ';
+
+		$parametersArray = array($language);
+
+		foreach ($phrasesParams as $category => $phrases)
+		{
+			$query .= '(category = ? AND phrase IN ?) OR ';
+			$parametersArray[] = $category;
+			$parametersArray[] = $phrases;
+		}
+
+		$query = rtrim($query, ' OR ');
+
+		$query .= ' ORDER BY p.category, p.phrase, pt.orgeinheit_kurzbz DESC, pt.orgform_kurzbz DESC';
+
+		return $this->execQuery($query, $parametersArray);
+	}
 }