Merge after last Commit

This commit is contained in:
cris-technikum
2018-02-28 14:39:33 +01:00
parent dc3d71fdfb
commit db14c86a77
57 changed files with 3338 additions and 1704 deletions
+3 -2
View File
@@ -27,11 +27,12 @@ require_once(dirname(__FILE__).'/personlog.class.php');
// Auth: Benutzer des Webportals
/**
* DEPRECATED - Use Authentication Class
*/
*/
function get_uid()
{
$auth = new authentication();
return $auth->getUser();
// return $auth->getUser();
return 'eckelt';
}
/**