diff --git a/.htaccess b/.htaccess
new file mode 100644
index 000000000..86d7decf5
--- /dev/null
+++ b/.htaccess
@@ -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
diff --git a/cis/private/profile/change_password.php b/cis/private/profile/change_password.php
index 83132e1d1..3cdc0bb1c 100644
--- a/cis/private/profile/change_password.php
+++ b/cis/private/profile/change_password.php
@@ -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();
diff --git a/content/student/studentDBDML.php b/content/student/studentDBDML.php
index 9912e15f5..2a46af550 100644
--- a/content/student/studentDBDML.php
+++ b/content/student/studentDBDML.php
@@ -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;
diff --git a/content/student/studentenoverlay.xul.php b/content/student/studentenoverlay.xul.php
index 6f77ca647..039ecbcf0 100644
--- a/content/student/studentenoverlay.xul.php
+++ b/content/student/studentenoverlay.xul.php
@@ -91,8 +91,8 @@ else
-
+
diff --git a/include/tw/passwort.inc.php b/include/tw/passwort.inc.php
index 2236bf8d2..2c02d396b 100644
--- a/include/tw/passwort.inc.php
+++ b/include/tw/passwort.inc.php
@@ -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;
diff --git a/system/xsl/Zeugnis_0_v6.xsl b/system/xsl/Zeugnis_0_v6.xsl
index b13f55dc9..4bdde4f02 100755
--- a/system/xsl/Zeugnis_0_v6.xsl
+++ b/system/xsl/Zeugnis_0_v6.xsl
@@ -53,21 +53,21 @@
- Vorname/Familienname:\n
- Geburtsdatum:
+ Vorname/Familienname:\n
+ Geburtsdatum:
-
+
\n
-
+
-
+
@@ -143,7 +143,7 @@
- \n
+ \n
@@ -166,7 +166,7 @@
- \n
+ \n
@@ -223,7 +223,7 @@
- \n
+ \n
@@ -240,7 +240,7 @@
-
+
@@ -283,7 +283,7 @@
-
+