Merge branch 'master' of https://github.com/FH-Complete/FHC-Core

cis/private/lehre/notenliste.xls.php

@@ -246,7 +246,7 @@ else
 						$note='';
 					$worksheet->write($lines,1,$elem->nachname.$inc);
 					$worksheet->write($lines,2,$elem->vorname);
-					$worksheet->write($lines,3,$elem->semester.$elem->verband.$elem->gruppe);
+					$worksheet->write($lines,3,'="'.$elem->semester.$elem->verband.$elem->gruppe.'"');
 					$worksheet->write($lines,4,'="'.trim($elem->matrikelnr).'"',$format_highlight);
 					$worksheet->write($lines,5,$note,$format_highlight);
 					$i++;

config/cis.config-default.inc.php

@@ -11,6 +11,7 @@ error_reporting(E_ALL);
 mb_internal_encoding("UTF-8");
 mb_regex_encoding("UTF-8");
 setlocale (LC_ALL, 'de_AT.utf8');
+setlocale (LC_NUMERIC, 'C');
 
 // Zeitzone
 date_default_timezone_set('Europe/Vienna');

include/statistik.class.php

@@ -605,6 +605,11 @@ class statistik extends basis_db
 	{
 		return json_encode($this->json);
 	}
+	
+	function getArray()
+	{
+		return $this->json;
+	}
 
 	/**
 	 *