Merge remote-tracking branch 'origin/master'

application/controllers/api/v1/codex/Zgv.php

@@ -45,14 +45,6 @@ class Zgv extends API_Controller
 		}
 	}
 
-	/**
-	 * @return zgv
-	 */
-	public function getAllZgv()
-	{
-		$this->response($this->Zgv_model->getAllZgv(), REST_Controller::HTTP_OK);
-	}
-
 	/**
 	 * @return void
 	 */

application/controllers/api/v1/codex/Zgvmaster.php

@@ -45,14 +45,6 @@ class Zgvmaster extends API_Controller
 		}
 	}
 
-	/**
-	 * @return zgvmaster
-	 */
-	public function getAllZgvmaster()
-	{
-		$this->response($this->Zgvmaster_model->getAllZgvmaster(), REST_Controller::HTTP_OK);
-	}
-
 	/**
 	 * @return void
 	 */

application/controllers/system/infocenter/InfoCenter.php

@@ -1987,11 +1987,23 @@ class InfoCenter extends Auth_Controller
 
 		$studienArtBerechtigung = array_column($this->getStudienArtBerechtigung(), 'typ');
 
+		$this->ZgvModel->addOrder('zgv_bez');
+		$allZGVs = getData($this->ZgvModel->load());
+
+		$this->ZgvModel->addOrder('zgvmas_bez');
+		$allZGVsMaster = getData($this->ZgvmasterModel->load());
+
+		$this->NationModel->addOrder('langtext');
+		$allNations = getData($this->NationModel->load());
+
 		$data = array (
 			'zgvpruefungen' => $zgvpruefungen,
 			'abwstatusgruende' => $abwstatusgruende,
 			'intstatusgruende' => $intstatusgruende,
-			'studienArtBerechtigung' => $studienArtBerechtigung
+			'studienArtBerechtigung' => $studienArtBerechtigung,
+			'all_zgvs' => $allZGVs,
+			'all_zgvs_master' => $allZGVsMaster,
+			'all_nations' => $allNations,
 		);
 
 		return $data;

application/models/codex/Nation_model.php

@@ -11,14 +11,4 @@ class Nation_model extends DB_Model
 		$this->dbTable = 'bis.tbl_nation';
 		$this->pk = 'nation_code';
 	}
-
-	/**
-	 * getAllForStyled Dropdown
-	 */
-	public function getAll()
-	{
-		$allNations = 'SELECT * FROM bis.tbl_nation	ORDER BY bis.tbl_nation.langtext ASC;';
-
-		return $this->execQuery($allNations);
-	}
 }

application/models/codex/Zgv_model.php

@@ -11,16 +11,4 @@ class Zgv_model extends DB_Model
 		$this->dbTable = 'bis.tbl_zgv';
 		$this->pk = 'zgv_code';
 	}
-
-	/**
-	 * getAllForStyled Dropdown
-	 */
-	public function getAllZgv()
-	{
-		$allZgv = 'SELECT * FROM bis.tbl_zgv ORDER BY zgv_bez ASC;';
-
-		return $this->execQuery($allZgv);
-	}
-
-
 }

application/models/codex/Zgvmaster_model.php

@@ -11,14 +11,4 @@ class Zgvmaster_model extends DB_Model
 		$this->dbTable = 'bis.tbl_zgvmaster';
 		$this->pk = 'zgvmas_code';
 	}
-
-	/**
-	 * getAllForStyled Dropdown
-	 */
-	public function getAllZgvmaster()
-	{
-		$allZgvMaster = 'SELECT * FROM bis.tbl_zgvmaster ORDER BY zgvmas_bez ASC;';
-
-		return $this->execQuery($allZgvMaster);
-	}
 }

application/views/system/infocenter/zgvpruefungen.php

@@ -222,12 +222,25 @@
 											<a href="javascript:void(0)"><i class="fa fa-info-circle"></i> <?php echo  $this->p->t('infocenter', 'zgv') ?> <?php echo $studiengangkurzbz ?></a>
 										</div>
 									</div>
