a crapload of authentication fixes
This commit is contained in:
JT Smith
parent
976d01d4ff
commit
4c4d730162
5 changed files with 98 additions and 132 deletions
|
|
@ -257,27 +257,16 @@ insert into international (internationalId,languageId,namespace,message,lastUpda
|
|||
|
||||
|
||||
delete from template where namespace='Auth/WebGUI/Login' and templateId=1;
|
||||
INSERT INTO template (templateId,name,template,namespace) VALUES (1,'Default WebGUI Login Template','<tmpl_if displayTitle>\r\n <tmpl_var displayTitle>\r\n</tmpl_if>\r\n\r\n<tmpl_if login.message>\r\n <tmpl_var login.message>\r\n</tmpl_if>\r\n\r\n<tmpl_var login.form.header>\r\n<table >\r\n<tmpl_var login.form.hidden>\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\"><tmpl_var login.form.username.label></td>\r\n <td class=\"tableData\"><tmpl_var login.form.username></td>\r\n</tr>\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\"><tmpl_var login.form.password.label></td>\r\n <td class=\"tableData\"><tmpl_var login.form.password></td>\r\n</tr>\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\"></td>\r\n <td class=\"tableData\"><tmpl_var login.form.submit></td>\r\n</tr>\r\n</table>\r\n<tmpl_var login.form.footer>\r\n\r\n<div class=\"accountOptions\">\r\n <ul>\r\n <tmpl_if login.options.passwordRecovery>\r\n <li><tmpl_var login.options.passwordRecovery>\r\n </tmpl_if>\r\n <tmpl_if login.options.anonymousRegistration>\r\n <li><tmpl_var login.options.anonymousRegistration>\r\n </tmpl_if>\r\n </ul>\r\n</div>','Auth/WebGUI/Login');
|
||||
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','<tmpl_if displayTitle>\r\n <tmpl_var displayTitle>\r\n</tmpl_if>\r\n\r\n<tmpl_if account.message>\r\n <tmpl_var account.message>\r\n</tmpl_if>\r\n\r\n<tmpl_var account.form.header>\r\n<table >\r\n<tmpl_var account.form.hidden>\r\n<tmpl_if account.form.karma>\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\"><tmpl_var account.form.karma.label></td>\r\n <td class=\"tableData\"><tmpl_var account.form.karma></td>\r\n</tr>\r\n</tmpl_if>\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\"><tmpl_var account.form.username.label></td>\r\n <td class=\"tableData\"><tmpl_var account.form.username></td>\r\n</tr>\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\"><tmpl_var account.form.password.label></td>\r\n <td class=\"tableData\"><tmpl_var account.form.password></td>\r\n</tr>\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\"><tmpl_var account.form.passwordConfirm.label></td>\r\n <td class=\"tableData\"><tmpl_var account.form.passwordConfirm></td>\r\n</tr>\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\"></td>\r\n <td class=\"tableData\"><tmpl_var account.form.submit></td>\r\n</tr>\r\n</table>\r\n<tmpl_var account.form.footer>\r\n\r\n<div class=\"accountOptions\">\r\n <ul>\r\n <tmpl_loop account.options>\r\n <li><tmpl_var options.display>\r\n </tmpl_loop>\r\n </ul>\r\n</div>','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','<tmpl_if displayTitle>\r\n <tmpl_var displayTitle>\r\n</tmpl_if>\r\n\r\n<tmpl_if create.message>\r\n <tmpl_var create.message>\r\n</tmpl_if>\r\n\r\n<tmpl_var create.form.header>\r\n<table >\r\n<tmpl_var create.form.hidden>\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\"><tmpl_var create.form.username.label></td>\r\n <td class=\"tableData\"><tmpl_var create.form.username></td>\r\n</tr>\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\"><tmpl_var create.form.password.label></td>\r\n <td class=\"tableData\"><tmpl_var create.form.password></td>\r\n</tr>\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\"><tmpl_var create.form.passwordConfirm.label></td>\r\n <td class=\"tableData\"><tmpl_var create.form.passwordConfirm></td>\r\n</tr>\r\n<tmpl_loop create.form.profile>\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\"><tmpl_var profile.formElement.label></td>\r\n <td class=\"tableData\"><tmpl_var profile.formElement></td>\r\n</tr>\r\n</tmpl_loop>\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\"></td>\r\n <td class=\"tableData\"><tmpl_var create.form.submit></td>\r\n</tr>\r\n</table>\r\n<tmpl_var create.form.footer>\r\n\r\n\r\n<div class=\"accountOptions\">\r\n <ul>\r\n <li><tmpl_var create.options.accountExists>\r\n <tmpl_if create.options.passwordRecovery>\r\n <li><tmpl_var create.options.passwordRecovery>\r\n </tmpl_if>\r\n </ul>\r\n</div>','Auth/WebGUI/Create');
|
||||
delete from template where namespace='Auth/WebGUI/Recovery' and templateId=1;
|
||||
INSERT INTO template (templateId,name,template,namespace) VALUES (1,'Default WebGUI Password Recovery Template','<tmpl_if displayTitle>\r\n <tmpl_var displayTitle>\r\n</tmpl_if>\r\n\r\n<tmpl_if recover.message>\r\n <tmpl_var recover.message>\r\n</tmpl_if>\r\n\r\n<tmpl_var recover.form.header>\r\n<table >\r\n<tmpl_var recover.form.hidden>\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\"><tmpl_var recover.form.email.label></td>\r\n <td class=\"tableData\"><tmpl_var recover.form.email></td>\r\n</tr>\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\"></td>\r\n <td class=\"tableData\"><tmpl_var recover.form.submit></td>\r\n</tr>\r\n</table>\r\n<tmpl_var recover.form.footer>\r\n\r\n\r\n<div class=\"accountOptions\">\r\n <ul>\r\n <tmpl_if recover.options.anonymousRegistration>\r\n <li><tmpl_var recover.options.anonymousRegistration>\r\n </tmpl_if>\r\n <li><tmpl_var recover.options.accountExists>\r\n </ul>\r\n</div>','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','<tmpl_if displayTitle>\r\n <tmpl_var displayTitle>\r\n</tmpl_if>\r\n\r\n<tmpl_if expired.message>\r\n <tmpl_var expired.message>\r\n</tmpl_if>\r\n\r\n<tmpl_var expired.form.header>\r\n<table >\r\n<tmpl_var expired.form.hidden>\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\">\r\n <tmpl_var expired.form.oldPassword.label>\r\n </td>\r\n <td class=\"tableData\">\r\n <tmpl_var expired.form.oldPassword>\r\n </td>\r\n</tr>\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\">\r\n <tmpl_var expired.form.password.label>\r\n </td>\r\n <td class=\"tableData\">\r\n <tmpl_var expired.form.password>\r\n </td>\r\n</tr>\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\">\r\n <tmpl_var expired.form.passwordConfirm.label>\r\n </td>\r\n <td class=\"tableData\">\r\n <tmpl_var expired.form.passwordConfirm>\r\n </td>\r\n</tr>\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\"></td>\r\n <td class=\"tableData\">\r\n <tmpl_var expired.form.submit>\r\n </td>\r\n</tr>\r\n</table>\r\n<tmpl_var expired.form.footer>','Auth/WebGUI/Expired');
|
||||
delete from template where namespace='Auth/LDAP/Login' and templateId=1;
|
||||
INSERT INTO template (templateId,name,template,namespace) VALUES (1,'Default LDAP Login Template','<tmpl_if displayTitle>\r\n <tmpl_var displayTitle>\r\n</tmpl_if>\r\n\r\n<tmpl_if login.message>\r\n <tmpl_var login.message>\r\n</tmpl_if>\r\n\r\n<tmpl_var login.form.header>\r\n<table >\r\n<tmpl_var login.form.hidden>\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\"><tmpl_var login.form.username.label></td>\r\n <td class=\"tableData\"><tmpl_var login.form.username></td>\r\n</tr>\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\"><tmpl_var login.form.password.label></td>\r\n <td class=\"tableData\"><tmpl_var login.form.password></td>\r\n</tr>\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\"></td>\r\n <td class=\"tableData\"><tmpl_var login.form.submit></td>\r\n</tr>\r\n</table>\r\n<tmpl_var login.form.footer>\r\n\r\n<div class=\"accountOptions\">\r\n <ul>\r\n <tmpl_if login.options.passwordRecovery>\r\n <li><tmpl_var login.options.passwordRecovery>\r\n </tmpl_if>\r\n <tmpl_if login.options.anonymousRegistration>\r\n <li><tmpl_var login.options.anonymousRegistration>\r\n </tmpl_if>\r\n </ul>\r\n</div>','Auth/LDAP/Login');
|
||||
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','<tmpl_if displayTitle>\r\n <tmpl_var displayTitle>\r\n</tmpl_if>\r\n\r\n<tmpl_var account.message>\r\n<tmpl_if account.form.karma>\r\n<br><br>\r\n<table>\r\n<tr>\r\n <td class=\"formDescription\">\r\n <tmpl_var account.form.karma.label>\r\n </td>\r\n <td class=\"tableData\">\r\n <tmpl_var account.form.karma>\r\n </td>\r\n</tr>\r\n</table>\r\n</tmpl_if>\r\n\r\n<div class=\"accountOptions\">\r\n <ul>\r\n <tmpl_loop account.options>\r\n <li><tmpl_var options.display>\r\n </tmpl_loop>\r\n </ul>\r\n</div>','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','<tmpl_if displayTitle>\r\n <tmpl_var displayTitle>\r\n</tmpl_if>\r\n\r\n<tmpl_if create.message>\r\n <tmpl_var create.message>\r\n</tmpl_if>\r\n\r\n<tmpl_var create.form.header>\r\n<table >\r\n<tmpl_var create.form.hidden>\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\"><tmpl_var create.form.ldapId.label></td>\r\n <td class=\"tableData\"><tmpl_var create.form.ldapId></td>\r\n</tr>\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\"><tmpl_var create.form.password.label></td>\r\n <td class=\"tableData\"><tmpl_var create.form.password></td>\r\n</tr>\r\n<tmpl_loop create.form.profile>\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\"><tmpl_var profile.formElement.label></td>\r\n <td class=\"tableData\"><tmpl_var profile.formElement></td>\r\n</tr>\r\n</tmpl_loop>\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\"></td>\r\n <td class=\"tableData\"><tmpl_var create.form.submit></td>\r\n</tr>\r\n</table>\r\n<tmpl_var create.form.footer>\r\n\r\n\r\n<div class=\"accountOptions\">\r\n <ul>\r\n <li><tmpl_var create.options.accountExists>\r\n <tmpl_if create.options.passwordRecovery>\r\n <li><tmpl_var create.options.passwordRecovery>\r\n </tmpl_if>\r\n </ul>\r\n</div>','Auth/LDAP/Create');
|
||||
delete from template where namespace='Auth/SMB/Login' and templateId=1;
|
||||
INSERT INTO template (templateId,name,template,namespace) VALUES (1,'Default SMB Login Template','<tmpl_if displayTitle>\r\n <tmpl_var displayTitle>\r\n</tmpl_if>\r\n\r\n<tmpl_if login.message>\r\n <tmpl_var login.message>\r\n</tmpl_if>\r\n\r\n<tmpl_var login.form.header>\r\n<table >\r\n<tmpl_var login.form.hidden>\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\"><tmpl_var login.form.username.label></td>\r\n <td class=\"tableData\"><tmpl_var login.form.username></td>\r\n</tr>\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\"><tmpl_var login.form.password.label></td>\r\n <td class=\"tableData\"><tmpl_var login.form.password></td>\r\n</tr>\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\"></td>\r\n <td class=\"tableData\"><tmpl_var login.form.submit></td>\r\n</tr>\r\n</table>\r\n<tmpl_var login.form.footer>\r\n\r\n<div class=\"accountOptions\">\r\n <ul>\r\n <tmpl_if login.options.passwordRecovery>\r\n <li><tmpl_var login.options.passwordRecovery>\r\n </tmpl_if>\r\n <tmpl_if login.options.anonymousRegistration>\r\n <li><tmpl_var login.options.anonymousRegistration>\r\n </tmpl_if>\r\n </ul>\r\n</div>','Auth/SMB/Login');
|
||||
delete from template where namespace='Auth/SMB/Account' and templateId=1;
|
||||
INSERT INTO template (templateId,name,template,namespace) VALUES (1,'Default SMB Account Display Template','<tmpl_if displayTitle>\r\n <tmpl_var displayTitle>\r\n</tmpl_if>\r\n\r\n<tmpl_var account.message>\r\n<tmpl_if account.form.karma>\r\n<br><br>\r\n<table>\r\n<tr>\r\n <td class=\"formDescription\">\r\n <tmpl_var account.form.karma.label>\r\n </td>\r\n <td class=\"tableData\">\r\n <tmpl_var account.form.karma>\r\n </td>\r\n</tr>\r\n</table>\r\n</tmpl_if>\r\n<div class=\"accountOptions\">\r\n <ul>\r\n <tmpl_loop account.options>\r\n <li><tmpl_var options.display>\r\n </tmpl_loop>\r\n </ul>\r\n</div>','Auth/SMB/Account');
|
||||
delete from template where namespace='Auth/SMB/Create' and templateId=1;
|
||||
INSERT INTO template (templateId,name,template,namespace) VALUES (1,'Default SMB Anonymous Registration Template','<tmpl_if displayTitle>\r\n <tmpl_var displayTitle>\r\n</tmpl_if>\r\n\r\n<tmpl_if create.message>\r\n <tmpl_var create.message>\r\n</tmpl_if>\r\n\r\n<tmpl_var create.form.header>\r\n<table >\r\n<tmpl_var create.form.hidden>\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\"><tmpl_var create.form.loginId.label></td>\r\n <td class=\"tableData\"><tmpl_var create.form.loginId></td>\r\n</tr>\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\"><tmpl_var create.form.password.label></td>\r\n <td class=\"tableData\"><tmpl_var create.form.password></td>\r\n</tr>\r\n<tmpl_loop create.form.profile>\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\"><tmpl_var profile.formElement.label></td>\r\n <td class=\"tableData\"><tmpl_var profile.formElement></td>\r\n</tr>\r\n</tmpl_loop>\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\"></td>\r\n <td class=\"tableData\"><tmpl_var create.form.submit></td>\r\n</tr>\r\n</table>\r\n<tmpl_var create.form.footer>\r\n\r\n\r\n<div class=\"accountOptions\">\r\n <ul>\r\n <li><tmpl_var create.options.accountExists>\r\n <tmpl_if create.options.passwordRecovery>\r\n <li><tmpl_var create.options.passwordRecovery>\r\n </tmpl_if>\r\n </ul>\r\n</div>','Auth/SMB/Create');
|
||||
delete from template where namespace='Operation/MessageLog/View' and templateId=1;
|
||||
INSERT INTO template (templateId,name,template,namespace) VALUES (1,'Default Messsage Log Display Template','<h1><tmpl_var displayTitle></h1>\r\n\r\n<table width=\"100%\" cellspacing=1 cellpadding=2 border=0>\r\n<tr>\r\n <td class=\"tableHeader\">\r\n <tmpl_var message.subject.label>\r\n </td>\r\n <td class=\"tableHeader\">\r\n <tmpl_var message.status.label>\r\n </td>\r\n <td class=\"tableHeader\">\r\n <tmpl_var message.dateOfEntry.label>\r\n </td>\r\n</tr>\r\n<tmpl_if message.noresults>\r\n <tr>\r\n <td class=\"tableData\">\r\n <tmpl_var message.noresults>\r\n </td>\r\n <td class=\"tableData\">\r\n \r\n </td>\r\n <td class=\"tableData\">\r\n \r\n </td>\r\n </tr>\r\n<tmpl_else>\r\n <tmpl_loop message.loop>\r\n <tr>\r\n <td class=\"tableData\">\r\n <tmpl_var message.subject>\r\n </td>\r\n <td class=\"tableData\">\r\n <tmpl_var message.status>\r\n </td>\r\n <td class=\"tableData\">\r\n <tmpl_var message.dateOfEntry>\r\n </td>\r\n </tr>\r\n </tmpl_loop>\r\n</tmpl_if>\r\n</table>\r\n<tmpl_if message.multiplePages>\r\n <div class=\"pagination\">\r\n <tmpl_var message.previousPage> · <tmpl_var message.pageList> · <tmpl_var message.nextPage>\r\n </div>\r\n</tmpl_if>\r\n<div class=\"accountOptions\">\r\n <ul>\r\n <tmpl_loop message.accountOptions>\r\n <li><tmpl_var options.display>\r\n </tmpl_loop>\r\n </ul>\r\n</div>','Operation/MessageLog/View');
|
||||
delete from template where namespace='Operation/MessageLog/Message' and templateId=1;
|
||||
|
|
@ -682,4 +671,18 @@ INSERT INTO help VALUES (81,'WebGUI',1089,1090,'58,WebGUI;79,WebGUI;80,WebGUI;50
|
|||
INSERT INTO template VALUES (8,'Synopsis','<div class=\"synopsis\">\r\n<tmpl_loop page_loop>\r\n <div class=\"synopsis_title\">\r\n <a href=\"<tmpl_var page.url>\"><tmpl_var page.menuTitle></a>\r\n </div>\r\n <tmpl_if page.indent>\r\n <div class=\"synopsis_sub\">\r\n <tmpl_var page.synopsis>\r\n </div>\r\n <tmpl_else>\r\n <div class=\"synopsis_summary\">\r\n <tmpl_var page.synopsis>\r\n </div>\r\n </tmpl_if>\r\n</tmpl_loop>\r\n</div>','Navigation');
|
||||
INSERT INTO Navigation VALUES (18,'Synopsis',99,'self_and_descendants','current',-1,8,0,0,0,0);
|
||||
alter table forum add column groupToView int not null default 7;
|
||||
INSERT INTO template VALUES (1,'Default WebGUI Login Template','<h1>\n <tmpl_var title>\n</h1>\n\n<tmpl_if login.message>\r\n <tmpl_var login.message>\r\n</tmpl_if>\r\n\r\n<tmpl_var login.form.header>\r\n<table >\r\n<tmpl_var login.form.hidden>\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\"><tmpl_var login.form.username.label></td>\r\n <td class=\"tableData\"><tmpl_var login.form.username></td>\r\n</tr>\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\"><tmpl_var login.form.password.label></td>\r\n <td class=\"tableData\"><tmpl_var login.form.password></td>\r\n</tr>\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\"></td>\r\n <td class=\"tableData\"><tmpl_var login.form.submit></td>\r\n</tr>\r\n</table>\r\n<tmpl_var login.form.footer>\r\n\r\n<div class=\"accountOptions\">\r\n <ul>\n <tmpl_if recoverPassword.isAllowed>\n <li><a href=\"<tmpl_var recoverPassword.url>\"><tmpl_var recoverPassword.label></a></li>\n </tmpl_if>\n <tmpl_if anonymousRegistration.isAllowed>\n <li><a href=\"<tmpl_var createAccount.url>\"><tmpl_var createAccount.label></a></li>\n </tmpl_if>\r\n </ul>\r\n</div>','Auth/WebGUI/Login',1,1);
|
||||
INSERT INTO template VALUES (1,'Default WebGUI Account Display Template','<h1>\n <tmpl_var title>\n</h1>\n\n\n<tmpl_if account.message>\r\n <tmpl_var account.message>\r\n</tmpl_if>\r\n\r\n<tmpl_var account.form.header>\r\n<table >\r\n\n<tmpl_if account.form.karma>\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\"><tmpl_var account.form.karma.label></td>\r\n <td class=\"tableData\"><tmpl_var account.form.karma></td>\r\n</tr>\r\n</tmpl_if>\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\"><tmpl_var account.form.username.label></td>\r\n <td class=\"tableData\"><tmpl_var account.form.username></td>\r\n</tr>\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\"><tmpl_var account.form.password.label></td>\r\n <td class=\"tableData\"><tmpl_var account.form.password></td>\r\n</tr>\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\"><tmpl_var account.form.passwordConfirm.label></td>\r\n <td class=\"tableData\"><tmpl_var account.form.passwordConfirm></td>\r\n</tr>\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\"></td>\r\n <td class=\"tableData\"><tmpl_var account.form.submit></td>\r\n</tr>\r\n</table>\r\n<tmpl_var account.form.footer>\r\n\r\n<div class=\"accountOptions\">\r\n <ul>\r\n <tmpl_loop account.options>\r\n <li><tmpl_var options.display>\r\n </tmpl_loop>\r\n </ul>\r\n</div>','Auth/WebGUI/Account',1,1);
|
||||
INSERT INTO template VALUES (1,'Default WebGUI Anonymous Registration Template',' <h1><tmpl_var title></h1>\r\n\n<tmpl_if create.message>\r\n <tmpl_var create.message>\r\n</tmpl_if>\r\n\r\n<tmpl_var create.form.header>\r\n<table >\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\"><tmpl_var create.form.username.label></td>\r\n <td class=\"tableData\"><tmpl_var create.form.username></td>\r\n</tr>\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\"><tmpl_var create.form.password.label></td>\r\n <td class=\"tableData\"><tmpl_var create.form.password></td>\r\n</tr>\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\"><tmpl_var create.form.passwordConfirm.label></td>\r\n <td class=\"tableData\"><tmpl_var create.form.passwordConfirm></td>\r\n</tr>\r\n<tmpl_loop create.form.profile>\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\"><tmpl_var profile.formElement.label></td>\r\n <td class=\"tableData\"><tmpl_var profile.formElement></td>\r\n</tr>\r\n</tmpl_loop>\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\"></td>\r\n <td class=\"tableData\"><tmpl_var create.form.submit></td>\r\n</tr>\r\n</table>\r\n<tmpl_var create.form.footer>\r\n\r\n<div class=\"accountOptions\">\r\n <ul>\r\n <li><a href=\"<tmpl_var login.url>\"><tmpl_var login.label></a></li>\r\n <tmpl_if recoverPassword.isAllowed>\r\n <li><a href=\"<tmpl_var recoverPassword.url>\"><tmpl_var recoverPassword.label></a></li>\n </tmpl_if>\r\n </ul>\r\n</div>','Auth/WebGUI/Create',1,1);
|
||||
INSERT INTO template VALUES (1,'Default WebGUI Password Recovery Template','<h1>\n <tmpl_var title>\n</h1>\n\r\n\r\n<tmpl_if recover.message>\r\n <tmpl_var recover.message>\r\n</tmpl_if>\r\n\r\n<tmpl_var recover.form.header>\r\n<table >\r\n<tmpl_var recover.form.hidden>\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\"><tmpl_var recover.form.email.label></td>\r\n <td class=\"tableData\"><tmpl_var recover.form.email></td>\r\n</tr>\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\"></td>\r\n <td class=\"tableData\"><tmpl_var recover.form.submit></td>\r\n</tr>\r\n</table>\r\n<tmpl_var recover.form.footer>\r\n\r\n\r\n<div class=\"accountOptions\">\r\n <ul>\n <tmpl_if anonymousRegistration.isAllowed>\n <li><a href=\"<tmpl_var createAccount.url>\"><tmpl_var createAccount.label></a></li>\n </tmpl_if>\n <li><a href=\"<tmpl_var login.url>\"><tmpl_var login.label></a></li>\n \r\n </ul>\r\n</div>','Auth/WebGUI/Recovery',1,1);
|
||||
INSERT INTO template VALUES (1,'Default WebGUI Password Reset Template','<h1>\n <tmpl_var title>\n</h1>\n\r\n<tmpl_if expired.message>\r\n <tmpl_var expired.message>\r\n</tmpl_if>\r\n\r\n<tmpl_var expired.form.header>\r\n<table >\r\n<tmpl_var expired.form.hidden>\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\">\r\n <tmpl_var expired.form.oldPassword.label>\r\n </td>\r\n <td class=\"tableData\">\r\n <tmpl_var expired.form.oldPassword>\r\n </td>\r\n</tr>\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\">\r\n <tmpl_var expired.form.password.label>\r\n </td>\r\n <td class=\"tableData\">\r\n <tmpl_var expired.form.password>\r\n </td>\r\n</tr>\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\">\r\n <tmpl_var expired.form.passwordConfirm.label>\r\n </td>\r\n <td class=\"tableData\">\r\n <tmpl_var expired.form.passwordConfirm>\r\n </td>\r\n</tr>\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\"></td>\r\n <td class=\"tableData\">\r\n <tmpl_var expired.form.submit>\r\n </td>\r\n</tr>\r\n</table>\r\n<tmpl_var expired.form.footer>','Auth/WebGUI/Expired',1,1);
|
||||
INSERT INTO template VALUES (1,'Default LDAP Login Template','<h1>\n <tmpl_var title>\n</h1>\r\n<tmpl_if login.message>\r\n <tmpl_var login.message>\r\n</tmpl_if>\r\n\r\n<tmpl_var login.form.header>\r\n<table >\r\n<tmpl_var login.form.hidden>\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\"><tmpl_var login.form.username.label></td>\r\n <td class=\"tableData\"><tmpl_var login.form.username></td>\r\n</tr>\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\"><tmpl_var login.form.password.label></td>\r\n <td class=\"tableData\"><tmpl_var login.form.password></td>\r\n</tr>\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\"></td>\r\n <td class=\"tableData\"><tmpl_var login.form.submit></td>\r\n</tr>\r\n</table>\r\n<tmpl_var login.form.footer>\r\n\r\n<div class=\"accountOptions\">\r\n <ul>\r\n <tmpl_if anonymousRegistration.isAllowed>\n <li><a href=\"<tmpl_var createAccount.url>\"><tmpl_var createAccount.label></a></li>\n </tmpl_if>\n\n </ul>\r\n</div>','Auth/LDAP/Login',1,1);
|
||||
INSERT INTO template VALUES (1,'Default LDAP Account Display Template','<h1>\n <tmpl_var title>\n</h1>\n\n\r\n<tmpl_var account.message>\r\n<tmpl_if account.form.karma>\r\n<br><br>\r\n<table>\r\n<tr>\r\n <td class=\"formDescription\">\r\n <tmpl_var account.form.karma.label>\r\n </td>\r\n <td class=\"tableData\">\r\n <tmpl_var account.form.karma>\r\n </td>\r\n</tr>\r\n</table>\r\n</tmpl_if>\r\n\r\n<div class=\"accountOptions\">\r\n <ul>\r\n <tmpl_loop account.options>\r\n <li><tmpl_var options.display>\r\n </tmpl_loop>\r\n </ul>\r\n</div>','Auth/LDAP/Account',1,1);
|
||||
INSERT INTO template VALUES (1,'Default LDAP Anonymous Registration Template','<h1>\n <tmpl_var title>\r\n</h1>\n<tmpl_if create.message>\r\n <tmpl_var create.message>\r\n</tmpl_if>\r\n\r\n<tmpl_var create.form.header>\r\n<table >\r\n<tmpl_var create.form.hidden>\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\"><tmpl_var create.form.ldapId.label></td>\r\n <td class=\"tableData\"><tmpl_var create.form.ldapId></td>\r\n</tr>\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\"><tmpl_var create.form.password.label></td>\r\n <td class=\"tableData\"><tmpl_var create.form.password></td>\r\n</tr>\r\n<tmpl_loop create.form.profile>\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\"><tmpl_var profile.formElement.label></td>\r\n <td class=\"tableData\"><tmpl_var profile.formElement></td>\r\n</tr>\r\n</tmpl_loop>\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\"></td>\r\n <td class=\"tableData\"><tmpl_var create.form.submit></td>\r\n</tr>\r\n</table>\r\n<tmpl_var create.form.footer>\r\n\r\n\r\n<div class=\"accountOptions\">\r\n <ul>\n <li><a href=\"<tmpl_var login.url>\"><tmpl_var login.label></a></li>\n \n </ul>\r\n</div>','Auth/LDAP/Create',1,1);
|
||||
INSERT INTO template VALUES (1,'Default SMB Login Template','<h1>\n <tmpl_var title>\n</h1>\n\n\r\n<tmpl_if login.message>\r\n <tmpl_var login.message>\r\n</tmpl_if>\r\n\r\n<tmpl_var login.form.header>\r\n<table >\r\n<tmpl_var login.form.hidden>\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\"><tmpl_var login.form.username.label></td>\r\n <td class=\"tableData\"><tmpl_var login.form.username></td>\r\n</tr>\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\"><tmpl_var login.form.password.label></td>\r\n <td class=\"tableData\"><tmpl_var login.form.password></td>\r\n</tr>\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\"></td>\r\n <td class=\"tableData\"><tmpl_var login.form.submit></td>\r\n</tr>\r\n</table>\r\n<tmpl_var login.form.footer>\r\n\r\n<div class=\"accountOptions\">\r\n <ul>\n <tmpl_if anonymousRegistration.isAllowed>\n <li><a href=\"<tmpl_var createAccount.url>\"><tmpl_var createAccount.label></a></li>\n </tmpl_if>\n </ul>\r\n</div>','Auth/SMB/Login',1,1);
|
||||
INSERT INTO template VALUES (1,'Default SMB Account Display Template','<h1>\n <tmpl_var title>\n</h1>\n\n\r\n<tmpl_var account.message>\r\n<tmpl_if account.form.karma>\r\n<br><br>\r\n<table>\r\n<tr>\r\n <td class=\"formDescription\">\r\n <tmpl_var account.form.karma.label>\r\n </td>\r\n <td class=\"tableData\">\r\n <tmpl_var account.form.karma>\r\n </td>\r\n</tr>\r\n</table>\r\n</tmpl_if>\r\n<div class=\"accountOptions\">\r\n <ul>\r\n <tmpl_loop account.options>\r\n <li><tmpl_var options.display>\r\n </tmpl_loop>\r\n </ul>\r\n</div>','Auth/SMB/Account',1,1);
|
||||
INSERT INTO template VALUES (1,'Default SMB Anonymous Registration Template','<h1> \n <tmpl_var title>\r\n</h1>\n<tmpl_if create.message>\r\n <tmpl_var create.message>\r\n</tmpl_if>\r\n\r\n<tmpl_var create.form.header>\r\n<table >\r\n<tmpl_var create.form.hidden>\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\"><tmpl_var create.form.loginId.label></td>\r\n <td class=\"tableData\"><tmpl_var create.form.loginId></td>\r\n</tr>\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\"><tmpl_var create.form.password.label></td>\r\n <td class=\"tableData\"><tmpl_var create.form.password></td>\r\n</tr>\r\n<tmpl_loop create.form.profile>\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\"><tmpl_var profile.formElement.label></td>\r\n <td class=\"tableData\"><tmpl_var profile.formElement></td>\r\n</tr>\r\n</tmpl_loop>\r\n<tr>\r\n <td class=\"formDescription\" valign=\"top\"></td>\r\n <td class=\"tableData\"><tmpl_var create.form.submit></td>\r\n</tr>\r\n</table>\r\n<tmpl_var create.form.footer>\r\n\r\n\r\n<div class=\"accountOptions\">\r\n <ul>\r\n <li><a href=\"<tmpl_var login.url>\"><tmpl_var login.label></a></li>\n\n </ul>\r\n</div>','Auth/SMB/Create',1,1);
|
||||
INSERT INTO template VALUES (1,'Default WebGUI Yes/No Prompt','<h1><tmpl_var title></h1>\n\n<p>\n<tmpl_var question>\n</p>\n\n<div align=\"center\">\n\n<a href=\"<tmpl_var yes.url>\"><tmpl_var yes.label></a>\n\n \n\n<a href=\"<tmpl_var no.url>\"><tmpl_var no.label></a>\n\n</div>\n','prompt',1,1);
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -70,35 +70,6 @@ sub _isDuplicateUsername {
|
|||
|
||||
#-------------------------------------------------------------------
|
||||
|
||||
=head2 _isValidPassword ( )
|
||||
|
||||
Validates the password.
|
||||
|
||||
=cut
|
||||
|
||||
sub _isValidPassword {
|
||||
my $self = shift;
|
||||
my $password = shift;
|
||||
my $confirm = shift;
|
||||
my $error = "";
|
||||
|
||||
if ($password ne $confirm) {
|
||||
$error .= '<li>'.WebGUI::International::get(3,'Auth/WebGUI');
|
||||
}
|
||||
if ($password eq "") {
|
||||
$error .= '<li>'.WebGUI::International::get(4,'Auth/WebGUI');
|
||||
}
|
||||
|
||||
if ($self->getSetting("passwordLength") && length($password) < $self->getSetting("passwordLength")){
|
||||
$error .= '<li>'.WebGUI::International::get(7,'Auth/WebGUI')." ".$self->getSetting("passwordLength");
|
||||
}
|
||||
|
||||
$self->error($error);
|
||||
return $error eq "";
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
|
||||
=head2 _isValidUsername ( username )
|
||||
|
||||
Validates the username passed in.
|
||||
|
|
@ -232,11 +203,11 @@ sub createAccount {
|
|||
my $method = $_[0];
|
||||
my $vars = $_[1];
|
||||
my $template = $_[2] || 'Auth/'.$self->authMethod.'/Create';
|
||||
$vars->{displayTitle} = '<h1>'.WebGUI::International::get(54).'</h1>';
|
||||
$vars->{title} = WebGUI::International::get(54);
|
||||
|
||||
$vars->{'create.form.header'} = "\n\n".WebGUI::Form::formHeader({});
|
||||
$vars->{'create.form.hidden'} .= WebGUI::Form::hidden({"name"=>"op","value"=>"auth"});
|
||||
$vars->{'create.form.hidden'} .= WebGUI::Form::hidden({"name"=>"method","value"=>$method});
|
||||
$vars->{'create.form.header'} = WebGUI::Form::formHeader({});
|
||||
$vars->{'create.form.header'} .= WebGUI::Form::hidden({"name"=>"op","value"=>"auth"});
|
||||
$vars->{'create.form.header'} .= WebGUI::Form::hidden({"name"=>"method","value"=>$method});
|
||||
|
||||
#User Defined Options
|
||||
$vars->{'create.form.profile'} = WebGUI::Operation::Profile::getRequiredProfileFields();
|
||||
|
|
@ -244,11 +215,9 @@ sub createAccount {
|
|||
$vars->{'create.form.submit'} = WebGUI::Form::submit({});
|
||||
$vars->{'create.form.footer'} = "</form>";
|
||||
|
||||
$vars->{'create.options.accountExists'} = '<a href="'.WebGUI::URL::page('op=auth&method=init').'">'.WebGUI::International::get(58).'</a>';
|
||||
$vars->{'login.url'} = WebGUI::URL::page('op=auth&method=init');
|
||||
$vars->{'login.label'} = WebGUI::International::get(58);
|
||||
|
||||
if ($self->getSetting("passwordRecovery")) {
|
||||
$vars->{'create.options.passwordRecovery'} = '<a href="'.WebGUI::URL::page('op=recoverPassword').'">'.WebGUI::International::get(59).'</a>';
|
||||
}
|
||||
return WebGUI::Template::process(WebGUI::Template::get(1,$template), $vars);
|
||||
}
|
||||
|
||||
|
|
@ -328,14 +297,16 @@ sub createAccountSave {
|
|||
sub deactivateAccount {
|
||||
my $self = shift;
|
||||
my $method = $_[0];
|
||||
my ($output);
|
||||
return WebGUI::Privilege::vitalComponent() if($self->userId < 26);
|
||||
return WebGUI::Privilege::adminOnly() if(!$session{setting}{selfDeactivation});
|
||||
$output = '<h1>'.WebGUI::International::get(42).'</h1>';
|
||||
$output .= WebGUI::International::get(60).'<p>';
|
||||
$output .= '<div align="center"><a href="'.WebGUI::URL::page('op=auth&method='.$method).'">'.WebGUI::International::get(44).'</a>';
|
||||
$output .= ' <a href="'.WebGUI::URL::page().'">'.WebGUI::International::get(45).'</a></div>';
|
||||
return $output;
|
||||
my %var;
|
||||
$var{title} = WebGUI::International::get(42);
|
||||
$var{question} = WebGUI::International::get(60);
|
||||
$var{'yes.url'} = WebGUI::URL::page('op=auth&method='.$method);
|
||||
$var{'yes.label'} = WebGUI::International::get(44);
|
||||
$var{'no.url'} = WebGUI::URL::page();
|
||||
$var{'no.label'} = WebGUI::International::get(45);
|
||||
return WebGUI::Template::process(WebGUI::Template::get(1,"prompt"), \%var);
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
|
|
@ -395,11 +366,11 @@ sub displayAccount {
|
|||
my $vars = $_[1];
|
||||
my $template = $_[2] || 'Auth/'.$self->authMethod.'/Account';
|
||||
|
||||
$vars->{displayTitle} = '<h1>'.WebGUI::International::get(61).'</h1>';
|
||||
$vars->{title} = WebGUI::International::get(61);
|
||||
|
||||
$vars->{'account.form.header'} = "\n\n".WebGUI::Form::formHeader({});
|
||||
$vars->{'account.form.hidden'} = WebGUI::Form::hidden({"name"=>"op","value"=>"auth"});
|
||||
$vars->{'account.form.hidden'} .= WebGUI::Form::hidden({"name"=>"method","value"=>$method});
|
||||
$vars->{'account.form.header'} = WebGUI::Form::formHeader({});
|
||||
$vars->{'account.form.header'} = WebGUI::Form::hidden({"name"=>"op","value"=>"auth"});
|
||||
$vars->{'account.form.header'} .= WebGUI::Form::hidden({"name"=>"method","value"=>$method});
|
||||
if($session{setting}{useKarma}){
|
||||
$vars->{'account.form.karma'} = $session{user}{karma};
|
||||
$vars->{'account.form.karma.label'} = WebGUI::International::get(537);
|
||||
|
|
@ -445,8 +416,8 @@ sub displayLogin {
|
|||
WebGUI::Session::setScratch("redirectAfterLogin",$session{env}{REQUEST_URI});
|
||||
}
|
||||
|
||||
$vars->{displayTitle} = '<h1>'.WebGUI::International::get(66).'</h1>';
|
||||
$vars->{'login.form.header'} = "\n\n".WebGUI::Form::formHeader({});
|
||||
$vars->{title} = WebGUI::International::get(66);
|
||||
$vars->{'login.form.header'} = WebGUI::Form::formHeader({});
|
||||
if ($session{setting}{encryptLogin}) {
|
||||
$vars->{'login.form.header'} =~ s/http:/https:/;
|
||||
}
|
||||
|
|
@ -459,12 +430,9 @@ sub displayLogin {
|
|||
$vars->{'login.form.submit'} = WebGUI::Form::submit({"value"=>WebGUI::International::get(52)});
|
||||
$vars->{'login.form.footer'} = "</form>";
|
||||
|
||||
if ($session{setting}{anonymousRegistration}) {
|
||||
$vars->{'login.options.anonymousRegistration'} = '<a href="'.WebGUI::URL::page('op=createAccount').'">'.WebGUI::International::get(67).'</a>';
|
||||
}
|
||||
if ($self->getSetting("passwordRecovery")) {
|
||||
$vars->{'login.options.passwordRecovery'} = '<a href="'.WebGUI::URL::page('op=recoverPassword').'">'.WebGUI::International::get(59).'</a>';
|
||||
}
|
||||
$vars->{'anonymousRegistration.isAllowed'} = ($session{setting}{anonymousRegistration});
|
||||
$vars->{'createAccount.url'} = WebGUI::URL::page('op=createAccount');
|
||||
$vars->{'createAccount.label'} = WebGUI::International::get(67);
|
||||
return WebGUI::Template::process(WebGUI::Template::get(1,$template), $vars);
|
||||
}
|
||||
|
||||
|
|
@ -669,51 +637,6 @@ sub profile {
|
|||
}
|
||||
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
=head2 recoverPassword ( method [,vars,template] )
|
||||
|
||||
Superclass method that performs general functionality for creating new accounts.
|
||||
|
||||
=over
|
||||
|
||||
=item method
|
||||
|
||||
Auth method that the form for recovering passwords should call
|
||||
|
||||
=item vars
|
||||
|
||||
Array ref of template vars from subclass
|
||||
|
||||
=item template
|
||||
|
||||
Template that this class should use for display purposes
|
||||
|
||||
=back
|
||||
|
||||
=cut
|
||||
|
||||
sub recoverPassword {
|
||||
my $self = shift;
|
||||
my $method = $_[0];
|
||||
my $vars = $_[1];
|
||||
my $template = $_[2] || 'Auth/'.$self->authMethod.'/Recovery';
|
||||
|
||||
$vars->{displayTitle} = '<h1>'.WebGUI::International::get(71).'</h1>';
|
||||
|
||||
my $output = '<h1>'.WebGUI::International::get(71).'</h1>';
|
||||
$vars->{'recover.form.header'} = "\n\n".WebGUI::Form::formHeader({});
|
||||
$vars->{'recover.form.hidden'} = WebGUI::Form::hidden({"name"=>"op","value"=>"auth"});
|
||||
$vars->{'recover.form.hidden'} .= WebGUI::Form::hidden({"name"=>"method","value"=>$method});
|
||||
|
||||
$vars->{'recover.form.submit'} = WebGUI::Form::submit({});
|
||||
$vars->{'recover.form.footer'} = "</form>";
|
||||
|
||||
$vars->{'recover.options.accountExists'} = '<a href="'.WebGUI::URL::page('op=auth&method=init').'">'.WebGUI::International::get(73).'</a>';
|
||||
if ($session{setting}{anonymousRegistration}) {
|
||||
$vars->{'recover.options.anonymousRegistration'} = '<a href="'.WebGUI::URL::page('op=createAccount').'">'.WebGUI::International::get(67).'</a>';
|
||||
}
|
||||
return WebGUI::Template::process(WebGUI::Template::get(1,$template), $vars);
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
=head2 setCallable ( callableMethods )
|
||||
|
|
@ -814,17 +737,15 @@ sub username {
|
|||
|
||||
#-------------------------------------------------------------------
|
||||
|
||||
=head2 validUsernameAndPassword ( username,password,passwordConfirm )
|
||||
=head2 validUsername ( username )
|
||||
|
||||
Validates the a username and password.
|
||||
Validates the a username.
|
||||
|
||||
=cut
|
||||
|
||||
sub validUsernameAndPassword {
|
||||
sub validUsername {
|
||||
my $self = shift;
|
||||
my $username = $_[0];
|
||||
my $password = $_[1];
|
||||
my $passwordConfirm = $_[2];
|
||||
my $error = "";
|
||||
|
||||
if($self->_isDuplicateUsername($username)){
|
||||
|
|
@ -835,10 +756,6 @@ sub validUsernameAndPassword {
|
|||
$error .= $self->error;
|
||||
}
|
||||
|
||||
if(!$self->_isValidPassword($password,$passwordConfirm)){
|
||||
$error .= $self->error;
|
||||
}
|
||||
|
||||
$self->error($error);
|
||||
return $error eq "";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -217,8 +217,7 @@ sub createAccountSave {
|
|||
|
||||
|
||||
#Check that username is valid and not a duplicate in the system.
|
||||
$error .= $self->error if($self->_isDuplicateUsername($username));
|
||||
$error .= $self->error if(!$self->_isValidUsername($username));
|
||||
$error .= $self->error if($self->validUsername($username));
|
||||
#Validate profile data.
|
||||
my ($profile, $temp, $warning) = WebGUI::Operation::Profile::validateProfileData();
|
||||
$error .= $temp;
|
||||
|
|
|
|||
|
|
@ -124,8 +124,7 @@ sub createAccountSave {
|
|||
}
|
||||
|
||||
#Check that username is valid and not a duplicate in the system.
|
||||
$error .= $self->error if($self->_isDuplicateUsername($username));
|
||||
$error .= $self->error if(!$self->_isValidUsername($username));
|
||||
$error .= $self->error if($self->validUsername($username));
|
||||
#Validate profile data.
|
||||
my ($profile, $temp, $warning) = WebGUI::Operation::Profile::validateProfileData();
|
||||
$error .= $temp;
|
||||
|
|
|
|||
|
|
@ -23,6 +23,35 @@ use WebGUI::Utility;
|
|||
our @ISA = qw(WebGUI::Auth);
|
||||
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
|
||||
=head2 _isValidPassword ( )
|
||||
|
||||
Validates the password.
|
||||
|
||||
=cut
|
||||
|
||||
sub _isValidPassword {
|
||||
my $self = shift;
|
||||
my $password = shift;
|
||||
my $confirm = shift;
|
||||
my $error = "";
|
||||
|
||||
if ($password ne $confirm) {
|
||||
$error .= '<li>'.WebGUI::International::get(3,'Auth/WebGUI');
|
||||
}
|
||||
if ($password eq "") {
|
||||
$error .= '<li>'.WebGUI::International::get(4,'Auth/WebGUI');
|
||||
}
|
||||
|
||||
if ($self->getSetting("passwordLength") && length($password) < $self->getSetting("passwordLength")){
|
||||
$error .= '<li>'.WebGUI::International::get(7,'Auth/WebGUI')." ".$self->getSetting("passwordLength");
|
||||
}
|
||||
|
||||
$self->error($error);
|
||||
return $error eq "";
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
|
||||
=head2 addUserForm ( )
|
||||
|
|
@ -131,6 +160,9 @@ sub createAccount {
|
|||
$vars->{'create.form.passwordConfirm'} = WebGUI::Form::password({"name"=>"authWebGUI.identifierConfirm","value"=>$session{form}{"authWebGUI.identifierConfirm"}});
|
||||
$vars->{'create.form.passwordConfirm.label'} = WebGUI::International::get(2,'Auth/WebGUI');
|
||||
$vars->{'create.form.hidden'} = WebGUI::Form::hidden({"name"=>"confirm","value"=>$session{form}{confirm}});
|
||||
$vars->{'recoverPassword.isAllowed'} = $self->getSetting("passwordRecovery");
|
||||
$vars->{'recoverPassword.url'} = WebGUI::URL::page('op=recoverPassword');
|
||||
$vars->{'recoverPassword.label'} = WebGUI::International::get(59);
|
||||
return $self->SUPER::createAccount("createAccountSave",$vars);
|
||||
}
|
||||
|
||||
|
|
@ -144,7 +176,8 @@ sub createAccountSave {
|
|||
my $password = $session{form}{'authWebGUI.identifier'};
|
||||
my $passConfirm = $session{form}{'authWebGUI.identifierConfirm'};
|
||||
|
||||
my $error = $self->error if(!$self->validUsernameAndPassword($username,$password,$passConfirm));
|
||||
my $error = $self->error if(!$self->validUsername($username));
|
||||
$error.= $self->error if(!$self->_isValidPassword($password,$passConfirm));
|
||||
my ($profile, $temp, $warning) = WebGUI::Operation::Profile::validateProfileData();
|
||||
$error .= $temp;
|
||||
|
||||
|
|
@ -215,6 +248,11 @@ sub displayLogin {
|
|||
my $vars;
|
||||
return $self->displayAccount($_[0]) if ($self->userId != 1);
|
||||
$vars->{'login.message'} = $_[0] if ($_[0]);
|
||||
$vars->{'recoverPassword.isAllowed'} = $self->getSetting("passwordRecovery");
|
||||
$vars->{'recoverPassword.url'} = WebGUI::URL::page('op=recoverPassword');
|
||||
$vars->{'recoverPassword.label'} = WebGUI::International::get(59);
|
||||
|
||||
|
||||
return $self->SUPER::displayLogin("login",$vars);
|
||||
}
|
||||
|
||||
|
|
@ -342,14 +380,28 @@ sub new {
|
|||
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
sub recoverPassword {
|
||||
sub recoverPassword {
|
||||
my $self = shift;
|
||||
my $vars;
|
||||
return $self->displayLogin if($self->userId != 1);
|
||||
my $template = 'Auth/WebGUI/Recovery';
|
||||
my $vars;
|
||||
$vars->{title} = WebGUI::International::get(71);
|
||||
$vars->{'recover.form.header'} = "\n\n".WebGUI::Form::formHeader({});
|
||||
$vars->{'recover.form.hidden'} = WebGUI::Form::hidden({"name"=>"op","value"=>"auth"});
|
||||
$vars->{'recover.form.hidden'} .= WebGUI::Form::hidden({"name"=>"method","value"=>"recoverPasswordFinish"});
|
||||
|
||||
$vars->{'recover.form.submit'} = WebGUI::Form::submit({});
|
||||
$vars->{'recover.form.footer'} = "</form>";
|
||||
$vars->{'login.url'} = WebGUI::URL::page('op=auth&method=init');
|
||||
$vars->{'login.label'} = WebGUI::International::get(58);
|
||||
|
||||
$vars->{'anonymousRegistration.isAllowed'} = if ($session{setting}{anonymousRegistration});
|
||||
$vars->{'createAccount.url'} = WebGUI::URL::page('op=createAccount');
|
||||
$vars->{'createAccount.label'} = WebGUI::International::get(67);
|
||||
$vars->{'recover.message'} = $_[0] if ($_[0]);
|
||||
$vars->{'recover.form.email'} = WebGUI::Form::text({"name"=>"email"});
|
||||
$vars->{'recover.form.email.label'} = WebGUI::International::get(56);
|
||||
return $self->SUPER::recoverPassword("recoverPasswordFinish",$vars);
|
||||
return WebGUI::Template::process(WebGUI::Template::get(1,$template), $vars);
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
|
|
@ -480,10 +532,6 @@ sub updateAccount {
|
|||
$display = $error;
|
||||
}
|
||||
|
||||
#if(!$self->validUsernameAndPassword($username,$password,$passConfirm)){
|
||||
# $display = $self->error; #overwrite display
|
||||
#}
|
||||
|
||||
my $properties;
|
||||
my $u = $self->user;
|
||||
if(!$error){
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue