From ad068ffe5ff9cd802392150033cc56bb83514400 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 4 Nov 2024 09:07:35 +0100
Subject: [PATCH 1/5] different property name for the different moodle courses
 names

---
 public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
index 4c17b1a1f..ddbc259ea 100644
--- a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
+++ b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
@@ -132,7 +132,7 @@ export default {
 							{{menuItem.name}}
 							</a>
 							<ul v-if="menuItem.c4_moodle_links?.length" class="dropdown-menu p-0 mylv_dropdown" :aria-labelledby="'moodle_links_'+lehrveranstaltung_id">
-								<li v-for="item in menuItem.c4_moodle_links"><a class="dropdown-item border-bottom" :href="item.url">{{item.lehrform_kurzbz}}</a></li>
+								<li v-for="item in menuItem.c4_moodle_links"><a class="dropdown-item border-bottom" :href="item.url">{{item.lehrform}}</a></li>
 							</ul>
 						</div>
 					</li>

From 9e45394deb554c8216cf5c159af885bcf1637709 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 4 Nov 2024 12:09:12 +0100
Subject: [PATCH 2/5] fix(Cis MyLv): uses the moodle course bezeichnung for
 multiple moodle links

---
 public/css/components/MyLv.css                         |  4 ----
 .../js/components/Cis/Mylv/Semester/Studiengang/Lv.js  | 10 +++++-----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/public/css/components/MyLv.css b/public/css/components/MyLv.css
index eea5a5eea..2ce544582 100644
--- a/public/css/components/MyLv.css
+++ b/public/css/components/MyLv.css
@@ -2,7 +2,3 @@
 	color: #565e647f !important;
 	cursor: default;
 }
-
-.mylv_dropdown{
-	margin-left: -5px !important;
-}
\ No newline at end of file
diff --git a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
index ddbc259ea..cf8b3fed6 100644
--- a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
+++ b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
@@ -123,18 +123,18 @@ export default {
 		<div class="card-body " :style="bodyStyle">
 			<ul class="list-group border-top-0 border-bottom-0 rounded-0">
 				<template v-if="menu">
-					<li :type="menuItem.c4_link ? 'button' : null" v-for="menuItem in menu" class="list-group-item border-0 ">
-						<div class="d-flex flex-row" >
+					<li :type="menuItem.c4_link ? 'button' : null" v-for="menuItem in menu" class="list-group-item border-0 " >
+						<div class="d-flex flex-row"  :data-bs-toggle="menuItem.c4_moodle_links?.length ? 'dropdown' : null">
 							<div class="mx-4">
 								<i :class="[menuItem.c4_icon2 ? menuItem.c4_icon2 : 'fa-solid fa-pen-to-square', !menuItem.c4_link ? 'unavailable' : null ]"></i>
 							</div>
-							<a class="text-decoration-none text-truncate" :id="'moodle_links_'+lehrveranstaltung_id" :data-bs-toggle="menuItem.c4_moodle_links?.length ? 'dropdown' : null" :class="{'link-dark':menuItem.c4_link, 'unavailable':!menuItem.c4_link, 'dropdown-toggle':menuItem.c4_moodle_links?.length }" :target="menuItem.c4_target" :href="menuItem.c4_link ? !menuItem.c4_moodle_links?.length && menuItem.c4_link : null">
+							<a class="text-decoration-none text-truncate" :id="'moodle_links_'+lehrveranstaltung_id"  :class="{'link-dark':menuItem.c4_link, 'unavailable':!menuItem.c4_link, 'dropdown-toggle':menuItem.c4_moodle_links?.length }" :target="menuItem.c4_target" :href="menuItem.c4_link ? !menuItem.c4_moodle_links?.length && menuItem.c4_link : null">
 							{{menuItem.name}}
 							</a>
-							<ul v-if="menuItem.c4_moodle_links?.length" class="dropdown-menu p-0 mylv_dropdown" :aria-labelledby="'moodle_links_'+lehrveranstaltung_id">
+							</div>
+							<ul v-if="menuItem.c4_moodle_links?.length" class="dropdown-menu p-0" :aria-labelledby="'moodle_links_'+lehrveranstaltung_id">
 								<li v-for="item in menuItem.c4_moodle_links"><a class="dropdown-item border-bottom" :href="item.url">{{item.lehrform}}</a></li>
 							</ul>
-						</div>
 					</li>
 				</template>
 				<template v-else>

From 86ee48888a89fdb7072053bba933672dc52cc938 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 4 Nov 2024 12:04:14 +0100
Subject: [PATCH 3/5] fix(Cis Menu): adds Zahlungen to Mein Studium

---
 system/dbupdate_3.4/25999_C4_Menu.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/system/dbupdate_3.4/25999_C4_Menu.php b/system/dbupdate_3.4/25999_C4_Menu.php
index 990f6828c..caa337aea 100644
--- a/system/dbupdate_3.4/25999_C4_Menu.php
+++ b/system/dbupdate_3.4/25999_C4_Menu.php
@@ -410,16 +410,6 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					10487, NOW(), null, null, null, 8
 				);
 
