diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index a632538f3..2ffe21994 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -24,4 +24,4 @@
fields.
- Bugfix 859816 : DataForm - security issues. Tnx Gabor for reporting.
- ^t; now starts in current root rather then in site root.
-
+ - Added new Authentication System.
diff --git a/docs/migration.txt b/docs/migration.txt
index a5582012b..8f33a2cef 100644
--- a/docs/migration.txt
+++ b/docs/migration.txt
@@ -38,6 +38,8 @@ There have currently been no changes to the macro API.
3.1 Nothing Yet
There have currently been no changes to the authentication API.
+In 6.0 all Authentication modules will need to be rewritten as Auth modules according to the new
+Auth API in WebGUI::Auth. Details to follow.
diff --git a/docs/upgrades/upgrade_5.5.3-6.0.0.sql b/docs/upgrades/upgrade_5.5.3-6.0.0.sql
index 29749b3bd..d3d163b94 100644
--- a/docs/upgrades/upgrade_5.5.3-6.0.0.sql
+++ b/docs/upgrades/upgrade_5.5.3-6.0.0.sql
@@ -1,4 +1,4 @@
-insert into webguiVersion values ('6.0.0','upgrade',unix_timestamp());
+insert into webguiVersion values ('6.0.0','upgrade',unix_timestamp());
delete from international where internationalId=158 and namespace='WebGUI';
delete from international where internationalId=803 and namespace='WebGUI';
delete from international where internationalId=804 and namespace='WebGUI';
@@ -186,3 +186,87 @@ insert into international (internationalId,languageId,namespace,message,lastUpda
alter table SQLReport change column databaseLinkId databaseLinkId int not null default 0;
INSERT INTO template VALUES (1,'Default SQL Report','\n
\n\n\n\n \n\n\n\n \n\n\n\n\n \n \n \n
\n\n \n \n | \n \n
\n\n
\n\n\n \n','SQLReport');
+
+#Start Authentication Changes
+delete from settings where name='webguiExpirePasswordOnCreation';
+INSERT INTO settings (name,value) VALUES ('webguiExpirePasswordOnCreation','0');
+delete from settings where name='webguiPasswordLength';
+INSERT INTO settings (name,value) VALUES ('webguiPasswordLength','0');
+delete from settings where name='webguiPasswordRecovery';
+INSERT INTO settings (name,value) VALUES ('webguiPasswordRecovery','1');
+delete from settings where name='webguiPasswordTimeout';
+INSERT INTO settings (name,value) VALUES ('webguiPasswordTimeout','3122064000');
+delete from settings where name='ldapWelcomeMessage';
+INSERT INTO settings (name,value) VALUES ('ldapWelcomeMessage','Welcome to our site.');
+delete from settings where name='ldapSendWelcomeMessage';
+INSERT INTO settings (name,value) VALUES ('ldapSendWelcomeMessage','0');
+delete from settings where name='webguiSendWelcomeMessage';
+update settings set name='webguiSendWelcomeMessage' where name='sendWelcomeMessage';
+delete from settings where name='webguiWelcomeMessage';
+update settings set name='webguiWelcomeMessage' where name='welcomeMessage';
+delete from settings where name='webguiRecoverPasswordEmail';
+update settings set name='webguiRecoverPasswordEmail' where name='recoverPasswordEmail';
+delete from international where languageId=1 and namespace='Auth/LDAP' and internationalId=13;
+insert into international (internationalId,languageId,namespace,message,lastUpdated,context) values (13, 1,'Auth/LDAP','Invalid LDAP connection URL. Contact your administrator.',1071849063,'');
+delete from international where languageId=1 and namespace='Auth/LDAP' and internationalId=12;
+insert into international (internationalId,languageId,namespace,message,lastUpdated,context) values (12, 1,'Auth/LDAP','No LDAP Url Specified for this user',1071848371,'');
+delete from international where languageId=1 and namespace='Auth/LDAP' and internationalId=11;
+insert into international (internationalId,languageId,namespace,message,lastUpdated,context) values (11, 1,'Auth/LDAP','No connect DN specified for this user',1071848383,'');
+delete from international where languageId=1 and namespace='Auth/LDAP' and internationalId=10;
+insert into international (internationalId,languageId,namespace,message,lastUpdated,context) values (10, 1,'Auth/LDAP','Password (confirm)',1071845113,'');
+delete from international where languageId=1 and namespace='Auth/WebGUI' and internationalId=17;
+insert into international (internationalId,languageId,namespace,message,lastUpdated,context) values (17,1,'Auth/WebGUI','Password Updated', 1071885563,'');
+delete from international where languageId=1 and namespace='Auth/WebGUI' and internationalId=16;
+insert into international (internationalId,languageId,namespace,message,lastUpdated,context) values (16,1,'Auth/WebGUI','Password Timeout', 1071885309,'');
+delete from international where languageId=1 and namespace='Auth/WebGUI' and internationalId=15;
+insert into international (internationalId,languageId,namespace,message,lastUpdated,context) values (15,1,'Auth/WebGUI','Minimum Password Length', 1071885112,'');
+delete from international where languageId=1 and namespace='Auth/WebGUI' and internationalId=14;
+insert into international (internationalId,languageId,namespace,message,lastUpdated,context) values (14,1,'Auth/WebGUI','Minimum password length', 1071507951,'What is the minimum password length?');
+delete from international where languageId=1 and namespace='Auth/WebGUI' and internationalId=13;
+insert into international (internationalId,languageId,namespace,message,lastUpdated,context) values (13,1,'Auth/WebGUI','Allow password recovery?', 1071507940,'');
+delete from international where languageId=1 and namespace='Auth/WebGUI' and internationalId=12;
+insert into international (internationalId,languageId,namespace,message,lastUpdated,context) values (12,1,'Auth/WebGUI','You may not use your old password as your new password', 1071507932,'');
+delete from international where languageId=1 and namespace='Auth/WebGUI' and internationalId=11;
+insert into international (internationalId,languageId,namespace,message,lastUpdated,context) values (11,1,'Auth/WebGUI','New Password', 1071507924,'');
+delete from international where languageId=1 and namespace='Auth/WebGUI' and internationalId=10;
+insert into international (internationalId,languageId,namespace,message,lastUpdated,context) values (10,1,'Auth/WebGUI','Old Password', 1071507875,'');
+delete from international where languageId=1 and namespace='Auth/WebGUI' and internationalId=9;
+insert into international (internationalId,languageId,namespace,message,lastUpdated,context) values (9,1,'Auth/WebGUI','Expire passwords on user creation?', 1071507780,'');
+delete from international where languageId=1 and namespace='Auth/WebGUI' and internationalId=8;
+insert into international (internationalId,languageId,namespace,message,lastUpdated,context) values (8,1,'Auth/WebGUI','Your Password Has Expired', 1071507773,'');
+delete from international where languageId=1 and namespace='Auth/WebGUI' and internationalId=7;
+insert into international (internationalId,languageId,namespace,message,lastUpdated,context) values (7,1,'Auth/WebGUI','Passwords must have a minimum character length of', 1071507767,'Password expires every 10 days');
+delete from international where languageId=1 and namespace='Auth/WebGUI' and internationalId=6;
+insert into international (internationalId,languageId,namespace,message,lastUpdated,context) values (6,1,'Auth/WebGUI','Allow Password Recovery?', 1071507760,'Password expires every 10 days');
+delete from international where languageId=1 and namespace='Auth/WebGUI' and internationalId=5;
+insert into international (internationalId,languageId,namespace,message,lastUpdated,context) values (5,1,'Auth/WebGUI','Your password cannot be \"password\".', 1071507752,NULL);
+delete from international where languageId=1 and namespace='Auth/WebGUI' and internationalId=4;
+insert into international (internationalId,languageId,namespace,message,lastUpdated,context) values (4,1,'Auth/WebGUI','Your password cannot be blank.', 1071507744,NULL);
+delete from international where languageId=1 and namespace='Auth/WebGUI' and internationalId=3;
+insert into international (internationalId,languageId,namespace,message,lastUpdated,context) values (3,1,'Auth/WebGUI','Your passwords did not match. Please try again.', 1071507737,NULL);
+delete from international where languageId=1 and namespace='Auth/WebGUI' and internationalId=2;
+insert into international (internationalId,languageId,namespace,message,lastUpdated,context) values (2,1,'Auth/WebGUI','Password (confirm)', 1071507729,NULL);
+delete from international where languageId=1 and namespace='Auth/WebGUI' and internationalId=1;
+insert into international (internationalId,languageId,namespace,message,lastUpdated,context) values (1,1,'Auth/WebGUI','WebGUI Authentication Options', 1071507721,NULL);
+delete from international where languageId=1 and namespace='WebGUI' and internationalId=1078;
+insert into international (internationalId,languageId,namespace,message,lastUpdated,context) values (1078,1,'WebGUI','There is already a user of this system with the email address you\'ve entered. Press \"Save\" if you still wish to create this user', 1067951807,NULL);
+delete from international where languageId=1 and namespace='WebGUI' and internationalId=1077;
+insert into international (internationalId,languageId,namespace,message,lastUpdated,context) values (1077,1,'WebGUI','The function you are attempting to call is not available for this authentication module', 1067951805,NULL);
+delete from template where namespace='Auth/WebGUI/Account' and templateId=1;
+INSERT INTO template (templateId,name,template,namespace) VALUES (1,'Default WebGUI Account Display Template','\r\n \r\n\r\n\r\n\r\n \r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n | \r\n | \r\n
\r\n\r\n\r\n | \r\n | \r\n
\r\n\r\n | \r\n | \r\n
\r\n\r\n | \r\n | \r\n
\r\n\r\n | \r\n | \r\n
\r\n
\r\n\r\n\r\n','Auth/WebGUI/Account');
+delete from template where namespace='Auth/WebGUI/Create' and templateId=1;
+INSERT INTO template (templateId,name,template,namespace) VALUES (1,'Default WebGUI Anonymous Registration Template','\r\n \r\n\r\n\r\n\r\n \r\n\r\n\r\n\r\n\r\n\r\n\r\n | \r\n | \r\n
\r\n\r\n | \r\n | \r\n
\r\n\r\n | \r\n | \r\n
\r\n\r\n\r\n | \r\n | \r\n
\r\n\r\n\r\n | \r\n | \r\n
\r\n
\r\n\r\n\r\n\r\n','Auth/WebGUI/Create');
+delete from template where namespace='Auth/WebGUI/Login' and templateId=1;
+INSERT INTO template (templateId,name,template,namespace) VALUES (1,'Default WebGUI Login Template','\r\n \r\n\r\n\r\n\r\n \r\n\r\n\r\n\r\n\r\n\r\n\r\n | \r\n | \r\n
\r\n\r\n | \r\n | \r\n
\r\n\r\n | \r\n | \r\n
\r\n
\r\n\r\n\r\n\r\n
\r\n \r\n - \r\n
\r\n \r\n - \r\n
\r\n
\r\n
\r\n\r\n\r\n | \r\n | \r\n
\r\n\r\n | \r\n | \r\n
\r\n
\r\n\r\n\r\n\r\n','Auth/WebGUI/Recovery');
+delete from template where namespace='Auth/WebGUI/Expired' and templateId=1;
+INSERT INTO template (templateId,name,template,namespace) VALUES (1,'Default WebGUI Password Reset Template','\r\n \r\n\r\n\r\n\r\n \r\n\r\n\r\n\r\n\r\n\r\n\r\n | \r\n \r\n | \r\n \r\n \r\n | \r\n
\r\n\r\n | \r\n \r\n | \r\n \r\n \r\n | \r\n
\r\n\r\n | \r\n \r\n | \r\n \r\n \r\n | \r\n
\r\n\r\n | \r\n \r\n \r\n | \r\n
\r\n
\r\n','Auth/WebGUI/Expired');
+delete from template where namespace='Auth/LDAP/Account' and templateId=1;
+INSERT INTO template (templateId,name,template,namespace) VALUES (1,'Default LDAP Account Display Template','\r\n \r\n\r\n\r\n\r\n\r\n
\r\n\r\n\r\n | \r\n \r\n | \r\n \r\n \r\n | \r\n
\r\n
\r\n\r\n','Auth/LDAP/Account');
+delete from template where namespace='Auth/LDAP/Create' and templateId=1;
+INSERT INTO template (templateId,name,template,namespace) VALUES (1,'Default LDAP Anonymous Registration Template','\r\n \r\n\r\n\r\n\r\n \r\n\r\n\r\n\r\n\r\n\r\n\r\n | \r\n | \r\n
\r\n\r\n | \r\n | \r\n
\r\n\r\n | \r\n | \r\n
\r\n\r\n\r\n | \r\n | \r\n
\r\n\r\n\r\n | \r\n | \r\n
\r\n
\r\n\r\n\r\n\r\n','Auth/LDAP/Create');
+delete from template where namespace='Auth/LDAP/Login' and templateId=1;
+INSERT INTO template (templateId,name,template,namespace) VALUES (1,'Default LDAP Login Template','\r\n \r\n\r\n\r\n\r\n \r\n\r\n\r\n\r\n\r\n\r\n\r\n | \r\n | \r\n
\r\n\r\n | \r\n | \r\n
\r\n\r\n | \r\n | \r\n
\r\n
\r\n\r\n\r\n\r\n
\r\n \r\n - \r\n
\r\n \r\n - \r\n
\r\n
\r\n