X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Roo%2FLogin.js;h=b5a2f896cc11fae93a2a150f62301d1617c7c200;hb=75cbc4ce04c9c01ac47671cb01320ce699128d00;hp=2bd8e758c702c3fd918f229769ab6ed55e653def;hpb=7bd275affaaa25fdd851bb28c04f1c205e83174a;p=roojs1 diff --git a/Roo/Login.js b/Roo/Login.js index 2bd8e758c7..b5a2f896cc 100644 --- a/Roo/Login.js +++ b/Roo/Login.js @@ -2,56 +2,60 @@ /** -* A generic Login Dialog..... - only one needed in theory!?!? -* -* Fires XComponent builder on success... -* -* Sends -* username,password, lang = for login actions. -* check = 1 for periodic checking that sesion is valid. -* passwordRequest = email request password -* -* Affects: (this id="????" elements) -* loading (removed) (used to indicate application is loading) -* loading-mask (hides) (used to hide application when it's building loading) -* -* -* Usage: -* -* -* Myapp.login = Roo.Login({ - url: xxxx, - - realm : 'Myapp', - - - method : 'POST', - - - * -}) -* -* -* -* Ext.apply(_T, _T[lang]); -* -**/ + * @class Roo.Login + * @extends Roo.LayoutDialog + * A generic Login Dialog..... - only one needed in theory!?!? + * + * Fires XComponent builder on success... + * + * Sends + * username,password, lang = for login actions. + * check = 1 for periodic checking that sesion is valid. + * passwordRequest = email request password + * logout = 1 = to logout + * + * Affects: (this id="????" elements) + * loading (removed) (used to indicate application is loading) + * loading-mask (hides) (used to hide application when it's building loading) + * + * + * Usage: + * + * + * Myapp.login = Roo.Login({ + url: xxxx, + + realm : 'Myapp', + + + method : 'POST', + + + * + }) + * + * + * + **/ Roo.Login = function(cfg) { this.addEvents({ - 'refreshed' : true, + 'refreshed' : true }); Roo.apply(this,cfg); - Roo.each(this.items, function(e) { - this.addxtype(e); - }, this); - Roo.Document.on('ready', function() { + + Roo.onReady(function() { this.onLoad(); }, this); // call parent.. - Roo.Login.superclass.constructor.call(this); + + + Roo.Login.superclass.constructor.call(this, this); + //this.addxtype(this.items[0]); + + } @@ -75,6 +79,18 @@ Roo.extend(Roo.Login, Roo.LayoutDialog, { * @type {Object} */ user : false, + /** + * @property checkFails + * Number of times we have attempted to get authentication check, and failed. + * @type {Number} + */ + checkFails : 0, + /** + * @property intervalID + * The window interval that does the constant login checking. + * @type {Number} + */ + intervalID : 0, onLoad : function() // called on page load... @@ -85,12 +101,12 @@ Roo.extend(Roo.Login, Roo.LayoutDialog, { Roo.get('loading').remove(); } - this.switchLang('en'); // set the language to english.. + //this.switchLang('en'); // set the language to english.. this.check({ success: function(response, opts) { // check successfull... - var res = Pman.processResponse(response); + var res = this.processResponse(response); this.checkFails =0; if (!res.success) { // error! this.checkFails = 5; @@ -99,7 +115,7 @@ Roo.extend(Roo.Login, Roo.LayoutDialog, { } if (!res.data.id) { // id=0 == login failure. - return this.show(true); + return this.show(); } @@ -155,6 +171,7 @@ Roo.extend(Roo.Login, Roo.LayoutDialog, { { window.onbeforeunload = function() { }; // false does not work for IE.. this.user = false; + var _this = this; Roo.Ajax.request({ url: this.url, @@ -164,27 +181,44 @@ Roo.extend(Roo.Login, Roo.LayoutDialog, { method: 'GET', failure : function() { Roo.MessageBox.alert("Error", "Error logging out. - continuing anyway.", function() { - document.location = baseURL + '?ts=' + Math.random(); + document.location = document.location.toString() + '?ts=' + Math.random(); }); }, success : function() { - Pman.Login.authUserId = -1; - Pman.Login.checkFails =0; - // remove the - document.location = baseURL + '?ts=' + Math.random(); + _this.user = false; + this.checkFails =0; + // fixme.. + document.location = document.location.toString() + '?ts=' + Math.random(); } }); }, - + processResponse : function (response) + { + var res = ''; + try { + res = Roo.decode(response.responseText); + // oops... + if (typeof(res) != 'object') { + res = { success : false, errorMsg : res, errors : true }; + } + if (typeof(res.success) == 'undefined') { + res.success = false; + } + + } catch(e) { + res = { success : false, errorMsg : response.responseText, errors : true }; + } + return res; + }, success : function(response, opts) // check successfull... { this.sending = false; - var res = Pman.processResponse(response); + var res = this.processResponse(response); if (!res.success) { return this.failure(response, opts); } @@ -195,7 +229,7 @@ Roo.extend(Roo.Login, Roo.LayoutDialog, { this.fillAuth(res.data); this.checkFails =0; - Pman.onload(); + }, @@ -203,9 +237,9 @@ Roo.extend(Roo.Login, Roo.LayoutDialog, { { this.authUser = -1; this.sending = false; - var res = Pman.processResponse(response); + var res = this.processResponse(response); //console.log(res); - if ( Pman.Login.checkFails > 2) { + if ( this.checkFails > 2) { Roo.MessageBox.alert("Error", res.errorMsg ? res.errorMsg : "Error getting authentication status. - try reloading"); @@ -226,10 +260,10 @@ Roo.extend(Roo.Login, Roo.LayoutDialog, { this.fireEvent('refreshed', au); //Pman.Tab.FaxQueue.newMaxId(au.faxMax); //Pman.Tab.FaxTab.setTitle(au.faxNumPending); - + au.lang = au.lang || 'en'; //this.switchLang(Roo.state.Manager.get('Pman.Login.lang', 'en')); Roo.state.Manager.set( this.realm + 'lang' , au.lang); - this.switchLang(au.lang); + this.switchLang(au.lang ); // open system... - -on setyp.. @@ -245,21 +279,70 @@ Roo.extend(Roo.Login, Roo.LayoutDialog, { startAuthCheck : function() // starter for timeout checking.. { - if (Pman.Login.intervalID) { // timer already in place... + if (this.intervalID) { // timer already in place... return false; } + var _this = this; + this.intervalID = window.setInterval(function() { + _this.check(false); + }, 120000); // every 120 secs = 2mins.. - Pman.Login.intervalID = window.setInterval(function() { - Pman.Login.check(false); - }, 120000); // every 120 secs = 2mins.. + + }, + + + switchLang : function (lang) + { + _T = typeof(_T) == 'undefined' ? false : _T; + if (!_T || !lang.length) { + return; + } + + if (!_T && lang != 'en') { + Roo.MessageBox.alert("Sorry", "Language not available yet (" + lang +')'); + return; + } + + if (typeof(_T.en) == 'undefined') { + _T.en = {}; + Roo.apply(_T.en, _T); + } + + if (typeof(_T[lang]) == 'undefined') { + Roo.MessageBox.alert("Sorry", "Language not available yet (" + lang +')'); + return; + } + + + Roo.apply(_T, _T[lang]); + // just need to set the text values for everything... + var _this = this; + /* this will not work ... + if (this.form) { + + + function formLabel(name, val) { + _this.form.findField(name).fieldEl.child('label').dom.innerHTML = val; + } + + formLabel('password', "Password"+':'); + formLabel('username', "Email Address"+':'); + formLabel('lang', "Language"+':'); + this.dialog.setTitle("Login"); + this.dialog.buttons[0].setText("Forgot Password"); + this.dialog.buttons[1].setText("Login"); + } + */ }, - + + title: "Login", modal: true, width: 350, - height: 230, + //height: 230, + height: 180, shadow: true, minWidth:200, minHeight:180, @@ -278,37 +361,27 @@ Roo.extend(Roo.Login, Roo.LayoutDialog, { } , listeners : { - rendered : function(dlg) { - this.form = this.items[0]; + show : function(dlg) + { + //console.log(this); + this.form = this.layout.getRegion('center').activePanel.form; this.form.dialog = dlg; this.buttons[0].form = this.form; - this.buttons[0].dialog = dlg + this.buttons[0].dialog = dlg; this.buttons[1].form = this.form; this.buttons[1].dialog = dlg; - - // logoprefix comes from base config. - //Pman.Login.form.el.createChild({ - // tag: 'img', - // src: rootURL + '/Pman/'+appNameShort + '/templates/images/logo.gif', - // style: 'margin-bottom: 10px;' - //}, - - ); - - - }, - show : function() - { - //this.resizeToLogo.defer(1000,this); + + //this.resizeToLogo.defer(1000,this); + // this is all related to resizing for logos.. //var sz = Roo.get(Pman.Login.form.el.query('img')[0]).getSize(); //// if (!sz) { // this.resizeToLogo.defer(1000,this); // return; // } - var w = Ext.lib.Dom.getViewWidth() - 100; - var h = Ext.lib.Dom.getViewHeight() - 100; - this.resizeTo(Math.max(350, Math.min(sz.width + 30, w)),Math.min(sz.height+200, h)); - this.center(); + //var w = Ext.lib.Dom.getViewWidth() - 100; + //var h = Ext.lib.Dom.getViewHeight() - 100; + //this.resizeTo(Math.max(350, Math.min(sz.width + 30, w)),Math.min(sz.height+200, h)); + //this.center(); if (this.disabled) { this.hide(); return; @@ -336,7 +409,7 @@ Roo.extend(Roo.Login, Roo.LayoutDialog, { this.form.reset(); //this.dialog.modal = !modal; //this.dialog.show(); - this.dialog.el.unmask(); + this.el.unmask(); this.form.setValues({ @@ -344,7 +417,7 @@ Roo.extend(Roo.Login, Roo.LayoutDialog, { 'lang' : Roo.state.Manager.get(this.realm + '.lang', 'en') }); - Pman.Login.switchLang(Roo.state.Manager.get(this.realm + '.lang', '')); + this.switchLang(Roo.state.Manager.get(this.realm + '.lang', 'en')); if (this.form.findField('username').getValue().length > 0 ){ this.form.findField('password').focus(); } else { @@ -359,7 +432,8 @@ Roo.extend(Roo.Login, Roo.LayoutDialog, { xtype : 'ContentPanel', xns : Roo, region: 'center', - fitToFrame : true + fitToFrame : true, + items : [ { @@ -367,7 +441,8 @@ Roo.extend(Roo.Login, Roo.LayoutDialog, { xtype : 'Form', xns : Roo.form, labelWidth: 100, - style : 'margin : 10px;', + style : 'margin: 10px;', + listeners : { actionfailed : function(f, act) { // form can return { errors: .... } @@ -383,12 +458,12 @@ Roo.extend(Roo.Login, Roo.LayoutDialog, { actioncomplete: function(re, act) { Roo.state.Manager.set( - this.dialog.realm + '.' + this.dialog.params.username, - this.form.findField(this.dialog.params.username).getValue() + this.dialog.realm + '.username', + this.findField('username').getValue() ); Roo.state.Manager.set( this.dialog.realm + '.lang', - Pman.Login.form.findField('lang').getValue() + this.findField('lang').getValue() ); this.dialog.fillAuth(act.result.data); @@ -427,7 +502,7 @@ Roo.extend(Roo.Login, Roo.LayoutDialog, { this.form.dialog.el.mask("Logging in"); this.form.doAction('submit', { url: this.form.dialog.url, - method: this.form.dialog.method, + method: this.form.dialog.method }); } } @@ -466,173 +541,71 @@ Roo.extend(Roo.Login, Roo.LayoutDialog, { } ] - }, + } - ], - buttons : [ - { - xtype : 'Button', - xns : 'Roo', - text : "Forgot Password", - listeners : { - click : function() { - - var n = this.form.findField('username').getValue(); - if (!n.length) { - Roo.MessageBox.alert("Error", "Fill in your email address"); - return; + ] + } + ], + buttons : [ + { + xtype : 'Button', + xns : 'Roo', + text : "Forgot Password", + listeners : { + click : function() { + //console.log(this); + var n = this.form.findField('username').getValue(); + if (!n.length) { + Roo.MessageBox.alert("Error", "Fill in your email address"); + return; + } + Roo.Ajax.request({ + url: this.dialog.url, + params: { + passwordRequest: n + }, + method: this.dialog.method, + success: function(response, opts) { // check successfull... + + var res = this.dialog.processResponse(response); + if (!res.success) { // error! + Roo.MessageBox.alert("Error" , + res.errorMsg ? res.errorMsg : "Problem Requesting Password Reset"); + return; } - Roo.Ajax.request({ - url: this.dialog.url - params: { - passwordRequest: n - }, - method: this.dialog.method, - success: function(response, opts) { // check successfull... - - var res = Pman.processResponse(response); - if (!res.success) { // error! - Roo.MessageBox.alert("Error" , - res.errorMsg ? res.errorMsg : "Problem Requesting Password Reset"); - return; - } - Roo.MessageBox.alert("Notice" , - "Please check you email for the Password Reset message"); - }, - failure : function() { - Roo.MessageBox.alert("Error" , "Problem Requesting Password Reset"); - } - - }); + Roo.MessageBox.alert("Notice" , + "Please check you email for the Password Reset message"); + }, + failure : function() { + Roo.MessageBox.alert("Error" , "Problem Requesting Password Reset"); } - } - }, - { - xtype : 'Button', - xns : 'Roo', - text : "Login", - { - - this.dialog.el.mask("Logging in"); - this.form.doAction('submit', { - url: this.dialog.url - method: this.dialog.method - }); - } + + }); } - ] - } - ] -}) - -Pman.Login = new Roo.util.Observable({ - - events : { - - 'render' : true - }, - disabled : false, - - dialog : false, - form: false, - haslogo : false, - - authUserId: 0, - authUser: { id : false }, - - checkFails : 0, - versionWarn: false, - sending : false, - - - - - - intervalID : false, /// the login refresher... - - lastChecked : false, - - - - - - - - - switchLang : function (lang) { - if (!lang.length) { - return; - } - if (typeof(_T.en) == 'undefined') { - _T.en = {}; - Roo.apply(_T.en, _T); - } - - if (typeof(_T[lang]) == 'undefined') { - Roo.MessageBox.alert("Sorry", "Language not available yet (" + lang +')'); - return; - } - - - Roo.apply(_T, _T[lang]); - // just need to set the text values for everything... - if (this.form) { - - - function formLabel(name, val) { + } + }, + { + xtype : 'Button', + xns : 'Roo', + text : "Login", + listeners : { - var lbl = Pman.Login.form.findField( name ).el.dom.parentNode.parentNode; - if (lbl.getElementsByTagName('label').length) { - lbl = lbl.getElementsByTagName('label')[0]; - } else { - lbl = lbl.parentNode.getElementsByTagName('label')[0]; + click : function () { + + this.dialog.el.mask("Logging in"); + this.form.doAction('submit', { + url: this.dialog.url, + method: this.dialog.method + }); } - - lbl.innerHTML = val; } - - formLabel('password', "Password"+':'); - formLabel('username', "Email Address"+':'); - formLabel('lang', "Language"+':'); - this.dialog.setTitle("Login"); - this.dialog.buttons[0].setText("Forgot Password"); - this.dialog.buttons[1].setText("Login"); } - - - }, - - inGroup : function(g) - { - return this.authUser && this.authUser.groups && - this.authUser.groups.indexOf(g) > -1; - }, - isOwner : function() - { - return this.authUser && this.authUser.company_id_comptype && - this.authUser.company_id_comptype == 'OWNER'; - }, - - /** - * Depreciated = use Pman.I18n - */ - - i18nList: function (type, codes) - { - - return Pman.I18n.listToNames(type, codes); - }, - i18n: function(type, code) - { - return Pman.I18n.toName(type, code); - - } - - -}); - - + ] + + +}) + \ No newline at end of file