bachelorthesis && !$preincoming->masterthesis)?'checked="checked"':'').'>'.$p->t('incoming/nothesis').'
- masterthesis)?'checked="checked"':'').'>'.$p->t('incoming/bachelorthesis').'
- bachelorthesis)?'checked="checked"':'').'>'.$p->t('incoming/masterthesis').'
+ bachelorthesis)?'checked="checked"':'').'>'.$p->t('incoming/bachelorthesis').'
+ masterthesis)?'checked="checked"':'').'>'.$p->t('incoming/masterthesis').'
|
'.$p->t('incoming/researcharea').'
diff --git a/include/functions.inc.php b/include/functions.inc.php
index 8c2f326d4..0a2623366 100644
--- a/include/functions.inc.php
+++ b/include/functions.inc.php
@@ -25,7 +25,9 @@ require_once(dirname(__FILE__).'/basis_db.class.php');
function get_uid()
{
if(isset($_SERVER['REMOTE_USER']))
+ {
return mb_strtolower(trim($_SERVER['REMOTE_USER']));
+ }
else
{
if(isset($_SESSION['user']))
@@ -37,7 +39,13 @@ function get_uid()
//return 'oesi';
//return 'pam';
}
-
+function is_user_logged_in()
+{
+ if(isset($_SERVER['PHP_AUTH_USER']) && checkldapuser($_SERVER['PHP_AUTH_USER'],$_SERVER['PHP_AUTH_PW']))
+ return true;
+ else
+ return false;
+}
function get_original_uid()
{
if(isset($_SERVER['REMOTE_USER']))
@@ -443,8 +451,7 @@ function getUidFromCardNumber($number)
if (ldap_count_entries($connect, $res_id) == 0)
{
$number = "0".$number;
- echo $number;
- // search for card id 000[Number]
+ // search for card id 000[Number]
if (($res_id = ldap_search($connect, LDAP_BASE_DN, "departmentNumber=$number")) == false)
{
print "failure: search in LDAP-tree failed
";
@@ -452,8 +459,39 @@ function getUidFromCardNumber($number)
}
if (ldap_count_entries($connect, $res_id) == 0)
{
- print "failure: no person found
";
- return false;
+ $number = "0".$number;
+
+ // search for card id 0000[Number]
+ if (($res_id = ldap_search($connect, LDAP_BASE_DN, "departmentNumber=$number")) == false)
+ {
+ print "failure: search in LDAP-tree failed
";
+ return false;
+ }
+ if (ldap_count_entries($connect, $res_id) == 0)
+ {
+ $number = "0".$number;
+ // search for card id 00000[Number]
+ if (($res_id = ldap_search($connect, LDAP_BASE_DN, "departmentNumber=$number")) == false)
+ {
+ print "failure: search in LDAP-tree failed
";
+ return false;
+ }
+ if (ldap_count_entries($connect, $res_id) == 0)
+ {
+ $number = "0".$number;
+ // search for card id 000000[Number]
+ if (($res_id = ldap_search($connect, LDAP_BASE_DN, "departmentNumber=$number")) == false)
+ {
+ print "failure: search in LDAP-tree failed
";
+ return false;
+ }
+ if (ldap_count_entries($connect, $res_id) == 0)
+ {
+ print "failure: no person found
";
+ return false;
+ }
+ }
+ }
}
}
}
@@ -885,7 +923,9 @@ function manual_basic_auth()
exit;
}
else
+ {
return mb_strtolower($_SERVER['PHP_AUTH_USER']);
+ }
}
/**
diff --git a/rdf/learningagreement.rdf.php b/rdf/learningagreement.rdf.php
index 011ca3f9b..0ae36c379 100644
--- a/rdf/learningagreement.rdf.php
+++ b/rdf/learningagreement.rdf.php
@@ -85,6 +85,11 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
echo " english]]>\n";
echo " \n";
}
+
+ if($preincoming->bachelorthesis)
+ echo 'research_area.']]>';
+ if($preincoming->masterthesis)
+ echo 'research_area.']]>';
echo "\n";
echo "\n";
}
diff --git a/system/xsl/learningAgreement_0_v1.xsl b/system/xsl/learningAgreement_0_v1.xsl
index 02edad34f..2faa2d796 100644
--- a/system/xsl/learningAgreement_0_v1.xsl
+++ b/system/xsl/learningAgreement_0_v1.xsl
@@ -73,6 +73,8 @@
+
+
\n \n PLEASE NOTE: For courses offered in German and/or English sufficient language competencies are required
@@ -144,4 +146,54 @@
-
\ No newline at end of file
+
+
+
+
+ Bachelor Thesis
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Master Thesis
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/vilesci/personen/incoming_detail.php b/vilesci/personen/incoming_detail.php
index 89e99c86e..ef3d76138 100644
--- a/vilesci/personen/incoming_detail.php
+++ b/vilesci/personen/incoming_detail.php
@@ -1074,6 +1074,8 @@ function print_lehrveranstaltungen()
if($inc->deutschkurs1)
echo ' |