Misc update for fix email verification.

cmsWebApp/src/performa/form/UserLoginFP.java

 package performa.form;
 
 import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import oneit.logging.LogLevel;
-import oneit.logging.LogMgr;
-import oneit.logging.LoggingArea;
 import oneit.objstore.ObjectTransaction;
 import oneit.security.LoginProcessor;
 import oneit.security.SecUser;

cmsWebApp/src/performa/orm/CompanyUser.java

@@ -147,7 +147,7 @@ public class CompanyUser extends BaseCompanyUser
                     request.getSession().setAttribute("EmailStillNotVerified", true);
                 }
                 
-                request.getSession().setAttribute("EmailToVerify", null);
+                request.getSession().removeAttribute("EmailToVerify");
             }
             else 
             {

cmsWebApp/webroot/extensions/adminportal/email_verified.jsp

@@ -24,19 +24,15 @@
         if(companyUser!=null && companyUser.getIsEmailChanged()==Boolean.TRUE)
         {
             session =   request.getSession();
-            session.invalidate();
-            
-            session =   request.getSession(true);
+            session.removeAttribute(SecUser.SEC_USER_ID);
             session.setAttribute("EmailToVerify", companyUser.getUser());
-            
             response.sendRedirect(nextPage);
-            
             return;
         }
     }
 %>
-    
-    <h3>Verification Error</h3>
-    <p><span>Access expired.</span></p>
-    
+
+<h3>Verification Error</h3>
+<p><span>Access expired.</span></p>
+
 <%@ include file="inc/htmlfooter_nopriv.jsp" %>
\ No newline at end of file

cmsWebApp/webroot/extensions/adminportal/my_details.jsp

@@ -44,7 +44,7 @@
                             <%
                                 if(companyUser.getIsEmailChanged()==Boolean.TRUE && request.getSession().getAttribute("EmailStillNotVerified")!=null)
                                 {
-                                    request.getSession().setAttribute("EmailStillNotVerified", null);
+                                    request.getSession().removeAttribute("EmailStillNotVerified");
                             %>
                                    <div class="error-message message-common">
                                         <img src="images/infomation-icon.png" class="alert-icon">

cmsWebApp/webroot/extensions/adminportal/page_admin_home.jsp

@@ -32,7 +32,7 @@
             //to notify email address changed
             if(request.getSession().getAttribute("EmailVerified")!=null)
             {
-                request.getSession().setAttribute("EmailVerified", null);
+                request.getSession().removeAttribute("EmailVerified");
                 request.setAttribute(NotificationUtils.NOTIFICATION_MSG_PARAM, "emailChangeVefified");
                 
                 String  messageId   =   NotificationUtils.getNotifyIdIfRequired(process, request);