blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-01 12:19:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Bugfix beim Login am Infoterminal mit Zutrittskarten mit mehr als 3 Nullen am Beginn

Browse Source 
- Incomingverwaltung: Anzeige der Anmeldung zu Thesis am Learning Agreement
This commit is contained in:
Andreas Österreicher
2011-11-24 16:04:50 +00:00
parent 71f2cbd5f2
commit a11d9aadf2
5 changed files with 108 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cis/public/incoming/incoming.php
+3 -3
View File
@@ -214,7 +214,7 @@ else if($method=="lehrveranstaltungen")
{
case 'bachelor':
$preincoming->bachelorthesis=true;
$preincoming->masterthesis=true;
$preincoming->masterthesis=false;
$preincoming->research_area=$_GET['research_area'];
if(!$preincoming->save(false))
echo $preincoming->errormsg;
@@ -425,8 +425,8 @@ else if($method=="lehrveranstaltungen")
<tr>
<td width="30%">
<input type="radio" name="thesis" value="" '.((!$preincoming->bachelorthesis && !$preincoming->masterthesis)?'checked="checked"':'').'>'.$p->t('incoming/nothesis').'<br>
<input type="radio" name="thesis" value="master" '.(($preincoming->masterthesis)?'checked="checked"':'').'>'.$p->t('incoming/bachelorthesis').'<br>
<input type="radio" name="thesis" value="bachelor" '.(($preincoming->bachelorthesis)?'checked="checked"':'').'>'.$p->t('incoming/masterthesis').'
<input type="radio" name="thesis" value="bachelor" '.(($preincoming->bachelorthesis)?'checked="checked"':'').'>'.$p->t('incoming/bachelorthesis').'<br>
<input type="radio" name="thesis" value="master" '.(($preincoming->masterthesis)?'checked="checked"':'').'>'.$p->t('incoming/masterthesis').'
</td>
<td valign="top">
'.$p->t('incoming/researcharea').'
include/functions.inc.php
+45 -5
View File
@@ -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<br>";
@@ -452,8 +459,39 @@ function getUidFromCardNumber($number)
}
if (ldap_count_entries($connect, $res_id) == 0)
{
print "failure: no person found<br>";
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<br>";
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<br>";
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<br>";
return false;
}
if (ldap_count_entries($connect, $res_id) == 0)
{
print "failure: no person found<br>";
return false;
}
}
}
}
}
}
@@ -885,7 +923,9 @@ function manual_basic_auth()
exit;
}
else
{
return mb_strtolower($_SERVER['PHP_AUTH_USER']);
}
}
/**
rdf/learningagreement.rdf.php
+5
View File
@@ -85,6 +85,11 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
echo " <studiengang><![CDATA[$studiengang->english]]></studiengang>\n";
echo " </lehrveranstaltung>\n";
}
if($preincoming->bachelorthesis)
echo '<bachelorthesis><![CDATA['.$preincoming->research_area.']]></bachelorthesis>';
if($preincoming->masterthesis)
echo '<masterthesis><![CDATA['.$preincoming->research_area.']]></masterthesis>';
echo "</student>\n";
echo "</learningagreement>\n";
}
system/xsl/learningAgreement_0_v1.xsl
+53 -1
View File
@@ -73,6 +73,8 @@
</fo:table-cell>
</fo:table-row>
<xsl:apply-templates select="lehrveranstaltung"/>
<xsl:apply-templates select="bachelorthesis"/>
<xsl:apply-templates select="masterthesis"/>
</fo:table-body>
</fo:table>
<fo:block font-size="10pt">\n \n PLEASE NOTE: For courses offered in German and/or English sufficient language competencies are required</fo:block>
@@ -144,4 +146,54 @@
</fo:table-cell>
</fo:table-row>
</xsl:template>
</xsl:stylesheet >
<xsl:template match="bachelorthesis">
<fo:table-row line-height="12pt">
<fo:table-cell display-align="center" border-width="0.2mm" border-style="solid">
<fo:block font-size="10pt" content-width="95mm">
<xsl:text> Bachelor Thesis </xsl:text>
<xsl:value-of select="."/>
</fo:block>
</fo:table-cell>
<fo:table-cell border-width="0.2mm" border-style="solid" display-align="center">
<fo:block font-size="10pt" content-width="55mm" text-align="center">
<xsl:text> </xsl:text>
</fo:block>
</fo:table-cell>
<fo:table-cell border-width="0.2mm" border-style="solid" display-align="center">
<fo:block font-size="10pt" content-width="20mm" text-align="center">
<xsl:text> </xsl:text>
</fo:block>
</fo:table-cell>
<fo:table-cell border-width="0.2mm" border-style="solid" display-align="center">
<fo:block font-size="10pt" content-width="15mm" text-align="center">
<xsl:text> </xsl:text>
</fo:block>
</fo:table-cell>
</fo:table-row>
</xsl:template>
<xsl:template match="masterthesis">
<fo:table-row line-height="12pt">
<fo:table-cell display-align="center" border-width="0.2mm" border-style="solid">
<fo:block font-size="10pt" content-width="95mm">
<xsl:text> Master Thesis </xsl:text>
<xsl:value-of select="."/>
</fo:block>
</fo:table-cell>
<fo:table-cell border-width="0.2mm" border-style="solid" display-align="center">
<fo:block font-size="10pt" content-width="55mm" text-align="center">
<xsl:text> </xsl:text>
</fo:block>
</fo:table-cell>
<fo:table-cell border-width="0.2mm" border-style="solid" display-align="center">
<fo:block font-size="10pt" content-width="20mm" text-align="center">
<xsl:text> </xsl:text>
</fo:block>
</fo:table-cell>
<fo:table-cell border-width="0.2mm" border-style="solid" display-align="center">
<fo:block font-size="10pt" content-width="15mm" text-align="center">
<xsl:text> </xsl:text>
</fo:block>
</fo:table-cell>
</fo:table-row>
</xsl:template>
</xsl:stylesheet >
vilesci/personen/incoming_detail.php
+2
View File
@@ -1074,6 +1074,8 @@ function print_lehrveranstaltungen()
if($inc->deutschkurs1)
echo '<tr><td>Deutsch für Anfänger</td></tr>';
if($inc->deutschkurs2)
echo '<tr><td>Deutsch Advanced</td></tr>';
if($inc->deutschkurs3)
echo '<tr><td>Deutsch Intensivkurs</td></tr>';
echo '</tbody></table>';
echo '</fieldset>';