diff pylons_app/lib/auth.py @ 45:a886f5eba757

implemented admin page login
author marcink
date Wed, 07 Apr 2010 17:28:10 +0200
parents d924b931b488
children 9db7782727b3
line wrap: on
line diff
--- a/pylons_app/lib/auth.py	Wed Apr 07 16:42:11 2010 +0200
+++ b/pylons_app/lib/auth.py	Wed Apr 07 17:28:10 2010 +0200
@@ -23,32 +23,30 @@
     except sqlite3.OperationalError as e:
         data = None
         log.error(e)
-
     if data:
         if data[3]:
             if data[1] == username and data[2] == password_crypt:
                 log.info('user %s authenticated correctly', username)
-                
-                http_accept = environ.get('HTTP_ACCEPT')
-        
-                if http_accept.startswith('application/mercurial') or \
-                    environ['PATH_INFO'].find('raw-file') != -1:
-                    cmd = environ['PATH_INFO']
-                    for qry in environ['QUERY_STRING'].split('&'):
-                        if qry.startswith('cmd'):
-                            cmd += "|" + qry
-                            
-                            try:
-                                cur.execute('''INSERT INTO 
-                                                    user_logs 
-                                               VALUES(?,?,?,?)''',
-                                                (None, data[0], cmd, datetime.now()))
-                                conn.commit()
-                            except Exception as e:
-                                conn.rollback()
-                                log.error(e)
-                            
+                if environ:
+                    http_accept = environ.get('HTTP_ACCEPT')
+            
+                    if http_accept.startswith('application/mercurial') or \
+                        environ['PATH_INFO'].find('raw-file') != -1:
+                        cmd = environ['PATH_INFO']
+                        for qry in environ['QUERY_STRING'].split('&'):
+                            if qry.startswith('cmd'):
+                                cmd += "|" + qry
                                 
+                                try:
+                                    cur.execute('''INSERT INTO 
+                                                        user_logs 
+                                                   VALUES(?,?,?,?)''',
+                                                    (None, data[0], cmd, datetime.now()))
+                                    conn.commit()
+                                except Exception as e:
+                                    conn.rollback()
+                                    log.error(e)
+                                  
                 return True
         else:
             log.error('user %s is disabled', username)