Ultra2D 6f299a9679 Merge remote-tracking branch 'upstream/master' into issue-714 ...

Conflicts:
	html/includes/authentication/ldap.inc.php

2015-04-08 08:43:24 +02:00

..

http-auth.inc.php

…

ldap.inc.php

Merge remote-tracking branch 'upstream/master' into issue-714

2015-04-08 08:43:24 +02:00

mysql.inc.php

Fixed the mysql auth include and the db schema. I set the desc field to be a varchar(200) and set it to be NULL by default (this is a personal preference but since it was not set in the code...). I fixed adduser function in html/includes/authentication/mysql.inc.php. I added $description and $twofactor to the function argument with default values and added descr and twofactor elements in the array passed to the dbInsert function call. OpenSuSE 13.2

2015-02-26 23:03:05 +00:00

twofactor.lib.php

…