[CMF-checkins] CVS: CMF - logout.dtml:1.2 personalize.dtml:1.2

tseaver@digicool.com tseaver@digicool.com
Tue, 19 Jun 2001 20:35:19 -0400 (EDT)


Update of /cvs-repository/CMF/CMFDefault/skins/control
In directory korak.digicool.com:/tmp/cvs-serv1492/CMFDefault/skins/control

Modified Files:
	logout.dtml personalize.dtml 
Log Message:


 - Stopped polluting the browser with persistent skin cookie;
   clear it as well on logout (Tracker #304).



--- Updated File logout.dtml in package CMF --
--- logout.dtml	2001/02/23 14:24:09	1.1
+++ logout.dtml	2001/06/20 00:35:19	1.2
@@ -1,2 +1,5 @@
-<dtml-call "REQUEST['RESPONSE'].expireCookie('__ac', path='/')">
-<dtml-call "REQUEST['RESPONSE'].redirect(URL1+'/logged_out')">
+<dtml-if portal_skins>
+  <dtml-call expr="portal_skins.clearSkinCookie()">
+</dtml-if>
+<dtml-call expr="REQUEST['RESPONSE'].expireCookie('__ac', path='/')">
+<dtml-call expr="REQUEST['RESPONSE'].redirect(URL1+'/logged_out')">

--- Updated File personalize.dtml in package CMF --
--- personalize.dtml	2001/02/23 14:24:09	1.1
+++ personalize.dtml	2001/06/20 00:35:19	1.2
@@ -1,12 +1,10 @@
 <dtml-call expr="portal_registration.setProperties(REQUEST)">
 
 <dtml-if portal_skins>
- <dtml-let reqvar="portal_skins.getRequestVarname()" memvar="'portal_skin'">
-  <dtml-if expr="REQUEST.has_key(memvar)">
-   <dtml-call expr="RESPONSE.setCookie(reqvar, REQUEST[memvar],
-     path='/', expires=(_.DateTime('GMT') + 365).rfc822())">
-  </dtml-if>
- </dtml-let>
+  <dtml-call expr="portal_skins.updateSkinCookie()">
 </dtml-if>
 
-<dtml-return expr="personalize_form(_.None, _, portal_status_message='Member changed.')">
+<dtml-call expr="REQUEST['RESPONSE'].redirect( portal_url()
+                                    + '/personalize_form'
+                                    + '?portal_status_message=Member+changed.'
+                                    )">