From 634401485a5f857842e8a08a6431e7a7f1191526 Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Thu, 28 May 2020 09:42:51 +0200
Subject: [PATCH] Renamed 'Meine Felder'-msg names and small method adaptation
 to retrieve fields

Signed-off-by: Cris <hainberg@technikum-wien.at>
---
 application/libraries/MessageLib.php        |  6 +++---
 application/models/system/Message_model.php | 17 +++++++++++++++++
 system/dbupdate_3.3.php                     | 10 +++++-----
 3 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/application/libraries/MessageLib.php b/application/libraries/MessageLib.php
index 31d33eda4..e0622e664 100644
--- a/application/libraries/MessageLib.php
+++ b/application/libraries/MessageLib.php
@@ -222,7 +222,7 @@ class MessageLib
 	public function getMessageVarsLoggedInUser()
 	{
 		// Retrieves message vars from view vw_msg_vars
-		$messageVars = $this->_ci->MessageModel->getMsgVarsDataLoggedInUser();
+		$messageVars = $this->_ci->MessageModel->getMsgVarsLoggedInUser();
 		if (isSuccess($messageVars)) // if everything is ok
 		{
 			$variablesArray = array();
@@ -231,8 +231,8 @@ class MessageLib
 			// Starts from 1 to skip the first element which is uid
 			for ($i = 1; $i < count($tmpVariablesArray); $i++)
 			{
-				$variablesArray['{my_'.str_replace(' ', '_', strtolower($tmpVariablesArray[$i])).'}']
-					= 'my_'. strtoupper($tmpVariablesArray[$i]);
+				$variablesArray['{'.str_replace(' ', '_', strtolower($tmpVariablesArray[$i])).'}']
+					= strtoupper($tmpVariablesArray[$i]);
 			}
 
 			return success($variablesArray);
diff --git a/application/models/system/Message_model.php b/application/models/system/Message_model.php
index 5ebcc5ee9..0972f127f 100644
--- a/application/models/system/Message_model.php
+++ b/application/models/system/Message_model.php
@@ -171,6 +171,23 @@ class Message_model extends DB_Model
 			return error($this->db->error(), FHC_DB_ERROR);
 		}
 	}
+	
+	/**
+	 * Get message variables for logged in user
+	 */
+	public function getMsgVarsLoggedInUser()
+	{
+		$result = $this->db->query('SELECT * FROM public.vw_msg_vars_user WHERE 0 = 1');
+		
+		if ($result)
+		{
+			return success($result->list_fields());
+		}
+		else
+		{
+			return error($this->db->error(), FHC_DB_ERROR);
+		}
+	}
 
 	/**
 	 * getMsgVarsDataByPrestudentId
diff --git a/system/dbupdate_3.3.php b/system/dbupdate_3.3.php
index 3112bacbb..f0da8fab6 100644
--- a/system/dbupdate_3.3.php
+++ b/system/dbupdate_3.3.php
@@ -202,11 +202,11 @@ if(!$result = @$db->db_query("SELECT 1 FROM public.vw_msg_vars_user LIMIT 1"))
 	$qry = '
 		CREATE OR REPLACE VIEW public.vw_msg_vars_user AS (
 			SELECT DISTINCT ON
-				(b.uid) b.uid,
-				p.vorname,
-				p.nachname,
-				b.alias,
-				ma.telefonklappe AS "durchwahl"
+				(b.uid) b.uid AS "my_uid",
+				p.vorname AS "my_vorname",
+				p.nachname AS "my_nachname",
+				b.alias AS "my_alias",
+				ma.telefonklappe AS "my_durchwahl"
 			FROM public.tbl_person p
 			JOIN public.tbl_benutzer b USING (person_id)
 			JOIN public.tbl_mitarbeiter ma ON ma.mitarbeiter_uid = b.uid