diff --git a/vilesci/lehre/lv_merge.php b/vilesci/lehre/lv_merge.php
index 8ce13220b..327240d79 100644
--- a/vilesci/lehre/lv_merge.php
+++ b/vilesci/lehre/lv_merge.php
@@ -112,12 +112,22 @@ if (isset($_REQUEST['compare']))
$msg .= '
';
foreach ($lv_diff1 as $key => $value)
{
- $msg .= ''.(is_bool($value)?($value?' ':' '):$value).' | ';
+ if (is_bool($value))
+ $msg .= ''.($value?' ':' ').' | ';
+ elseif ($key == 'farbe')
+ $msg .= ''.$value.' | ';
+ else
+ $msg .= ''.$value.' | ';
}
$msg .= '
';
foreach ($lv_diff2 as $key => $value)
{
- $msg .= ''.(is_bool($value)?($value?' ':' '):$value).' | ';
+ if (is_bool($value))
+ $msg .= ''.($value?' ':' ').' | ';
+ elseif ($key == 'farbe')
+ $msg .= ''.$value.' | ';
+ else
+ $msg .= ''.$value.' | ';
}
$msg .= '
';
}
@@ -133,6 +143,9 @@ if((isset($_REQUEST['transfer']) || isset($_REQUEST['mergeDelete'])) && isset($c
}
else
{
+ if(!$rechte->isBerechtigt('lehre/lehrveranstaltung', NULL, 'sui'))
+ die($rechte->errormsg);
+
$msg='';
$update_qry="BEGIN;";
@@ -208,6 +221,9 @@ if((isset($_REQUEST['transfer']) || isset($_REQUEST['mergeDelete'])) && isset($c
if (isset($_REQUEST['mergeDelete']))
{
+ if(!$rechte->isBerechtigt('lehre/lehrveranstaltung', NULL, 'suid'))
+ die($rechte->errormsg);
+
$update_qry.="UPDATE campus.tbl_benutzerlvstudiensemester SET lehrveranstaltung_id=".$db->db_add_param($courseRight, FHC_INTEGER)." WHERE lehrveranstaltung_id=".$db->db_add_param($courseLeft, FHC_INTEGER).";";
$update_qry.="UPDATE campus.tbl_feedback SET lehrveranstaltung_id=".$db->db_add_param($courseRight, FHC_INTEGER)." WHERE lehrveranstaltung_id=".$db->db_add_param($courseLeft, FHC_INTEGER).";";
$update_qry.="UPDATE campus.tbl_lehrveranstaltung_pruefung SET lehrveranstaltung_id=".$db->db_add_param($courseRight, FHC_INTEGER)." WHERE lehrveranstaltung_id=".$db->db_add_param($courseLeft, FHC_INTEGER).";";
@@ -623,22 +639,25 @@ echo '';
echo '';
-echo ' ';
-
-echo ' | ';
-
-echo ' | ';
+if($rechte->isBerechtigt('lehre/lehrveranstaltung', NULL, 'suid'))
+ echo ' | ';
echo ' ';