testversuch ueber config

abfrage gefixed
menu wird nicht mehr angezeigt

cis/testtool/externeueberwachung.js

@@ -29,7 +29,8 @@
 		if (!proctoringOK)
 		{
 			console.warn("Constructor nicht aktiv!")
-			//window.location.href='resetconnection.php';
+			//TODO einkommentieren
+			//top.location.href='resetconnection.php';
 		}
 	}, 1000);
 })();

cis/testtool/menu.php

@@ -61,8 +61,12 @@ $p = new phrasen($sprache_user);
 <?php
 $gebiet_hasMathML = false; // true, wenn irgendein Gebiet eine/n Frage/Vorschlag im MathML-Format enthält
 $invalid_gebiete = false;
-
-if (isset($_SESSION['pruefling_id']))
+if ((isset($_SESSION['externe_ueberwachung']) && $_SESSION['externe_ueberwachung'] === true) &&
+	isset($_SESSION['externe_ueberwachung_verified']) && $_SESSION['externe_ueberwachung_verified'] === false)
+{
+	exit;
+}
+else if (isset($_SESSION['pruefling_id']))
 {
 	//content_id fuer Einfuehrung auslesen
 	$qry = "SELECT content_id FROM testtool.tbl_ablauf_vorgaben WHERE studiengang_kz=".$db->db_add_param($_SESSION['studiengang_kz'])." LIMIT 1";

cis/testtool/resetconnection.php

@@ -14,12 +14,6 @@ if (isset($_SESSION['externe_ueberwachung']) && $_SESSION['externe_ueberwachung'
 	$ueberwachung = new externeUeberwachung();
 	$url = $ueberwachung->start($_SESSION['prestudent_id'], $_SESSION['reihungstestID']);
 	$urlSafe = htmlspecialchars($url, ENT_QUOTES);
-
-
-	//var_dump($urlSafe);
-
 	header("Location: $urlSafe");
-	//echo "<script>window.open('{$urlSafe}');</script>";
 	$_SESSION['externe_ueberwachung_verified'] = true;
-
 }

config/cis.config-default.inc.php

@@ -307,5 +307,6 @@ define('EXTERNE_UEBERWACHUNG_PROTOCOL_URL', 'https://example.com');
 define('EXTERNE_UEBERWACHUNG_SECRET_KEY', null);
 define('EXTERNE_UEBERWACHUNG_INTEGRATION_NAME', 'example');
 define('EXTERNE_UEBERWACHUNG_SESSION_URL', 'https://example.com');
+define('EXTERNE_UEBERWACHUNG_TRIAL_TEST', false);
 
 ?>

include/externe_ueberwachung.class.php

@@ -79,6 +79,7 @@ class externeUeberwachung extends basis_db
 
 		$qry = "SELECT session_id
 				FROM testtool.tbl_externe_ueberwachung
+				WHERE prestudent_id = ".$this->db_add_param($prestudent_id, FHC_INTEGER) . "
 				ORDER BY insertamum DESC
 				LIMIT 1";
 
@@ -157,7 +158,7 @@ class externeUeberwachung extends basis_db
 			"allowMakingRoomScanSecondCamera" => false,
 			"duration"=> 120,
 			"schedule"=> false,
-			"trial"=> true,
+			"trial"=> EXTERNE_UEBERWACHUNG_TRIAL_TEST,
 			"proctoring"=> "offline",
 			"identification"=> "skip",
 			"startDate"=> "2018-03-27T00:00:00Z", //TODO anpassen