[Zope-CVS] CVS: Products/WikiForNow/dtml - RecentChanges:1.2 SearchPage:1.2 advancedform:1.2 commentform:1.2 editform:1.2 minimal_footer:1.2 pagehistory:1.2 standard_wiki_footer:1.2 standard_wiki_header:1.2

Martijn Pieters mj@zope.com
Mon, 15 Jul 2002 14:44:01 -0400


Update of /cvs-repository/Products/WikiForNow/dtml
In directory cvs.zope.org:/tmp/cvs-serv19866/dtml

Modified Files:
	RecentChanges SearchPage advancedform commentform editform 
	minimal_footer pagehistory standard_wiki_footer 
	standard_wiki_header 
Log Message:
Ensure proper quoting of REQUEST-sourced variables.


=== Products/WikiForNow/dtml/RecentChanges 1.1.1.1 => 1.2 ===
       &nbsp; <dtml-var "bobobase_modification_time().aCommon()">
     </td>
     <td valign="top">
-      <dtml-if last_editor> <dtml-var last_editor> </dtml-if> </td>
+      <dtml-if last_editor> <dtml-var last_editor html_quote> </dtml-if> </td>
     <dtml-if last_log>
       </tr><tr><td colspan=2> &nbsp; </td>
                <td colspan=2> <font color=gray>


=== Products/WikiForNow/dtml/SearchPage 1.1.1.1 => 1.2 ===
 <form method="POST" action="SearchPage">
 <input type="hidden" name="source" value="search">
 <b>Search for:</b> <input name="expr" type="text" size="30"
-                           value="<dtml-var expr>">
+                           value="&dtml-expr;">
 <input type="submit" name="submit" value="Search">
 <br>
 <b>Results:</b>


=== Products/WikiForNow/dtml/advancedform 1.1.1.1 => 1.2 ===
           <td width="50%" nowrap bgcolor="eeeeee">
             Rename <strong><dtml-var id></strong> to:
             <br>
-              <INPUT TYPE="TEXT" NAME="new_id" SIZE="25" value="<dtml-var id>">
+              <INPUT TYPE="TEXT" NAME="new_id" SIZE="25" value="&dtml-id;">
               &nbsp; <input type="SUBMIT" NAME="Rename" VALUE="Rename">
           </td>
           <td align="center" width="50%" nowrap bgcolor="eeeeee">
@@ -134,7 +134,7 @@
             <option value="&dtml-cat;"
                     <dtml-if cur>SELECTED</dtml-if>>
               <dtml-if "cat == 'nonanon'"> Non-Anon
-              <dtml-else>&dtml.capitalize-cat;</dtml-if></option>
+              <dtml-else>&dtml.html_quote.capitalize-cat;</dtml-if></option>
            </dtml-let>
           </dtml-in>
           </select>


=== Products/WikiForNow/dtml/commentform 1.1.1.1 => 1.2 ===
         <strong> Comment on <dtml-var id size=40>; </strong> <br>
         <TEXTAREA WRAP="soft" NAME="comment"
                   ROWS=7
-                  COLS=<dtml-var zwiki_width missing=80>
+                  COLS="<dtml-var zwiki_width missing=80 html_quote>"
 ></TEXTAREA>
       </td>
     </tr>
@@ -78,8 +78,8 @@
         <strong> Citation Source </strong> (For copying - not editable) <br>
         <!-- Readonly *and* onkeydown for bowser diversity: -->
         <TEXTAREA WRAP="soft" NAME="text"
-                  ROWS=<dtml-var zwiki_height missing=15>
-                  COLS=<dtml-var zwiki_width missing=80>
+                  ROWS="<dtml-var zwiki_height missing=15 html_qoute>"
+                  COLS="<dtml-var zwiki_width missing=80 html_qoute>"
                   readonly
                   onkeydown="this.blur(); return false;"
 ><dtml-var "prep_citation()"></TEXTAREA>


=== Products/WikiForNow/dtml/editform 1.1.1.1 => 1.2 ===
       <tr bgcolor=<dtml-if noedit>"pink"<dtml-else>"eeeeee"</dtml-if> >
         <td colspan=2 align="center">
           <TEXTAREA WRAP="soft" NAME="text"
