Removed no-longer-used findOpt.dtml (noticed when someone filed a bug report

that a non-Y2K compliant cookie was being set in it).

Removed no-longer-used findOpt.dtml (noticed when someone filed a bug report
that a non-Y2K compliant cookie was being set in it).
82138cad · a6a8b81b · 82138cad · a6a8b81b
Commit 82138cad authored Dec 28, 1999 by
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 74 deletions

lib/python/OFS/Image.py lib/python/OFS/Image.py +8 -8

lib/python/OFS/findOpt.dtml lib/python/OFS/findOpt.dtml +0 -66

No files found.
--- a/lib/python/OFS/Image.py
+++ b/lib/python/OFS/Image.py
@@ -84,7 +84,7 @@
 ##############################################################################
 """Image object"""

-__version__='$Revision: 1.91 $'[11:-2]
+__version__='$Revision: 1.92 $'[11:-2]

 import Globals, string, struct, content_types
 from OFS.content_types import guess_content_type
@@ -179,13 +179,13 @@ class File(Persistent,Implicit,PropertyManager,
        Returns the contents of the file or image.  Also, sets the
        Content-Type HTTP header to the objects content type.
        """
-
-        # Attempt to handle If-Modified-Since headers.
-        ms=REQUEST.get_header('If-Modified-Since', None)
-        if ms is not None:
-            ms=string.split(ms, ';')[0]
-            ms=DateTime(ms).timeTime()
-            if self._p_mtime > ms:
+        # HTTP If-Modified-Since header handling.
+        header=REQUEST.get_header('If-Modified-Since', None)
+        if header is not None:
+            header=string.split(header, ';')[0]
+            mod_since=DateTime(header).timeTime()
+            last_mod =self._p_mtime
+            if last_mod > 0 and last_mod <= mod_since:
                RESPONSE.setStatus(304)
                return RESPONSE
        

--- a/lib/python/OFS/findOpt.dtml
+++ b/lib/python/OFS/findOpt.dtml
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<HTML lang="en">
-<HEAD>
-<TITLE>Find Options</TITLE>
-</HEAD>
-<BODY BGCOLOR="#FFFFFF" LINK="#000099" VLINK="#555555">
-
-<dtml-if btn_submit>
-
-<dtml-in expr="('ffnw', 'ffaf')">
-<dtml-if expr="_.hasattr(REQUEST, 'fv_'+_['sequence-item']) and _.getattr(REQUEST, 'fv_'+_['sequence-item']) and not _.hasattr(REQUEST, 'cv_'+_['sequence-item'])">
-<dtml-call expr="REQUEST.RESPONSE.setCookie('cv_'+_['sequence-item'], _.getattr(REQUEST, 'fv_'+_['sequence-item']), path='/', expires='Friday, 31-Dec-99 23:59:59 GMT')">
-<dtml-elif expr="_.hasattr(REQUEST, 'cv_'+_['sequence-item']) and _.getattr(REQUEST, 'cv_'+_['sequence-item']) and not _.hasattr(REQUEST, 'fv_'+_['sequence-item'])">
-<dtml-call expr="REQUEST.RESPONSE.expireCookie('cv_'+_['sequence-item'], path='/')">
-</dtml-if>
-</dtml-in>
-<P>
-<BR><BR>
-<CENTER>
-<FORM>
-Your preferences have been saved.
-<P>
-<INPUT TYPE="BUTTON" NAME="btn_close" VALUE=" Ok " onClick="window.close()">
-</FORM>
-
-<dtml-else>
-
-<H2>Find Options</H2>
-<P>
-<FORM ACTION="manage_findOpt" METHOD="POST">
-<TABLE>
-<!--
-<TR>
-  <TD ALIGN="LEFT" VALIGN="TOP">
-  <INPUT TYPE="CHECKBOX" NAME="fv_ffnw" VALUE="1"<dtml-if cv_ffnw> CHECKED</dtml-if>>
-  </TD>
-  <TD ALIGN="LEFT" VALIGN="TOP">
-  <STRONG>Open results in new window</STRONG>
-  </TD>
-</TR>
->
-<TR>
-  <TD ALIGN="LEFT" VALIGN="TOP">
-  <INPUT TYPE="CHECKBOX" NAME="fv_ffaf" VALUE="1"<dtml-if cv_ffaf> CHECKED</dtml-if>>
-  </TD>
-  <TD ALIGN="LEFT" VALIGN="TOP">
-  <STRONG>Always use advanced find</STRONG>
-  </TD>
-</TR>
-
-
-<TR>
-  <TD ALIGN="LEFT" VALIGN="TOP">
-  </TD>
-  <TD ALIGN="LEFT" VALIGN="TOP">
-  <INPUT TYPE="SUBMIT" NAME="btn_submit" VALUE=" Ok "> 
-  <INPUT TYPE="BUTTON" NAME="btn_cancel" VALUE="Cancel" onClick="window.close()">
-  </TD>
-</TR>
-
-</TABLE>
-</FORM>
-</dtml-if>
-
-</BODY>
-</HTML>