-									<?php if (!$infoonly)
+									<?php if (!$infoonly):
-										echo $this->widgetlib->widget(
+									echo "<select id='zgv_" . $zgvpruefung->prestudent_id . "' name='zgv' class='form-control'>";
-											'Zgv_widget',
+										$selectedDefault = (is_null($zgvpruefung->zgv_code) ? 'selected' : '');
-											array(DropdownWidget::SELECTED_ELEMENT => $zgvpruefung->zgv_code),
+										echo "<option " . $selectedDefault . " value='null'>Bitte Eintrag wählen...</option>";
-											array('name' => 'zgv', 'id' => 'zgv_'.$zgvpruefung->prestudent_id)
+										foreach ($all_zgvs as $zgv)
-										); ?>
+										{
+											$selected = ($zgvpruefung->zgv_code === $zgv->zgv_code) ? 'selected' : '';
+											$aktiv = '';
+											$class = '';
+											if (!$zgv->aktiv)
+											{
+												$aktiv = '(inaktiv)';
+												$class = 'gesperrtoption';
+											}
+
+											echo "<option " . $selected . " value='" . $zgv->zgv_code . "' class='". $class ."'>" . $zgv->zgv_bez . " " . $aktiv ."</option>";
+										}
+									echo "</select>";
+									endif;?>
 								</div>
 							</div>
 							<div class="col-lg-<?php echo $columns[1] ?>">
@@ -265,11 +278,26 @@
 									<?php if ($infoonly)
 										echo $zgvpruefung->zgvnation_bez;
 									else
-										echo $this->widgetlib->widget(
+									{
-											'Nation_widget',
+										echo "<select id='zgvnation_" . $zgvpruefung->prestudent_id . "' name='zgvnation' class='form-control'>";
-											array(DropdownWidget::SELECTED_ELEMENT => $zgvpruefung->zgvnation_code),
+										$selectedDefault = (is_null($zgvpruefung->zgvnation_code) ? 'selected' : '');
-											array('name' => 'zgvnation', 'id' => 'zgvnation_'.$zgvpruefung->prestudent_id)
+										echo "<option " . $selectedDefault . " value='null'>Bitte Eintrag wählen...</option>";
-										); ?>
+
+										foreach ($all_nations as $nation)
+										{
+											$selected = ($nation->nation_code === $zgvpruefung->zgvnation_code) ? 'selected' : '';
+											$sperre = '';
+											$class = '';
+											if ($nation->sperre == 'true')
+											{
+												$sperre = '(gesperrt)';
+												$class = 'gesperrtoption';
+											}
+											echo "<option " . $selected . " value='" . $nation->nation_code . "' class='" . $class ."'>" . $nation->langtext . " " . $sperre ."</option>";
+										}
+										echo "</select>";
+									}
+									?>
 								</div>
 							</div>
 						</div>
@@ -282,11 +310,25 @@
 										if ($infoonly)
 											echo $zgvpruefung->zgvmas_bez;
 										else
-											echo $this->widgetlib->widget(
+										{
-												'Zgvmaster_widget',
+											echo "<select id='zgvmas_" . $zgvpruefung->prestudent_id . "' name='zgvmas' class='form-control'>";
-												array(DropdownWidget::SELECTED_ELEMENT => $zgvpruefung->zgvmas_code),
+											$selectedDefault = (is_null($zgvpruefung->zgvmas_code) ? 'selected' : '');
-												array('name' => 'zgvmas', 'id' => 'zgvmas_'.$zgvpruefung->prestudent_id)
+											echo "<option " . $selectedDefault . " value='null'>Bitte Eintrag wählen...</option>";
-											); ?>
+											foreach ($all_zgvs_master as $zgv)
+											{
+												$selected = ($zgvpruefung->zgvmas_code === $zgv->zgvmas_code) ? 'selected' : '';
+												$aktiv = '';
+												$class = '';
+												if (!$zgv->aktiv)
+												{
+													$aktiv = '(inaktiv)';
+													$class = 'gesperrtoption';
+												}
+												echo "<option " . $selected . " value='" . $zgv->zgvmas_code . "' class='" . $class . "'>" . $zgv->zgvmas_bez . " " . $aktiv ."</option>";
+											}
+											echo "</select>";
+										}
+										?>
 									</div>
 								</div>
 								<div class="col-lg-<?php echo $columns[1] ?>">
