Add an error message for the user if the account is not activated

module.py

@@ -80,13 +80,22 @@ def do_login():
         } )
     
     if pbkdf2( request.form.get( "password" ), user[ 'password' ] ):
-        session[ 'logged' ] = True
-        session[ 'session_id' ] = str( uuid4() )
-        session[ 'username' ] = user[ 'username' ]
-        return jsonify( {
-            'error': False,
-            'logged': True,
-        } )
+        if not user[ 'active' ]:
+            session.clear()
+            return jsonify( {
+                'error': False,
+                'logged': False,
+                'message': 'Your account is not activated. Please contact an administrator.'
+            } )
+        
+        else:
+            session[ 'logged' ] = True
+            session[ 'session_id' ] = str( uuid4() )
+            session[ 'username' ] = user[ 'username' ]
+            return jsonify( {
+                'error': False,
+                'logged': True,
+            } )
     
     else:
         session.clear()

templates/login.html

@@ -64,12 +64,16 @@
 	            {
 	                if( ! data.error )
 	                {
-	                	
 	                	if( data.logged )
                 		{
 	                		location.href = "{{ url_for( 'home' ) }}";
                 		} else {
-                			$( '#icnml_login_error' ).text( 'Invalid username/password' );
+                			if( typeof data.message !== 'undefined' )
+                				var message = data.message;
+                			else
+                				var message = 'Invalid username/password';
+                			
+                			$( '#icnml_login_error' ).text( message );
     	                	$( '#login_button > span' ).text( "Login" );
                 		}
 	                }