PHP7 fix

[Pman.Core] / Pman.Login.js

diff --git a/Pman.Login.js b/Pman.Login.js
index 76af8fd..234b9c0 100644 (file)
--- a/Pman.Login.js
+++ b/Pman.Login.js
@@ -36,6 +36,8 @@ Pman.Login =  new Roo.util.Observable({
     versionWarn: false,
     sending : false,
     
+    checkConnection : false, // the Roo.data.Connection for checking if still authenticated.
+    
     onLoad : function() // called on page load...
     {
         // load 
@@ -105,8 +107,10 @@ Pman.Login =  new Roo.util.Observable({
             return;
         }
         this.sending = true;
-        
-        Roo.Ajax.request({  
+        if (!this.checkConnection) {
+            this.checkConnection = new Roo.data.Connection();
+        }
+        this.checkConnection.request({
             url: baseURL + '/Login.js',  
             params: {
                 getAuthUser: true
@@ -153,7 +157,15 @@ Pman.Login =  new Roo.util.Observable({
         this.fillAuth(res.data);
         
         this.checkFails =0;
-        Pman.onload();
+        
+        
+        if (Pman.onload) { 
+            Pman.onload();
+        }
+        if (Pman.Login.callback) {
+            Pman.Login.callback();
+            
+        }
         return false;
     },
     
@@ -247,15 +259,15 @@ Pman.Login =  new Roo.util.Observable({
                 Roo.MessageBox.alert("Error", "Fill in your email address");
                 return;
             }
-            Roo.Ajax.request({
-                url: baseURL + '/Login.js',  
+            new Pman.Request({
+                url: baseURL + '/Login.js',
+                mask : "Sending Password Reset email",
                 params: {
                     passwordRequest: n
                 },
                 method: 'POST',  
-                success:  function(response, opts)  {  // check successfull...
+                success:  function(res)  {  // check successfull...
                 
-                    var res = Pman.processResponse(response);
                     if (!res.success) { // error!
                        Roo.MessageBox.alert("Error" , res.errorMsg ? res.errorMsg  : "Problem Requesting Password Reset");
                        return;
@@ -293,8 +305,9 @@ Pman.Login =  new Roo.util.Observable({
                     //act.result.errorMsg// invalid form element list...
                     
                     Pman.Login.dialog.el.unmask();
-                    Roo.MessageBox.alert("Error", act.result.errorMsg ? act.result.errorMsg : 
-                                "Login failed - communication error - try again.");
+                    var msg = act.result.errorMsg || act.result.message;
+                    msg = msg ||   "Login failed - communication error - try again.";
+                    Roo.MessageBox.alert("Error",  msg); 
                               
                 },
                 actioncomplete: function(re, act) {
@@ -308,10 +321,13 @@ Pman.Login =  new Roo.util.Observable({
                         //Roo.get('loading').show();
                         Roo.get('loading-mask').show();
                     }
-                   
-                    Pman.onload();
-                    
+                    if (Pman.onload) { 
+                        Pman.onload();
+                    }
+                    if (Pman.Login.callback) {
+                        Pman.Login.callback();
                      
+                    }
                     
                 }
             }
@@ -391,14 +407,22 @@ Pman.Login =  new Roo.util.Observable({
         ef.dom.style.margin = 10;
           
         this.form.render(ef.dom);
-         // logoprefix comes from base config.
-        Pman.Login.form.el.createChild({
+         // logoprefix comes from base config - normally the owner company logo...
+         // ??? 
+         
+        var img = typeof(appLogo) != 'undefined'  && appLogo.length ? appLogo :
+            rootURL + '/Pman/'+appNameShort + '/templates/images/logo.gif' ;
+         
+         Pman.Login.form.el.createChild({
                 tag: 'img', 
-                src: rootURL + '/Pman/'+appNameShort + '/templates/images/logo.gif',
+                src: img,
                 style: 'margin-bottom: 10px;'
             },
             Pman.Login.form.el.dom.firstChild 
-        );
+        ).on('error', function() {
+            this.dom.style.visibility = 'hidden';
+            this.dom.style.height = '10px';
+        });
        
         var vp = this.dialog.getLayout().add('center', new Roo.ContentPanel(ef, {
             autoCreate : true,
@@ -438,6 +462,9 @@ Pman.Login =  new Roo.util.Observable({
         if (this.disabled) {
             return;
         }
+        
+        
+        
         this.callback = cb; // used for non-pman usage..
         modal = modal || false;
         if (Pman.Login.authUserId < 0) { // logout!?
@@ -469,6 +496,11 @@ Pman.Login =  new Roo.util.Observable({
         this.dialog.el.unmask(); 
         this.resizeToLogo.defer(1000,this);
         
+        // if we have not created a provider.. do it now...
+        if (!Roo.state.Manager.getProvider().expires) { 
+            Roo.state.Manager.setProvider(new Roo.state.CookieProvider());
+        }
+         
          
         this.form.setValues({
             'username' : Roo.state.Manager.get('Pman.Login.username.'+appNameShort, ''),