@@ -326,11 +368,28 @@
 										if ($infoonly)
 											echo $zgvpruefung->zgvmanation_bez;
 										else
-											echo $this->widgetlib->widget(
+										{
-												'Nation_widget',
+											echo "<select id='zgvmanation_" . $zgvpruefung->prestudent_id . "' name='zgvmanation' class='form-control'>";
-												array(DropdownWidget::SELECTED_ELEMENT => $zgvpruefung->zgvmanation_code),
+											$selectedDefault = (is_null($zgvpruefung->zgvmanation_code) ? 'selected' : '');
-												array('name' => 'zgvmanation', 'id' => 'zgvmanation_'.$zgvpruefung->prestudent_id)
+											echo "<option " . $selectedDefault . " value='null'>Bitte Eintrag wählen...</option>";
-											); ?>
+
+											foreach ($all_nations as $nation)
+											{
+												$selected = ($nation->nation_code === $zgvpruefung->zgvmanation_code) ? 'selected' : '';
+												$sperre = '';
+												$class = '';
+
+												if ($nation->sperre == 'true')
+												{
+													$sperre = '(gesperrt)';
+													$class = 'gesperrtoption';
+												}
+
+												echo "<option " . $selected . " value='" . $nation->nation_code . "' class='" . $class . "'>" . $nation->langtext . " " . $sperre ."</option>";
+											}
+											echo "</select>";
+										}
+										?>
 									</div>
 								</div>
 							</div>

cis/private/lehre/lesson.php