-                    ROWS=<dtml-var zwiki_height missing=18>
-                    COLS=<dtml-var zwiki_width missing=80>
+                    ROWS="<dtml-var zwiki_height missing=18 html_quote>"
+                    COLS="<dtml-var zwiki_width missing=80 html_quote>"
                   <dtml-if noedit>
                     readonly
                     onkeydown="this.blur(); return false;"
@@ -141,8 +141,8 @@
        <dtml-else>
         <td valign="middle" align="right">
           <INPUT TYPE="submit"
-                 NAME="<dtml-var action>"
-                 VALUE="<dtml-var action> <dtml-var id size=20>">
+                 NAME="&dtml-action;"
+                 VALUE="&dtml-action; <dtml-var id size=20>">
        </dtml-if>
         </td>
       </tr>


=== Products/WikiForNow/dtml/minimal_footer 1.1.1.1 => 1.2 ===
 <br>
   Visitor: <em>
   <dtml-var "REQUEST.cookies.get('zwiki_username',
-                                 REQUEST.AUTHENTICATED_USER.getUserName())">
+                                 REQUEST.AUTHENTICATED_USER.getUserName())"
+                                 html_quote>
   </em>
 </font>
 </td>


=== Products/WikiForNow/dtml/pagehistory 1.1.1.1 => 1.2 ===
           more="_.len(transactions) >= batchsize"
         noedit="not isAllowed('edit', REQUEST=REQUEST)">
 
-<h3> &dtml-id; &dtml.capitalize-mode; Change History </h3>
+<h3> &dtml-id; &dtml.html_quote.capitalize-mode; Change History </h3>
 
 This is a &dtml-mode; record of &dtml-id;'s historical versions.  You
 can view old versions by clicking on the links<dtml-if noedit> and
@@ -40,7 +40,8 @@
      <tr>
       <td colspan=3 align=center>
         <dtml-let next="_.max(first-batchsize, 0)">
-          <a href="&dtml-URL;?mode=&dtml-mode;&first_transaction:int=&dtml.-next;&HistoryBatchSize:int=&dtml.-batchsize;">
+          <a
+          href="&dtml-URL;?mode=&dtml-mode;&first_transaction:int=&dtml.url_quote-next;&HistoryBatchSize:int=&dtml.url_quote-batchsize;">
             (More Recent Revisions -
              ...<dtml-var "transactions[0]['tacked_on_index']">)
           </a>
@@ -80,8 +81,10 @@
      <tr>
       <td colspan=3 align=center>
         <dtml-with expr="_(newlast=first+batchsize)">
-            <a href="manage_UndoForm?first_transaction:int=&dtml.-last;&HistoryBatchSize:int=&dtml.-batchsize;">
-            <a href="&dtml-URL;?mode=&dtml-mode;&first_transaction:int=&dtml.-last;&HistoryBatchSize:int=&dtml.-batchsize;">
+            <a
+            href="manage_UndoForm?first_transaction:int=&dtml.url_quote-last;&HistoryBatchSize:int=&dtml.url_quote-batchsize;">
+            <a
+            href="&dtml-URL;?mode=&dtml-mode;&first_transaction:int=&dtml.url_quote-last;&HistoryBatchSize:int=&dtml.url_quote-batchsize;">
                (Less Recent Revisions - 
                 <dtml-var "transactions[-1]['tacked_on_index']">...)
         </dtml-with>


=== Products/WikiForNow/dtml/standard_wiki_footer 1.1.1.1 => 1.2 ===
         Visitor: <em>
         <dtml-var "REQUEST.cookies.get('zwiki_username',
                                    REQUEST.AUTHENTICATED_USER.getUserName())"
-                   size=25>
+                   size=25 html_qoute>
         </em>
       </td>
       <td align="right" valign="top">


=== Products/WikiForNow/dtml/standard_wiki_header 1.1.1.1 => 1.2 ===
         <small>
           Last 
           <a href="&dtml-wiki_page_url;/pagehistory">edited</a>
-            <dtml-if last_editor> by <b><dtml-var last_editor></b> </dtml-if>
+            <dtml-if last_editor> by <b><dtml-var last_editor html_quote></b> </dtml-if>
             on <dtml-var bobobase_modification_time fmt=aCommon> </small>
     </td>
   <tr>