mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-07-05 21:09:28 +00:00
Merge branch 'feature-3866-2/Ueberarbeitung_Testtoolsprache_fix'
This commit is contained in:
Andreas Österreicher
+18
-49
@@ -42,51 +42,20 @@ if (!$db = new basis_db())
|
||||
|
||||
$PHP_SELF=$_SERVER["PHP_SELF"];
|
||||
|
||||
function getSpracheUser()
|
||||
{
|
||||
if(isset($_SESSION['sprache_user']))
|
||||
{
|
||||
$sprache_user=$_SESSION['sprache_user'];
|
||||
}
|
||||
else
|
||||
{
|
||||
if(isset($_COOKIE['sprache_user']))
|
||||
{
|
||||
$sprache_user=$_COOKIE['sprache_user'];
|
||||
}
|
||||
else
|
||||
{
|
||||
$sprache_user=DEFAULT_LANGUAGE;
|
||||
}
|
||||
setSpracheUser($sprache_user);
|
||||
}
|
||||
return $sprache_user;
|
||||
}
|
||||
|
||||
function setSpracheUser($sprache)
|
||||
{
|
||||
$_SESSION['sprache_user']=$sprache;
|
||||
setcookie('sprache_user',$sprache,time()+60*60*24*30,'/');
|
||||
}
|
||||
|
||||
if(isset($_GET['sprache_user']))
|
||||
{
|
||||
$sprache_user = new sprache();
|
||||
if($sprache_user->load($_GET['sprache_user']))
|
||||
{
|
||||
setSpracheUser($_GET['sprache_user']);
|
||||
}
|
||||
else
|
||||
setSpracheUser(DEFAULT_LANGUAGE);
|
||||
}
|
||||
|
||||
$sprache_user = getSpracheUser();
|
||||
$p = new phrasen($sprache_user);
|
||||
|
||||
$sprache = getSprache();
|
||||
|
||||
// Start session
|
||||
session_start();
|
||||
|
||||
// If language is changed by language select menu, reset language variables
|
||||
if (isset($_GET['sprache_user']) && !empty($_GET['sprache_user']))
|
||||
{
|
||||
$_SESSION['sprache_user'] = $_GET['sprache_user'];
|
||||
$sprache_user = $_GET['sprache_user'];
|
||||
}
|
||||
|
||||
// Set language variable, which impacts the question language
|
||||
$sprache_user = (isset($_SESSION['sprache_user']) && !empty($_SESSION['sprache_user'])) ? $_SESSION['sprache_user'] : DEFAULT_LANGUAGE;
|
||||
$p = new phrasen($sprache_user);
|
||||
|
||||
if(isset($_GET['gebiet_id']))
|
||||
$gebiet_id = $_GET['gebiet_id'];
|
||||
else
|
||||
@@ -489,7 +458,7 @@ else
|
||||
if($frage->frage_id!='')
|
||||
{
|
||||
$frage_id = $frage->frage_id;
|
||||
$frage->getFrageSprache($frage_id, $_SESSION['sprache']);
|
||||
$frage->getFrageSprache($frage_id, $_SESSION['sprache_user']);
|
||||
|
||||
if(!$demo)
|
||||
{
|
||||
@@ -574,7 +543,7 @@ if($frage->frage_id!='')
|
||||
{
|
||||
echo '
|
||||
<div class="row text-center">
|
||||
<img class="testtoolfrage" src="bild.php?src=frage&frage_id='. $frage->frage_id.'&sprache='. $_SESSION["sprache"].'"></img><br/><br/><br/>
|
||||
<img class="testtoolfrage" src="bild.php?src=frage&frage_id='. $frage->frage_id.'&sprache='. $_SESSION["sprache_user"].'"></img><br/><br/><br/>
|
||||
</div>
|
||||
';
|
||||
}
|
||||
@@ -585,7 +554,7 @@ if($frage->frage_id!='')
|
||||
{
|
||||
echo '
|
||||
<div class="row text-center">
|
||||
<audio src="sound.php?src=frage&frage_id='.$frage->frage_id.'&sprache='.$_SESSION['sprache'].'&'.$timestamp.'" controls="controls" type="audio/ogg">
|
||||
<audio src="sound.php?src=frage&frage_id='.$frage->frage_id.'&sprache='.$_SESSION['sprache_user'].'&'.$timestamp.'" controls="controls" type="audio/ogg">
|
||||
<div>
|
||||
<p>Ihr Browser unterstützt dieses Audioelement leider nicht.</p>
|
||||
</div>
|
||||
@@ -605,7 +574,7 @@ if($frage->frage_id!='')
|
||||
|
||||
//Vorschlaege laden
|
||||
$vs = new vorschlag();
|
||||
$vs->getVorschlag($frage->frage_id, $_SESSION['sprache'], $gebiet->zufallvorschlag);
|
||||
$vs->getVorschlag($frage->frage_id, $_SESSION['sprache_user'], $gebiet->zufallvorschlag);
|
||||
$letzte = $frage->getNextFrage($gebiet_id, $_SESSION['pruefling_id'], $frage_id, $demo);
|
||||
echo "<form action=\"$PHP_SELF?gebiet_id=$gebiet_id&frage_id=$frage->frage_id\" method=\"POST\" ".(!$letzte && !$levelgebiet?"onsubmit=\"letzteFrage()\"":"").">";
|
||||
echo '
|
||||
@@ -649,10 +618,10 @@ if($frage->frage_id!='')
|
||||
|
||||
echo '<br/>';
|
||||
if($vorschlag->bild!='')
|
||||
echo "<img class='testtoolvorschlag' src='bild.php?src=vorschlag&vorschlag_id=$vorschlag->vorschlag_id&sprache=".$_SESSION['sprache']."' /><br/>";
|
||||
echo "<img class='testtoolvorschlag' src='bild.php?src=vorschlag&vorschlag_id=$vorschlag->vorschlag_id&sprache=".$_SESSION['sprache_user']."' /><br/>";
|
||||
if($vorschlag->audio!='')
|
||||
{
|
||||
echo ' <audio src="sound.php?src=vorschlag&vorschlag_id='.$vorschlag->vorschlag_id.'&sprache='.$_SESSION['sprache'].'" controls="controls">
|
||||
echo ' <audio src="sound.php?src=vorschlag&vorschlag_id='.$vorschlag->vorschlag_id.'&sprache='.$_SESSION['sprache_user'].'" controls="controls">
|
||||
<div>
|
||||
<p>Ihr Browser unterstützt dieses Audioelement leider nicht.</p>
|
||||
</div>
|
||||
|
||||
@@ -19,6 +19,7 @@
|
||||
* Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at> ,
|
||||
* Rudolf Hangl <rudolf.hangl@technikum-wien.at>,
|
||||
* Manfred Kindl <manfred.kindl@technikum-wien.at>
|
||||
* Cristina Hainberger <hainberg@technikum-wien.at>
|
||||
*/
|
||||
|
||||
require_once('../../config/cis.config.inc.php');
|
||||
@@ -29,45 +30,18 @@ require_once '../../include/phrasen.class.php';
|
||||
if (!$db = new basis_db())
|
||||
die('Fehler beim Oeffnen der Datenbankverbindung');
|
||||
|
||||
function getSpracheUser()
|
||||
// Start session
|
||||
session_start();
|
||||
|
||||
// If language is changed by language select menu, reset language variables
|
||||
if (isset($_GET['sprache_user']) && !empty($_GET['sprache_user']))
|
||||
{
|
||||
if(isset($_SESSION['sprache_user']))
|
||||
{
|
||||
$sprache_user=$_SESSION['sprache_user'];
|
||||
}
|
||||
else
|
||||
{
|
||||
if(isset($_COOKIE['sprache_user']))
|
||||
{
|
||||
$sprache_user=$_COOKIE['sprache_user'];
|
||||
}
|
||||
else
|
||||
{
|
||||
$sprache_user=DEFAULT_LANGUAGE;
|
||||
}
|
||||
setSpracheUser($sprache_user);
|
||||
}
|
||||
return $sprache_user;
|
||||
$_SESSION['sprache_user'] = $_GET['sprache_user'];
|
||||
$sprache_user = $_GET['sprache_user'];
|
||||
}
|
||||
|
||||
function setSpracheUser($sprache)
|
||||
{
|
||||
$_SESSION['sprache_user']=$sprache;
|
||||
setcookie('sprache_user',$sprache,time()+60*60*24*30,'/');
|
||||
}
|
||||
|
||||
if(isset($_GET['sprache_user']))
|
||||
{
|
||||
$sprache_user = new sprache();
|
||||
if($sprache_user->load($_GET['sprache_user']))
|
||||
{
|
||||
setSpracheUser($_GET['sprache_user']);
|
||||
}
|
||||
else
|
||||
setSpracheUser(DEFAULT_LANGUAGE);
|
||||
}
|
||||
|
||||
$sprache_user = getSpracheUser();
|
||||
// Set language variable
|
||||
$sprache_user = (isset($_SESSION['sprache_user']) && !empty($_SESSION['sprache_user'])) ? $_SESSION['sprache_user'] : DEFAULT_LANGUAGE;
|
||||
$p = new phrasen($sprache_user);
|
||||
|
||||
?>
|
||||
|
||||
+116
-134
@@ -38,69 +38,37 @@ require_once '../../include/datum.class.php';
|
||||
if (!$db = new basis_db())
|
||||
die('Fehler beim Oeffnen der Datenbankverbindung');
|
||||
|
||||
//if(isset($_GET['lang']))
|
||||
// setSprache($_GET['lang']);
|
||||
// Start session
|
||||
session_start();
|
||||
|
||||
$date = new datum();
|
||||
|
||||
function getSpracheUser()
|
||||
// Logout (triggered by logout button in menu.php)
|
||||
if (isset($_GET['logout']) && $_GET['logout'] == true)
|
||||
{
|
||||
if(isset($_SESSION['sprache_user']))
|
||||
{
|
||||
$sprache_user=$_SESSION['sprache_user'];
|
||||
}
|
||||
else
|
||||
{
|
||||
if(isset($_COOKIE['sprache_user']))
|
||||
{
|
||||
$sprache_user=$_COOKIE['sprache_user'];
|
||||
}
|
||||
else
|
||||
{
|
||||
$sprache_user=DEFAULT_LANGUAGE;
|
||||
}
|
||||
setSpracheUser($sprache_user);
|
||||
}
|
||||
return $sprache_user;
|
||||
}
|
||||
// Unset global vars
|
||||
unset($_GET['logout']);
|
||||
unset($_GET['sprache_user']);
|
||||
$_POST = [];
|
||||
$_SESSION = [];
|
||||
|
||||
function setSpracheUser($sprache)
|
||||
{
|
||||
$_SESSION['sprache_user']=$sprache;
|
||||
setcookie('sprache_user',$sprache,time()+60*60*24*30,'/');
|
||||
}
|
||||
// Destroy session
|
||||
session_destroy();
|
||||
|
||||
if(isset($_GET['sprache_user']))
|
||||
{
|
||||
$sprache_user = new sprache();
|
||||
if($sprache_user->load($_GET['sprache_user']))
|
||||
{
|
||||
setSpracheUser($_GET['sprache_user']);
|
||||
}
|
||||
else
|
||||
setSpracheUser(DEFAULT_LANGUAGE);
|
||||
echo '
|
||||
<script language="Javascript">
|
||||
location = location.pathname; // clean the login.php-url from querystring
|
||||
parent.menu.location = parent.menu.location.pathname; // clean the menu.php-url from querystring
|
||||
parent.topbar.location = parent.topbar.location.pathname; // clean the topbar.php-url from querystring
|
||||
</script>
|
||||
';
|
||||
}
|
||||
|
||||
$sprache_user = getSpracheUser();
|
||||
$p = new phrasen($sprache_user);
|
||||
|
||||
$gebdatum='';
|
||||
$date = new datum();
|
||||
|
||||
session_start();
|
||||
$reload=false;
|
||||
$reload_parent=false;
|
||||
$reload_menu=false;
|
||||
|
||||
$sg_var = new studiengang();
|
||||
|
||||
if (isset($_GET['logout']))
|
||||
{
|
||||
if(isset($_SESSION['prestudent_id']))
|
||||
{
|
||||
$reload = true;
|
||||
session_destroy();
|
||||
}
|
||||
}
|
||||
|
||||
if(isset($_POST['gebdatum']) && $_POST['gebdatum']!='')
|
||||
{
|
||||
$gebdatum = $date->formatDatum($_POST['gebdatum'],'Y-m-d');
|
||||
@@ -178,7 +146,6 @@ if (isset($_POST['prestudent']) && isset($gebdatum))
|
||||
$_SESSION['vorname']=$ps->vorname;
|
||||
$_SESSION['gebdatum']=$ps->gebdatum;
|
||||
$stg_obj = new studiengang($studiengang);
|
||||
$_SESSION['sprache']=$stg_obj->sprache;
|
||||
|
||||
$_SESSION['semester']=$semester;
|
||||
$stg_obj->getStudiengangTyp($stg_obj->typ);
|
||||
@@ -215,7 +182,6 @@ if (isset($_POST['prestudent']) && isset($gebdatum))
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
// Sprachvorgaben zu STG mit höchster Prio ermitteln
|
||||
|
||||
// * 1. Sprache über Ablauf Vorgaben ermitteln
|
||||
@@ -246,11 +212,11 @@ if (isset($_POST['prestudent']) && isset($gebdatum))
|
||||
// * 4. Sprache setzen. Falls keine Sprache vorhanden -> DEFAULT language verwenden
|
||||
if (empty($rt_sprache))
|
||||
{
|
||||
$_SESSION['sprache'] = DEFAULT_LANGUAGE;
|
||||
$_SESSION['sprache_user'] = DEFAULT_LANGUAGE;
|
||||
}
|
||||
else
|
||||
{
|
||||
$_SESSION['sprache'] = $rt_sprache;
|
||||
$_SESSION['sprache_user'] = $rt_sprache;
|
||||
}
|
||||
}
|
||||
else
|
||||
@@ -269,8 +235,38 @@ if (isset($_POST['prestudent']) && isset($gebdatum))
|
||||
}
|
||||
}
|
||||
|
||||
// Set language of user.
|
||||
// NOTE: don't move the code in order to check first the right studies' reihungstest language
|
||||
// (in case it was overruled by other STG with higher priority)
|
||||
|
||||
// Start with default language on first login (before any prestudent has been selected)
|
||||
$sprache_user = DEFAULT_LANGUAGE;
|
||||
if (isset($_SESSION['sprache_user']) && !empty($_SESSION['sprache_user']))
|
||||
{
|
||||
// If session var already exists, overwrite language var
|
||||
// (session var changes e.g. when user selects other language with language-select-menu)
|
||||
$sprache_user = $_SESSION['sprache_user'];
|
||||
}
|
||||
elseif (isset($_SESSION['prestudent_id']))
|
||||
{
|
||||
// If session var does not exist but prestudent is known, set the session var
|
||||
$_SESSION['sprache_user'] = DEFAULT_LANGUAGE;
|
||||
}
|
||||
|
||||
// If language is changed by language select menu, reset language variables
|
||||
if(isset($_GET['sprache_user']) && !empty($_GET['sprache_user']))
|
||||
{
|
||||
$sprache_user = $_GET['sprache_user'];
|
||||
$_SESSION['sprache_user'] = $_GET['sprache_user'];
|
||||
}
|
||||
|
||||
// NOTE: leave phrasen here, as the final users language is not defined until here
|
||||
$p = new phrasen($sprache_user);
|
||||
|
||||
if (isset($_SESSION['prestudent_id']))
|
||||
$prestudent_id=$_SESSION['prestudent_id'];
|
||||
{
|
||||
$prestudent_id=$_SESSION['prestudent_id'];
|
||||
}
|
||||
else
|
||||
{
|
||||
//$prestudent_id=null;
|
||||
@@ -279,10 +275,6 @@ else
|
||||
$ps->getPrestudentRT($datum);
|
||||
}
|
||||
|
||||
if(isset($_GET['type']) && $_GET['type']=='sprachechange' && isset($_GET['sprache']))
|
||||
{
|
||||
setSprache($_GET['sprache']);
|
||||
}
|
||||
|
||||
if(isset($_SESSION['prestudent_id']) && !isset($_SESSION['pruefling_id']))
|
||||
{
|
||||
@@ -303,7 +295,7 @@ if(isset($_SESSION['prestudent_id']) && !isset($_SESSION['pruefling_id']))
|
||||
if($pruefling->save())
|
||||
{
|
||||
$_SESSION['pruefling_id']=$pruefling->pruefling_id;
|
||||
$reload_parent=true;
|
||||
$reload_menu=true;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -327,7 +319,7 @@ if(isset($_POST['save']) && isset($_SESSION['prestudent_id']))
|
||||
{
|
||||
$_SESSION['pruefling_id']=$pruefling->pruefling_id;
|
||||
$_SESSION['semester']=$pruefling->semester;
|
||||
$reload_parent=true;
|
||||
$reload_menu=true;
|
||||
}
|
||||
}
|
||||
?><!DOCTYPE HTML>
|
||||
@@ -371,24 +363,19 @@ if(isset($_POST['save']) && isset($_SESSION['prestudent_id']))
|
||||
});
|
||||
</script>
|
||||
<?php
|
||||
if($reload_parent)
|
||||
if($reload_menu)
|
||||
echo '<script language="Javascript">parent.menu.location.reload();</script>';
|
||||
|
||||
if($reload)
|
||||
echo "<script language=\"Javascript\">parent.location.reload();</script>";
|
||||
?>
|
||||
</head>
|
||||
|
||||
<body scroll="no">
|
||||
<div class="row">
|
||||
<div class="col-xs-10 col-sm-9 col-lg-6">
|
||||
|
||||
<?php
|
||||
|
||||
//REIHUNGSTEST STARTSEITE (nach Login)
|
||||
if (isset($prestudent_id))
|
||||
{
|
||||
|
||||
$prestudent = new prestudent($prestudent_id);
|
||||
$stg_obj = new studiengang($prestudent->studiengang_kz);
|
||||
$pruefling = new pruefling();
|
||||
@@ -399,7 +386,7 @@ if (isset($prestudent_id))
|
||||
$ps = new Prestudent();
|
||||
|
||||
// * prinzipiell STG der session übernehmem
|
||||
$firstPrio_studiengang_kz = $prestudent->studiengang_kz;;
|
||||
$firstPrio_studiengang_kz = $prestudent->studiengang_kz;
|
||||
|
||||
// * wenn STG des eingeloggten Prestudenten vom Typ Bachelor ist, dann höchste Prio aller
|
||||
// Bachelor-STG ermitteln, an denen die Person noch interessiert ist
|
||||
@@ -424,7 +411,18 @@ if (isset($prestudent_id))
|
||||
$sprachwahl = $ablauf->result[0]->sprachwahl;
|
||||
}
|
||||
|
||||
// If language can be switched, display language select menu on the top
|
||||
if ($sprachwahl)
|
||||
{
|
||||
$_SESSION['sprache_auswahl'] = true;
|
||||
?>
|
||||
<script type="text/javascript">
|
||||
parent.topbar.location.reload();
|
||||
</script>
|
||||
<?php
|
||||
}
|
||||
//Prestudent Informationen
|
||||
echo '<div class="col-xs-10 col-sm-9 col-lg-6">';
|
||||
echo '
|
||||
<h1 style="margin-top: -20px;">'. $p->t('testtool/begruessungstext'). '</h1><br/>
|
||||
<p>'. $p->t('testtool/anmeldedaten'). '</p><br/>
|
||||
@@ -538,53 +536,6 @@ if (isset($prestudent_id))
|
||||
//echo '<tr><td></td><td><input type="submit" name="save" value="Semester ändern"></td>';
|
||||
echo '</table>';
|
||||
echo '</FORM>';
|
||||
|
||||
//Wenn die Sprachwahl fuer den priorisierten Studiengang aktiviert ist, dann die Sprachen anzeigen
|
||||
if($sprachwahl==true)
|
||||
{
|
||||
//Liste der Sprachen, die in den Gebieten vorkommen koennen
|
||||
$qry = "SELECT distinct sprache
|
||||
FROM
|
||||
testtool.tbl_pruefling
|
||||
JOIN testtool.tbl_ablauf USING(studiengang_kz)
|
||||
JOIN testtool.tbl_frage USING(gebiet_id)
|
||||
JOIN testtool.tbl_frage_sprache USING(frage_id)
|
||||
WHERE
|
||||
tbl_pruefling.pruefling_id=".$db->db_add_param($pruefling->pruefling_id)."
|
||||
ORDER BY sprache DESC";
|
||||
|
||||
if($result = $db->db_query($qry))
|
||||
{
|
||||
echo '
|
||||
<p>'. $p->t('testtool/spracheDerTestfragen').':</p><br>
|
||||
<div class="btn-group btn-group-justified" role="group">
|
||||
';
|
||||
|
||||
while($row = $db->db_fetch_object($result))
|
||||
{
|
||||
$selected = ($_SESSION['sprache'] == $row->sprache) ? 'active' : '';
|
||||
$row_sprache = $row->sprache;
|
||||
if ($sprache_user == 'German')
|
||||
{
|
||||
if($row->sprache == 'English')
|
||||
{
|
||||
$row_sprache = 'Englisch';
|
||||
}
|
||||
elseif ($row->sprache == 'German')
|
||||
{
|
||||
$row_sprache = 'Deutsch';
|
||||
}
|
||||
}
|
||||
echo "
|
||||
<div class='btn-group' role='group'>
|
||||
<a role='button' class='btn btn-default $selected' href='". $_SERVER['PHP_SELF']. "?type=sprachechange&sprache=". $row->sprache. "'>$row_sprache</a>
|
||||
</div>
|
||||
";
|
||||
}
|
||||
echo '</div>';
|
||||
}
|
||||
}
|
||||
|
||||
echo '<br><br>';
|
||||
echo '
|
||||
<div class="well well-lg text-center">
|
||||
@@ -594,22 +545,45 @@ if (isset($prestudent_id))
|
||||
if($pruefling->pruefling_id!='')
|
||||
{
|
||||
$_SESSION['pruefling_id']=$pruefling->pruefling_id;
|
||||
//echo '<script language="Javascript">parent.menu.location.reload()</script>';
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
echo '<span class="error">'.$p->t('testtool/keinPrueflingseintragVorhanden').'</span>';
|
||||
}
|
||||
echo ' </div><!--/.col-->';
|
||||
}
|
||||
else
|
||||
else // LOGIN Site (vor Login)
|
||||
{
|
||||
//LOGIN FORM (Startseite vor Login)
|
||||
$prestudent_id_dummy_student = (defined('PRESTUDENT_ID_DUMMY_STUDENT')?PRESTUDENT_ID_DUMMY_STUDENT:'');
|
||||
echo '<div class="col-xs-11">';
|
||||
|
||||
echo '<form method="post">
|
||||
<SELECT name="prestudent">';
|
||||
echo '<OPTION value="'.$prestudent_id_dummy_student.'">'.$p->t('testtool/nameAuswaehlen').'</OPTION>\n';
|
||||
// Welcome text
|
||||
echo '
|
||||
<div class="row" style="margin-bottom: 10%; margin-top: 3%;">
|
||||
<div class="col-xs-6 text-center" style="border-right: 1px solid lightgrey;">
|
||||
<h1 style="white-space: normal">Herzlich Willkommen zum Reihungstest</h1><br><br>
|
||||
Bitte warten Sie mit dem Login auf die Anweisung der Aufsichtsperson.<br><br>
|
||||
Wir wünschen Ihnen einen erfolgreichen Start ins Studium.
|
||||
</div>
|
||||
<div class="col-xs-6 text-center">
|
||||
<h1 style="white-space: normal">Welcome to the placement test</h1> <br><br>
|
||||
Please wait for the tutor\'s instructions before you log in.<br><br>
|
||||
We wish you a good start to your studies.
|
||||
</div>
|
||||
</div>
|
||||
';
|
||||
|
||||
// Begin form
|
||||
echo '<div class="row text-center">';
|
||||
echo '<form method="post" class="form-inline">';
|
||||
|
||||
// Name select menu
|
||||
echo '<div class="form-group">';
|
||||
echo '<label for="select-prestudent" class="col-sm-2 control-label">Name</label>';
|
||||
echo '<div class="col-sm-10">';
|
||||
echo '<SELECT name="prestudent" id="select-prestudent" class="form-control">';
|
||||
echo '<OPTION value="'.$prestudent_id_dummy_student.'">Bitte wählen / Please select...</OPTION>\n';
|
||||
foreach($ps->result as $prestd)
|
||||
{
|
||||
$stg = new studiengang();
|
||||
@@ -618,7 +592,8 @@ else
|
||||
$selected = 'selected';
|
||||
else
|
||||
$selected='';
|
||||
echo '<OPTION value="'.$prestd->prestudent_id.'" '.$selected.'>'.$prestd->nachname.' '.$prestd->vorname.' ('.(strtoupper($stg->typ.$stg->kurzbz)).')</OPTION>\n';
|
||||
echo '
|
||||
<OPTION value="'.$prestd->prestudent_id.'" '.$selected.'>'.$prestd->nachname.' '.$prestd->vorname.' ('.(strtoupper($stg->typ.$stg->kurzbz)).')</OPTION>\n';
|
||||
}
|
||||
// An der FHTW gibt es 3 Testuser für den Camus International
|
||||
if (CAMPUS_NAME == 'FH Technikum Wien')
|
||||
@@ -628,19 +603,26 @@ else
|
||||
echo '<OPTION value="30889">Testuser Campus International 03</OPTION>\n';
|
||||
}
|
||||
echo '</SELECT>';
|
||||
echo ' '.$p->t('global/geburtsdatum').': ';
|
||||
echo '<input type="text" id="datepicker" size="12" name="gebdatum" value="'.$date->formatDatum($gebdatum,'d.m.Y').'">';
|
||||
echo '<INPUT type="submit" value="'.$p->t('testtool/login').'" />';
|
||||
echo '</form>';
|
||||
echo '</div>'; // end col-xs
|
||||
echo '</div>'; // end form-group
|
||||
|
||||
echo '<br /><br /><br />
|
||||
<center>
|
||||
<span style="font-size: 1.2em; font-style: italic;">'.$p->t('testtool/willkommenstextTitel').'</span><br><br>
|
||||
<span style="font-size: 1.2em; font-style: italic;">'.$p->t('testtool/willkommenstext').'</span>
|
||||
</center>';
|
||||
// Datepicker input
|
||||
echo '<div class="form-group"> ';
|
||||
echo '<label for="datepicker" class="col-sm-offset-1 col-sm-4 control-label">Geburtsdatum | Date of Birth</label>';
|
||||
echo '<div class="col-sm-3">';
|
||||
echo '<input type="text" id="datepicker" class="form-control" name="gebdatum" value="'.$date->formatDatum($gebdatum,'d.m.Y').'">';
|
||||
echo '</div>'; // end col-xs
|
||||
echo '</div>'; // end form-group
|
||||
|
||||
// Login button
|
||||
echo '<button type="submit" class="btn btn-default" value="'.$p->t('testtool/login').'" />'.$p->t('testtool/login').'</button>';
|
||||
|
||||
echo '</form>'; // end form
|
||||
|
||||
echo '</div>'; // end row
|
||||
echo '</div>'; // end col-xs-11
|
||||
}
|
||||
?>
|
||||
</div><!--/.col-->
|
||||
</div><!--/.row-->
|
||||
</body>
|
||||
</html>
|
||||
|
||||
+19
-48
@@ -19,6 +19,7 @@
|
||||
* Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at>,
|
||||
* Rudolf Hangl <rudolf.hangl@technikum-wien.at>,
|
||||
* Manfred Kindl <manfred.kindl@technikum-wien.at>
|
||||
* Cristina Hainberger <hainberg@technikum-wien.at>
|
||||
*/
|
||||
|
||||
require_once('../../config/cis.config.inc.php');
|
||||
@@ -27,56 +28,25 @@ require_once('../../include/basis_db.class.php');
|
||||
require_once('../../include/sprache.class.php');
|
||||
require_once '../../include/phrasen.class.php';
|
||||
require_once '../../include/studiengang.class.php';
|
||||
require_once('../../include/gebiet.class.php');
|
||||
|
||||
if (!$db = new basis_db())
|
||||
die('Fehler beim Oeffnen der Datenbankverbindung');
|
||||
|
||||
require_once('../../include/gebiet.class.php');
|
||||
|
||||
function getSpracheUser()
|
||||
{
|
||||
if(isset($_SESSION['sprache_user']))
|
||||
{
|
||||
$sprache_user=$_SESSION['sprache_user'];
|
||||
}
|
||||
else
|
||||
{
|
||||
if(isset($_COOKIE['sprache_user']))
|
||||
{
|
||||
$sprache_user=$_COOKIE['sprache_user'];
|
||||
}
|
||||
else
|
||||
{
|
||||
$sprache_user=DEFAULT_LANGUAGE;
|
||||
}
|
||||
setSpracheUser($sprache_user);
|
||||
}
|
||||
return $sprache_user;
|
||||
}
|
||||
|
||||
function setSpracheUser($sprache)
|
||||
{
|
||||
$_SESSION['sprache_user']=$sprache;
|
||||
setcookie('sprache_user',$sprache,time()+60*60*24*30,'/');
|
||||
}
|
||||
|
||||
if(isset($_GET['sprache_user']))
|
||||
{
|
||||
$sprache_user = new sprache();
|
||||
if($sprache_user->load($_GET['sprache_user']))
|
||||
{
|
||||
setSpracheUser($_GET['sprache_user']);
|
||||
}
|
||||
else
|
||||
setSpracheUser(DEFAULT_LANGUAGE);
|
||||
}
|
||||
|
||||
$sprache_user = getSpracheUser();
|
||||
$p = new phrasen($sprache_user);
|
||||
$sprache = getSprache();
|
||||
|
||||
// Start session
|
||||
session_start();
|
||||
|
||||
// If language is changed by language select menu, reset language and session variables
|
||||
if(isset($_GET['sprache_user']) && !empty($_GET['sprache_user']))
|
||||
{
|
||||
$sprache_user = $_GET['sprache_user'];
|
||||
$_SESSION['sprache_user'] = $_GET['sprache_user'];
|
||||
}
|
||||
|
||||
// Set language variable, which impacts the navigation menu
|
||||
$sprache_user = (isset($_SESSION['sprache_user']) && !empty($_SESSION['sprache_user'])) ? $_SESSION['sprache_user'] : DEFAULT_LANGUAGE;
|
||||
$p = new phrasen($sprache_user);
|
||||
|
||||
?><!DOCTYPE HTML>
|
||||
<html>
|
||||
<head>
|
||||
@@ -89,6 +59,9 @@ session_start();
|
||||
|
||||
<body scroll="no">
|
||||
<?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']))
|
||||
{
|
||||
//content_id fuer Einfuehrung auslesen
|
||||
@@ -110,7 +83,7 @@ if (isset($_SESSION['pruefling_id']))
|
||||
{
|
||||
echo '
|
||||
<tr id="tr-einleitung"><td class="ItemTesttool" style="margin-left: 20px;" nowrap>
|
||||
<a class="ItemTesttool navButton" href="../../cms/content.php?content_id='.$content_id->content_id.'&sprache='.$sprache.'" target="content">'.$p->t('testtool/einleitung').'</a>
|
||||
<a class="ItemTesttool navButton" href="../../cms/content.php?content_id='.$content_id->content_id.'&sprache='.$sprache_user.'" target="content">'.$p->t('testtool/einleitung').'</a>
|
||||
</td></tr>
|
||||
';
|
||||
}
|
||||
@@ -296,8 +269,6 @@ if (isset($_SESSION['pruefling_id']))
|
||||
$result = $db->db_query($qry);
|
||||
$lastsemester = '';
|
||||
$quereinsteiger_stg = '';
|
||||
$gebiet_hasMathML = false; // true, wenn irgendein Gebiet eine/n Frage/Vorschlag im MathML-Format enthält
|
||||
$invalid_gebiete = false;
|
||||
while($row = $db->db_fetch_object($result))
|
||||
{
|
||||
//Jedes Semester in einer eigenen Tabelle anzeigen
|
||||
@@ -404,7 +375,7 @@ if (isset($_SESSION['pruefling_id']))
|
||||
|
||||
// Link zum Logout
|
||||
echo '<tr><td class="ItemTesttool" style="margin-left: 20px;" nowrap>
|
||||
<a class="ItemTesttool navButton" href="login.php?logout" target="content">Logout</a>
|
||||
<a class="ItemTesttool navButton" href="login.php?logout=true" target="content">Logout</a>
|
||||
</td></tr>';
|
||||
|
||||
echo '</td></tr></table>';
|
||||
|
||||
+27
-51
@@ -16,57 +16,33 @@
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
|
||||
*
|
||||
* Authors: Manfred Kindl <manfred.kindl@technikum-wien.at>.
|
||||
* Cristina Hainberger <hainberg@technikum-wien.at>
|
||||
*/
|
||||
|
||||
require_once('../../config/cis.config.inc.php');
|
||||
require_once('../../include/basis_db.class.php');
|
||||
require_once('../../include/sprache.class.php');
|
||||
require_once '../../include/phrasen.class.php';
|
||||
require_once('../../include/gebiet.class.php');
|
||||
|
||||
if (!$db = new basis_db())
|
||||
die('Fehler beim Oeffnen der Datenbankverbindung');
|
||||
|
||||
require_once('../../include/gebiet.class.php');
|
||||
|
||||
function getSpracheUser()
|
||||
|
||||
// Start session
|
||||
session_start();
|
||||
|
||||
// If language is changed by language select menu, reset session- and language variable
|
||||
if (isset($_GET['sprache_user']) && !empty($_GET['sprache_user']))
|
||||
{
|
||||
if(isset($_SESSION['sprache_user']))
|
||||
{
|
||||
$sprache_user=$_SESSION['sprache_user'];
|
||||
}
|
||||
else
|
||||
{
|
||||
if(isset($_COOKIE['sprache_user']))
|
||||
{
|
||||
$sprache_user=$_COOKIE['sprache_user'];
|
||||
}
|
||||
else
|
||||
{
|
||||
$sprache_user=DEFAULT_LANGUAGE;
|
||||
}
|
||||
setSpracheUser($sprache_user);
|
||||
}
|
||||
return $sprache_user;
|
||||
$_SESSION['sprache_user'] = $_GET['sprache_user'];
|
||||
$sprache_user = $_GET['sprache_user'];
|
||||
}
|
||||
|
||||
function setSpracheUser($sprache)
|
||||
{
|
||||
$_SESSION['sprache_user']=$sprache;
|
||||
setcookie('sprache_user',$sprache,time()+60*60*24*30,'/');
|
||||
}
|
||||
// Set language variable, which impacts the language displayed in the language select menu
|
||||
$sprache_user = (isset($_SESSION['sprache_user']) && !empty($_SESSION['sprache_user'])) ? $_SESSION['sprache_user'] : DEFAULT_LANGUAGE;
|
||||
|
||||
if(isset($_GET['sprache_user']))
|
||||
{
|
||||
$sprache_user = new sprache();
|
||||
if($sprache_user->load($_GET['sprache_user']))
|
||||
{
|
||||
setSpracheUser($_GET['sprache_user']);
|
||||
}
|
||||
else
|
||||
setSpracheUser(DEFAULT_LANGUAGE);
|
||||
}
|
||||
|
||||
$sprache_user = getSpracheUser();
|
||||
// The language select menu is only displayed if RT-Ablauf of STG allows to switch language
|
||||
$display = (isset($_SESSION['sprache_auswahl']) && $_SESSION['sprache_auswahl'] == true) ? '' : 'hidden';
|
||||
|
||||
$p = new phrasen($sprache_user);
|
||||
?>
|
||||
@@ -85,16 +61,15 @@ $p = new phrasen($sprache_user);
|
||||
<script type="text/javascript">
|
||||
function changeSprache(sprache)
|
||||
{
|
||||
var content = '';
|
||||
content = parent.content.location.pathname+parent.content.location.search;
|
||||
|
||||
window.location.href="topbar.php?sprache_user="+sprache;
|
||||
parent.menu.location.href="menu.php?sprache_user="+sprache;
|
||||
// Add or replace param 'sprache_user' to the contents URL
|
||||
var content_url = new URL(parent.content.location); // url of contents' frame page (login.php or frage.php)
|
||||
var content_params = new URLSearchParams(content_url.search.slice(1)); // retrieve the querystring params
|
||||
content_params.set('sprache_user', sprache); // add or replace sprache_user
|
||||
|
||||
if (parent.content.location.search=='')
|
||||
parent.content.location.href=content+"?sprache_user="+sprache;
|
||||
else
|
||||
parent.content.location.href=content+"&sprache_user="+sprache;
|
||||
// Pass GET-param sprache_user to topbar.php, menu.php and content (login.php or frage.php) and refresh the frames.
|
||||
location.href = location.pathname + '?sprache_user=' + sprache; // refreshes topbar.php
|
||||
parent.menu.location.href = parent.menu.location.pathname + '?sprache_user=' + sprache; // refreshes menu.php
|
||||
parent.content.location.href = parent.content.location.pathname + '?' + content_params; // refreshes login.php or frage.php
|
||||
}
|
||||
</script>
|
||||
<body>
|
||||
@@ -104,15 +79,17 @@ echo ' <table style="background-image: url(../../skin/images/header_testtool.png
|
||||
<td valign="top" align="left">
|
||||
<a href="index.html" target="_top"><img class="header_logo" style="min-height:65%; left: 16px; top: 10%;" src="../../skin/styles/'.DEFAULT_STYLE.'/logo_250x130.png" alt="logo"></a>
|
||||
</td>
|
||||
<td valign="middle">
|
||||
|
||||
<!--The language select menu is hidden by default.
|
||||
Only displayed if RT-Ablauf of STG allows to switch language.-->
|
||||
<td id="select_sprache" '. $display. '>
|
||||
<div class="form-group form-inline pull-right">
|
||||
<!-- <label for="select-sprache">Sprache Menü: </label>-->
|
||||
<select id="select-sprache" class="form-control" style="width: 170px; margin-right: 50px;" onchange="if (typeof(this.value) != \'undefined\') changeSprache(this.value)">';
|
||||
$sprache = new sprache();
|
||||
$sprache->getAll(true);
|
||||
foreach($sprache->result as $row)
|
||||
{
|
||||
echo ' <option value="'. $row->sprache. '" '.($row->sprache==$sprache_user?'selected':'').'>'.($row->bezeichnung_arr[getSprache()]).' </option>';
|
||||
echo ' <option value="'. $row->sprache. '" '.($row->sprache == $sprache_user ? 'selected' : '').'>'.($row->bezeichnung_arr[$sprache_user]).' </option>';
|
||||
}
|
||||
echo '
|
||||
</select>
|
||||
@@ -140,4 +117,3 @@ echo ' <table style="background-image: url(../../skin/images/header_testtool.png
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -20,6 +20,7 @@ $this->phrasen['testtool/reihungstestNichtFreigeschalten']='Der zuteilte Reihung
|
||||
$this->phrasen['testtool/reihungstestKannNichtGeladenWerden']='Der Reihungstest dem Sie zugeteilt sind, kann nicht geladen werden';
|
||||
$this->phrasen['testtool/geburtsdatumStimmtNichtUeberein']='Ihr Geburtsdatum stimmt nicht mit unseren Daten überein. Bitte wenden Sie sich an die Aufsichtsperson';
|
||||
$this->phrasen['testtool/home']='Home';
|
||||
$this->phrasen['testtool/teilnehmerIn']='TeilnehmerIn';
|
||||
$this->phrasen['testtool/klickenSieAufEinTeilgebiet']='Zum Starten klicken Sie bitte links auf ein Teilgebiet.<br>Wir wünschen Ihnen viel Erfolg!';
|
||||
$this->phrasen['testtool/gebietStarten']='Gebiet starten';
|
||||
$this->phrasen['testtool/startseite']='Startseite';
|
||||
|
||||
@@ -20,6 +20,7 @@ $this->phrasen['testtool/reihungstestNichtFreigeschalten']='The entrance examina
|
||||
$this->phrasen['testtool/reihungstestKannNichtGeladenWerden']='The entrance examination assigned to you can not be loaded.';
|
||||
$this->phrasen['testtool/geburtsdatumStimmtNichtUeberein']='Your date of birth does not correspond to the data we have. Please speak to the supervisor. ';
|
||||
$this->phrasen['testtool/home']='Home';
|
||||
$this->phrasen['testtool/teilnehmerIn']='Participant';
|
||||
$this->phrasen['testtool/klickenSieAufEinTeilgebiet']='Select a topic on the left side.<br>';
|
||||
$this->phrasen['testtool/gebietStarten']='Start section';
|
||||
$this->phrasen['testtool/startseite']='Startpage';
|
||||
|
||||
Reference in New Issue
Block a user