@@ -102,6 +102,7 @@ if (isset($_GET["handbuch"])){
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 	<link href="../../../skin/style.css.php" rel="stylesheet" type="text/css">
 	<link href="../../../skin/jquery.css" rel="stylesheet" type="text/css"/>
+	<link href="../../../vendor/components/jqueryui/themes/base/jquery-ui.min.css" rel="stylesheet" type="text/css"/>
 	<script type="text/javascript" src="../../../vendor/jquery/jqueryV1/jquery-1.12.4.min.js"></script>
 	<script type="text/javascript" src="../../../vendor/christianbach/tablesorter/jquery.tablesorter.min.js"></script>
 	<script type="text/javascript" src="../../../vendor/components/jqueryui/jquery-ui.min.js"></script>

config/vilesci.config-default.inc.php

@@ -263,4 +263,7 @@ define('FAS_DOPPELTE_BUCHUNGSTYPEN_CHECK', serialize(
 
 // Spezialnoten die am Zeunigs und Diplomasupplement ignoriert werden
 define('ZEUGNISNOTE_NICHT_ANZEIGEN',serialize(array('iar', 'nz')));
+
+//Default Lehrmodus
+define ('DEFAULT_LEHRMODUS','regulaer');
 ?>

include/studienplan.class.php

@@ -952,21 +952,34 @@ class studienplan extends basis_db
 	/**
 	 * Laedt die Studienplaene zu denen eine Lehrveranstaltung zugeordnet ist
 	 */
-	public function getStudienplanLehrveranstaltung($lehrveranstaltung_id, $studiensemester_kurzbz)
+	public function getStudienplanLehrveranstaltung($lehrveranstaltung_id, $studiensemester_kurzbz = null)
 	{
 		$qry= "
 			SELECT
-			distinct tbl_studienplan.*
+				DISTINCT tbl_studienplan.*
 			FROM
-			lehre.tbl_studienplan
+				lehre.tbl_studienplan
-			JOIN lehre.tbl_studienplan_lehrveranstaltung USING(studienplan_id)
+				JOIN lehre.tbl_studienplan_lehrveranstaltung 
+					USING(studienplan_id)
 			WHERE
-			tbl_studienplan_lehrveranstaltung.lehrveranstaltung_id=".$this->db_add_param($lehrveranstaltung_id, FHC_INTEGER)."
+				tbl_studienplan_lehrveranstaltung.lehrveranstaltung_id IN (
-			AND EXISTS (
+					SELECT 
-			SELECT 1 FROM lehre.tbl_studienplan_semester
+						lv.lehrveranstaltung_id
-			WHERE studienplan_id=tbl_studienplan.studienplan_id
+					FROM
-			AND studiensemester_kurzbz=".$this->db_add_param($studiensemester_kurzbz)."
+						lehre.tbl_lehrveranstaltung AS lv
-			AND semester = tbl_studienplan_lehrveranstaltung.semester)
+						LEFT JOIN lehre.tbl_lehrveranstaltung AS t ON t.lehrveranstaltung_id=lv.lehrveranstaltung_template_id
+					WHERE
+						lv.lehrtyp_kurzbz<>'tpl'
+						AND (lv.lehrveranstaltung_id=" . $this->db_add_param($lehrveranstaltung_id, FHC_INTEGER) . " OR (lv.lehrveranstaltung_template_id=" . $this->db_add_param($lehrveranstaltung_id, FHC_INTEGER) . " AND t.lehrtyp_kurzbz='tpl'))
+					)
+				AND EXISTS (
+					SELECT 1 
+					FROM 
+						lehre.tbl_studienplan_semester
+					WHERE studienplan_id=tbl_studienplan.studienplan_id".
+						($studiensemester_kurzbz != null ? "
+						AND studiensemester_kurzbz=".$this->db_add_param($studiensemester_kurzbz) : "")."
+						AND semester = tbl_studienplan_lehrveranstaltung.semester)
 			ORDER BY bezeichnung";
 
 		if($result = $this->db_query($qry))

include/zeitaufzeichnung.class.php

@@ -940,7 +940,7 @@ or not exists
 		$tagessaldo = $tagessaldo - $pausesumme;
 
 		//check if blocking error
-		if (($tagessaldo > 19800 && $pausesumme < 1800) || ($tagessaldo > 18000 && $tagessaldo < 19800 && $pausesumme < $tagessaldo - 18000))
+		if (($tagessaldo >= 19800 && $pausesumme < 1800) || ($tagessaldo > 18000 && $tagessaldo < 19800 && $pausesumme < $tagessaldo - 18000))
 		{
 			$blockingError = true;
 		}

public/css/infocenter/infocenterDetails.css

@@ -104,3 +104,7 @@
         display: inline-block
     }
 }
+
+.gesperrtoption {
+    color: gray;
+}

system/phrasesupdate.php

@@ -8740,13 +8740,13 @@ Any unusual occurrences
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Der Plagiatscheck wurde durchgeführt und bestätigt, dass der zentrale Inhalt der Arbeit im erforderlichen Ausmaß eigenständig verfasst wurde (vgl. Satzungsteil Studienrechtliche Bestimmungen / Prüfungsordnung, § 18 Abs. 2 und 3).',
+				'text' => 'Der Plagiatscheck wurde durchgeführt und bestätigt, dass der zentrale Inhalt der Arbeit im erforderlichen Ausmaß eigenständig verfasst wurde (vgl. Satzungsteil Studienrechtliche Bestimmungen / Prüfungsordnung, § 20 Abs. 2 und 3).',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'The plagiarism check has been carried out and confirms that the central content of the paper has been written independently to the required extent (cf. part of the Statutes on Studies Act Provisions / Examination Regulations, § 18 Para. 2 and 3).',
+				'text' => 'The plagiarism check has been carried out and confirms that the central content of the paper has been written independently to the required extent (cf. part of the Statutes on Studies Act Provisions / Examination Regulations, § 20 Para. 2 and 3).',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -16426,13 +16426,13 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Wollen Sie die ausgewählte Maßnahme wirklich löschen?',
+				'text' => 'Plan ablehnen',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Do you really want to delete the measure?',
+				'text' => 'Reject plan',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -16446,13 +16446,13 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Wollen Sie die Bestätigung wirklich widerrufen?',
+				'text' => 'Bestätigung widerrufen',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Do you really want to cancel the confirmation?',
+				'text' => 'Revoke confirmation',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -16706,13 +16706,13 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Plan - abgelehnt',
+				'text' => 'Maßnahmen - abgelehnt',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Plan - declined',
+				'text' => 'Measures - declined',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -16758,6 +16758,206 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'international',
+		'category' => 'international',
+		'phrase' => 'bestaetigungAblehnen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bestätigung ablehnen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Reject confirmation',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'international',
+		'category' => 'international',
+		'phrase' => 'grund',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Grund',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Reason',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'international',
+		'category' => 'international',
+		'phrase' => 'anmerkungstgl',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Anmerkung - Studiengangsleitung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Note - Study course Director',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'international',
+		'category' => 'international',
+		'phrase' => 'mehrverplant',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => '>=5 ECTS verplant',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '>=5 ECTS planned',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'international',
+		'category' => 'international',
+		'phrase' => 'wenigerverplant',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => '<5 ECTS verplant',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '<5 ECTS planned',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'international',
+		'category' => 'international',
+		'phrase' => 'mehrbestaetigt',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => '>=5 ECTS bestätigt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '>=5 ECTS confirmed',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'international',
+		'category' => 'international',
+		'phrase' => 'wenigerbestaetigt',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => '<5 ECTS bestätigt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '<5 ECTS confirmed',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'international',
+		'category' => 'international',
+		'phrase' => 'alleAkzeptierenPlan',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Alle markierten Pläne akzeptieren',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Accept all marked plans',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'international',
+		'category' => 'international',
+		'phrase' => 'downloadBestaetigung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bestätigung herunterladen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Download confirmation',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'international',
+		'category' => 'international',
+		'phrase' => 'addMassnahme',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Maßnahme hinzufügen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Add measure',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'gruppenmanagement',

vilesci/lehre/lehrveranstaltung_details.php

@@ -29,6 +29,7 @@
 	require_once('../../include/lehrtyp.class.php');
 	require_once('../../include/lehrmodus.class.php');
 	require_once('../../include/benutzerberechtigung.class.php');
+	require_once('../../include/studienplan.class.php');
 
 	if (!$db = new basis_db())
 		die('Es konnte keine Verbindung zum Server aufgebaut werden.');
@@ -292,8 +293,9 @@
 			<td></td>
 			<td></td>
 			<td></td>
-			<td>Lehrmodus*</td>
+			<td>Lehrmodus*</td>';
-			<td><select name="lehrmodus_kurzbz"><option value="">-- keine Auswahl --</option>';
+
+		$htmlstr .= '<td><select name="lehrmodus_kurzbz"><option value="">-- keine Auswahl --</option>';
 
 		$lehrmodus_arr = new lehrmodus();
 		$lehrmodus_arr->getAll();
@@ -302,6 +304,8 @@
 		{
 			if ($lehrmodus->lehrmodus_kurzbz == $lv->lehrmodus_kurzbz)
 				$sel = ' selected';
+			else if (isset($_GET['neu']) && defined('DEFAULT_LEHRMODUS') && ($lehrmodus->lehrmodus_kurzbz == DEFAULT_LEHRMODUS) && ($lv->lehrmodus_kurzbz == ''))
+				$sel = ' selected';
 			else
 				$sel = '';
 			$htmlstr .= '<option value="'.$lehrmodus->lehrmodus_kurzbz.'" '.$sel.'>'.$lehrmodus->bezeichnung_mehrsprachig[$sprache].'</option>';
@@ -508,19 +512,10 @@
 			}
 
 			$htmlstr.='<br><b>Verwendung in folgenden Studienplänen</b>: ';
-			$qry ="SELECT distinct tbl_studienplan.bezeichnung
+			$stdplan = new studienplan();
-					FROM
+			if ($stdplan->getStudienplanLehrveranstaltung($lv->lehrveranstaltung_id))
-						lehre.tbl_studienplan_lehrveranstaltung
+			foreach($stdplan->result as $result)
-						JOIN lehre.tbl_studienplan USING(studienplan_id)
+				$htmlstr .= $result->bezeichnung . "; ";
-					WHERE lehrveranstaltung_id=".$db->db_add_param($lv->lehrveranstaltung_id).'
-					ORDER BY tbl_studienplan.bezeichnung desc';
-			if($result = $db->db_query($qry))
-			{
-				while($row = $db->db_fetch_object($result))
-				{
-					$htmlstr.= $row->bezeichnung.'; ';
-				}
-			}
 
 			$htmlstr.='</span>';
 			// Details Ende

vilesci/stammdaten/variablen_details.php

@@ -117,7 +117,7 @@ if(isset($_POST["schick"]))
 		$variable=new variable();
 		
 		if($variable->load($uid, $name))
-			$varialbe->new = false;
+			$variable->new = false;
 		else 
 			$variable->new = true;