-				INSERT INTO campus.tbl_contentchild
-				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
-				VALUES
-				(
-					-- queries the content_id for the CIS4_ROOT
-					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'CIS4_ROOT'),
-					-- 10568 is the content_id for Zahlungen
-					10568, NOW(), null, null, null, 9
-				);
-
 				###### Mein Studium childs
 
 				INSERT INTO campus.tbl_contentchild
@@ -465,6 +455,16 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'BESTÄTIGUNGEN_ZEUGNISSE'),
 					NOW(), null, null, null, 4
 				);
+
+				INSERT INTO campus.tbl_contentchild
+				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
+				VALUES
+				(
+					-- queries the content_id for the MEIN_STUDIUM
+					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'MEIN_STUDIUM'),
+					-- 10568 is the content_id for Zahlungen
+					10568, NOW(), null, null, null, 5
+				);
 				
 				INSERT INTO campus.tbl_contentchild
 				(content_id, child_content_id, insertamum, insertvon, updateamum, updatevon, sort)
@@ -473,7 +473,7 @@ if ($result = @$db->db_query("SELECT * FROM campus.tbl_content WHERE beschreibun
 					-- queries the content_id for the MEIN_STUDIUM
 					(SELECT content_id from campus.tbl_content WHERE beschreibung = 'MEIN_STUDIUM'),
 					-- 10795 is the content_id for Studierendenstatus
-					10795, NOW(), null, null, null, 5
+					10795, NOW(), null, null, null, 6
 				);
 
 				###### VPN_STUDIERENDE childs

From eafbdcfffe577e4505f04b2f82e5321bd2ea03b8 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 4 Nov 2024 13:39:13 +0100
Subject: [PATCH 4/5] refactor(Cis Menu): changes method name and checks if the
 CIS4_MENU_ENTRY constant is defined

---
 application/controllers/components/CisVue.php |  3 ++-
 application/models/content/Content_model.php  | 12 +++++++++++-
 application/views/templates/CISVUE-Header.php |  2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/application/controllers/components/CisVue.php b/application/controllers/components/CisVue.php
index 537537f08..b5433ebfe 100644
--- a/application/controllers/components/CisVue.php
+++ b/application/controllers/components/CisVue.php
@@ -31,7 +31,8 @@ class CisVue extends FHC_Controller
 	public function Menu()
 	{
 		$this->load->model('content/Content_model', 'ContentModel');
-		$result = $this->ContentModel->getMenu(defined('CIS4_MENU_ENTRY') ? CIS4_MENU_ENTRY : null, get_uid());
+		$menu_contentID = $this->ContentModel->getMenuContentID();
+		$result = $this->ContentModel->getMenu($menu_contentID, get_uid());
 		$menu = getData($result) ?? (object)['childs' => []];
 
 		$this->outputJsonSuccess($menu);
diff --git a/application/models/content/Content_model.php b/application/models/content/Content_model.php
index 9f0a3634e..278022b59 100644
--- a/application/models/content/Content_model.php
+++ b/application/models/content/Content_model.php
@@ -71,13 +71,23 @@ class Content_model extends DB_Model
 	 *
 	 * @return integer|null			content_id of the Cis4_Root Menu
 	 */
-	public function getCIS4_ContentID(){
+	public function getMenuContentID(){
+		// early return if the CIS4_MENU_ENTRY constant is defined  
+		if(defined('CIS4_MENU_ENTRY'))
+		{
+			return CIS4_MENU_ENTRY;
+		}
+		
+		// load the CIS4 Menu content_id from the database using the column 'beschreibugn' of the campus.tbl_content table
 		$CIS4_ROOT_CONTENT = $this->loadWhere(["beschreibung"=>"CIS4_ROOT"]);
+		
 		if(isError($CIS4_ROOT_CONTENT))
 		{
 			return null;
 		}
+
 		$CIS4_ROOT_CONTENT = getData($CIS4_ROOT_CONTENT);
+		
 		if(count($CIS4_ROOT_CONTENT) > 0)
 		{
 			return current($CIS4_ROOT_CONTENT)->content_id ?? null;
diff --git a/application/views/templates/CISVUE-Header.php b/application/views/templates/CISVUE-Header.php
index 6ee344391..70f9a173f 100644
--- a/application/views/templates/CISVUE-Header.php
+++ b/application/views/templates/CISVUE-Header.php
@@ -19,7 +19,7 @@ $this->load->view('templates/FHC-Header', $includesArray);
 if (!isset($menu)) {
 	$ci =& get_instance(); // get CI instance
 	$ci->load->model('content/Content_model', 'ContentModel');
-	$cis4_content_id = $ci->ContentModel->getCIS4_ContentID();
+	$cis4_content_id = $ci->ContentModel->getMenuContentID();
 	$result = $ci->ContentModel->getMenu($cis4_content_id, get_uid());
 	$menu = getData($result)->childs ?? [];
 }

From 50a67a8e889ce15d988ddf2bc33e812c5039e744 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 4 Nov 2024 14:37:09 +0100
Subject: [PATCH 5/5] feature(Dashboard Bookmark): checks whether the link is a
 valid URL, displays fhcAlert otherwise

---
 public/js/components/DashboardWidget/Url.js | 15 ++++++++++++++-
 system/phrasesupdate.php                    | 20 ++++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/public/js/components/DashboardWidget/Url.js b/public/js/components/DashboardWidget/Url.js
index b87ef4235..8dabf7b4c 100644
--- a/public/js/components/DashboardWidget/Url.js
+++ b/public/js/components/DashboardWidget/Url.js
@@ -5,6 +5,7 @@ export default {
   data: () => ({
     title_input: "",
     url_input: "",
+	invalidURL: false,
   }),
   mixins: [AbstractWidget],
   computed: {
@@ -35,6 +36,15 @@ export default {
       if ((await this.$fhcAlert.confirmDelete()) === false) return;
     },
     addLink() {
+	  // reset is-invalid css on url input field
+	  this.invalidURL = false;
+
+	  if(!URL.canParse(this.url_input)) 
+	  {
+		this.$fhcAlert.alertError(this.$p.t("bookmark", "invalidUrl"));
+		this.invalidURL = true;
+		return;
+	  }
       this.$fhcApi.factory.bookmark
         .insert({
           tag: this.config.tag,
@@ -83,7 +93,10 @@ export default {
                 <header><b>{{$p.t('bookmark','newLink')}}</b></header><br>
                 <div>
                     <input class="form-control form-control-sm" placeholder="Titel" type="text" v-model="title_input" name="title" maxlength="50" required>
-                    <input class="form-control form-control-sm mt-2" type="url" placeholder="URL" v-model="url_input" name="url" required>
+					<input required id="bookmark_link" class="form-control form-control-sm mt-2" :class="{'is-invalid':invalidURL}" type="url" placeholder="URL" v-model="url_input" name="url">
+				    <div class="invalid-feedback">
+					{{$p.t("bookmark", "invalidUrl")}}.
+					</div>
                     <button class="btn btn-outline-secondary btn-sm w-100 mt-2" @click="addLink" type="button">{{$p.t('bookmark','saveLink')}}</button>
                 </div>
             </div>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index e5275d513..22f7491df 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -31484,6 +31484,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'bookmark',
+		'phrase' => 'invalidUrl',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Ungültiger Link',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Invalid link',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'global',