blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-19 16:02:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
Andreas Österreicher
2014-06-20 09:34:15 +00:00
parent 7ef3104297
commit 7bef10bf68
6 changed files with 35 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.htaccess
+13
View File
@@ -0,0 +1,13 @@
#XDebug Konfiguration
php_value xdebug.remote_enable 1
php_value xdebug.remote_handler dbgp
php_value xdebug.remote_host 10.63.0.68
php_value xdebug.allowed_clients 10.63.0.68
php_value xdebug.remote_port 9000
#XDebug Profiler (Cachegrind)
php_value xdebug.profiler_enable_trigger 1
php_value xdebug.profiler_enable 0
php_value xdebug.profiler_output_dir "/var/www/oesi/xdebug"
php_value xdebug.profiler_append 1
cis/private/profile/change_password.php
-1
View File
@@ -27,7 +27,6 @@ require_once('../../../include/functions.inc.php');
require_once('../../../include/benutzer.class.php');
require_once('../../../addons/ldap/vilesci/ldap.class.php');
require_once('../../../include/phrasen.class.php');
require_once('../../../include/Crypt_CHAP-1.5.0/CHAP.php');
require_once('../../../include/'.EXT_FKT_PATH.'/passwort.inc.php');
$uid = get_uid();
content/student/studentDBDML.php
+4 -1
View File
@@ -1032,7 +1032,10 @@ if(!$error)
$stg_obj = new studiengang();
$stg_obj->load(ltrim($stg,'0'));
$uid = generateUID($stg_obj->kurzbz,$jahr,$stg_obj->typ,$matrikelnr);
$qry = "UPDATE public.tbl_person SET matr_nr=".$db->db_add_param($uid)." WHERE person_id=".$db->db_add_param($prestd->person_id, FHC_INTEGER).' AND matr_nr is null';
$db->db_query($qry);
//Benutzerdatensatz anlegen
$benutzer = new benutzer();
$benutzer->uid = $uid;
content/student/studentenoverlay.xul.php
+1 -1
View File
@@ -91,8 +91,8 @@ else
<menuitem id="student-toolbar-absolvent" label="-> Absolvent" oncommand="StudentAddRolle('Absolvent')" disabled="false" tooltiptext="Studenten zum Absolventen machen" hidden="true"/>
<menuitem id="interessent-toolbar-zubewerber" label="-> Bewerber" oncommand="InteressentzuBewerber()" disabled="false" tooltiptext="Interessent zum Bewerber machen" hidden="true"/>
<menuitem id="interessent-toolbar-zustudent" label="-> Student" oncommand="InteressentzuStudent()" disabled="false" tooltiptext="Bewerber zu Studenten machen" hidden="true"/>
<menuitem id="interessent-toolbar-aufgenommener" label="-> Aufgenommener" oncommand="InteressentAddRolle('Aufgenommener')" disabled="false" tooltiptext="Interessent zum Aufgenommenen machen" hidden="true"/>
<menuitem id="interessent-toolbar-zustudent" label="-> Student" oncommand="InteressentzuStudent()" disabled="false" tooltiptext="Bewerber zu Studenten machen" hidden="true"/>
<menuitem id="interessent-toolbar-warteliste" label="-> Warteliste" oncommand="InteressentAddRolle('Wartender')" disabled="false" tooltiptext="Interessent zum Wartenden machen" hidden="true"/>
<menuitem id="interessent-toolbar-absage" label="-> Absage" oncommand="InteressentAddRolle('Abgewiesener')" disabled="false" tooltiptext="Interessent zum Absager machen" hidden="true"/>
</menupopup>
include/tw/passwort.inc.php
+7 -7
View File
@@ -21,7 +21,7 @@
* Funktionen zum Pruefen der Passwort Policy und setzen des Passworts
*/
require_once(dirname(__FILE__).'/../addon.class.php');
require_once(dirname(__FILE__).'/../Crypt_CHAP-1.5.0/CHAP.php');
//require_once(dirname(__FILE__).'/../Crypt_CHAP-1.5.0/CHAP.php');
// die aktiven Addons werden durchsucht, ob eines davon eine eigene UID Generierung vorsieht
// falls ja, wird die Version des Addons genommen, ansonsten die Default Generierung
@@ -146,18 +146,18 @@ if(!$passwort_addon_found)
$ssha_password = '{SSHA}'.$encrypted;
// LM und NT
$hash = new Crypt_CHAP_MSv2();
$hash->password = $passwort_neu;
//$hash = new Crypt_CHAP_MSv2();
//$hash->password = $passwort_neu;
// $lm_password = strtoupper(bin2hex($hash->lmPasswordHash()));
$nt_password = strtoupper(bin2hex($hash->ntPasswordHash()));
//$nt_password = strtoupper(bin2hex($hash->ntPasswordHash()));
// Neues Passwort setzen
$data = array();
$data['userPassword']=$ssha_password;
// $data['sambaLMPassword']=$lm_password;
$data['sambaNTPassword']=$nt_password;
$data['sambaPwdLastSet']=time();
$data['sambaPwdMustChange']=2147483647; // 2038-01-19 04:14:07
//$data['sambaNTPassword']=$nt_password;
//$data['sambaPwdLastSet']=time();
//$data['sambaPwdMustChange']=2147483647; // 2038-01-19 04:14:07
if($ldap->Modify($user_dn, $data))
return true;
system/xsl/Zeugnis_0_v6.xsl
+10 -10
View File
@@ -53,21 +53,21 @@
</fo:block-container>
<fo:block-container position="absolute" top="117mm" left="23mm" height="10mm">
<fo:block line-height="11pt" font-family="arial" font-size="10pt"><xsl:text>Vorname/Familienname:\n</xsl:text></fo:block>
<fo:block line-height="11pt" font-family="arial" font-size="10pt"><xsl:text>Geburtsdatum:</xsl:text></fo:block>
<fo:block line-height="10pt" font-family="arial" font-size="10pt"><xsl:text>Vorname/Familienname:\n</xsl:text></fo:block>
<fo:block line-height="10pt" font-family="arial" font-size="10pt"><xsl:text>Geburtsdatum:</xsl:text></fo:block>
</fo:block-container>
<fo:block-container position="absolute" top="117mm" left="68mm">
<fo:block line-height="11pt" font-family="arial" font-size="10pt" font-weight="bold">
<fo:block line-height="10pt" font-family="arial" font-size="10pt" font-weight="bold">
<xsl:value-of select="name"/>
<xsl:text>\n</xsl:text>
</fo:block>
<fo:block line-height="11pt" font-family="arial" font-size="10pt">
<fo:block line-height="10pt" font-family="arial" font-size="10pt">
<xsl:value-of select="gebdatum" />
</fo:block>
</fo:block-container>
<fo:block-container position="absolute" top="137mm" left="23mm">
<fo:block-container position="absolute" top="130mm" left="23mm">
<fo:table table-layout="fixed" border-collapse="collapse" border-width="0.2pt" border-style="solid">
<fo:table-column column-width="0mm"/>
<fo:table-column column-width="103mm"/>
@@ -143,7 +143,7 @@
<xsl:apply-templates select="fussnote"/>
</fo:table-body>
</fo:table>
<fo:block font-size="7pt">\n</fo:block>
<fo:block font-size="2pt">\n</fo:block>
<fo:table>
<fo:table-column column-width="15mm"/>
<fo:table-column column-width="155mm"/>
@@ -166,7 +166,7 @@
</fo:table-row>
</fo:table-body>
</fo:table>
<fo:block font-size="7pt">\n</fo:block>
<fo:block font-size="2pt">\n</fo:block>
<xsl:if test="abschlusspruefung_typ">
<fo:table table-layout="fixed" border-collapse="collapse" border-width="0.2pt" border-style="solid">
<fo:table-column column-width="0mm"/>
@@ -223,7 +223,7 @@
</fo:table-row>
</fo:table-body>
</fo:table>
<fo:block font-size="7pt">\n</fo:block>
<fo:block font-size="2pt">\n</fo:block>
<fo:table>
<fo:table-column column-width="15mm"/>
<fo:table-column column-width="155mm"/>
@@ -240,7 +240,7 @@
</fo:table>
</xsl:if>
</fo:block-container>
<fo:block-container position="absolute" top="252mm" left="21.5mm">
<fo:block-container position="absolute" top="265mm" left="21.5mm">
<fo:table table-layout="fixed" border-collapse="collapse">
<fo:table-column column-width="73mm" />
<fo:table-column column-width="17mm" />
@@ -283,7 +283,7 @@
<!-- Dummy Zelle -->
</fo:table-cell>
<fo:table-cell display-align="center" border-width="0.2mm" border-style="solid">
<fo:block font-size="9pt" content-width="104mm" vertical-align="center" font-family="arial">
<fo:block font-size="9pt" content-width="105mm" vertical-align="center" font-family="arial">
<xsl:text> </xsl:text>
<xsl:choose>
<xsl:when test="bisio_von">