You are viewing a plain text version of this content. The canonical link for it is here.
Posted to site-cvs@tcl.apache.org by ro...@apache.org on 2004/07/04 15:23:30 UTC

cvs commit: tcl-site/websh/examples emailform.html emailform.ws3 emailform_ws3.txt

ronnie      2004/07/04 06:23:30

  Modified:    websh/examples emailform.html emailform.ws3
                        emailform_ws3.txt
  Log:
  - disabled email
  - fixed typos in showError
  
  Revision  Changes    Path
  1.4       +15 -13    tcl-site/websh/examples/emailform.html
  
  Index: emailform.html
  ===================================================================
  RCS file: /home/cvs/tcl-site/websh/examples/emailform.html,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- emailform.html	28 Jul 2002 22:08:58 -0000	1.3
  +++ emailform.html	4 Jul 2004 13:23:30 -0000	1.4
  @@ -150,8 +150,9 @@
   	close $<FONT COLOR="#B8860B">fh</FONT>
       } cmsg ] } {
   
  -	showErrorPage
  -    }
  +	<I><FONT COLOR="#B22222"># disabled, because there is no sendmail on www.apache.org
  +</FONT></I>	<I><FONT COLOR="#B22222">#showErrorPage
  +</FONT></I>    }
   }
   
   
  @@ -162,36 +163,37 @@
   	web::putx {
   	    &lt;h3&gt;Error&lt;/h3&gt;
   	    An <B><FONT COLOR="#A020F0">error</FONT></B> occurred <B><FONT COLOR="#A020F0">while</FONT></B> processing your request.
  -	    Please {web::put &lt;a href=\<B><FONT COLOR="#BC8F8F">&quot;[web::cmdurl default]\&quot;&gt;try&lt;/a&gt;} again
  +	    Please {web::put <B><FONT COLOR="#BC8F8F">&quot;&lt;a href=\&quot;[web::cmdurl default]\&quot;&gt;try&lt;/a&gt;&quot;</FONT></B>} again
   	    &lt;br&gt;&lt;br&gt;
   	    If the problem persists, please contact the
  -	    {web::put &lt;a href=\&quot;mailto:webmaster@tcl.apache.org\&quot;&gt;webmaster&lt;/a&gt;}.
  +	    {web::put <B><FONT COLOR="#BC8F8F">&quot;&lt;a href=\&quot;mailto:webmaster@tcl.apache.org\&quot;&gt;webmaster&lt;/a&gt;&quot;</FONT></B>}.
   	}
       }
   }
   
  -proc showConfirmationPage {} {
  +<B><FONT COLOR="#A020F0">proc</FONT></B> <B><FONT COLOR="#0000FF">showConfirmationPage</FONT></B> {<FONT COLOR="#B8860B"></FONT>} {
   
  -    page &quot;</FONT></B>Confirmation<B><FONT COLOR="#BC8F8F">&quot; {
  +    page <B><FONT COLOR="#BC8F8F">&quot;Confirmation&quot;</FONT></B> {
   
   	web::putx {
  -	    &lt;h3&gt;Thank you for your order&lt;/h3&gt;
  +	    &lt;h3&gt;Thank you <B><FONT COLOR="#A020F0">for</FONT></B> your order&lt;/h3&gt;
   	    We have recieved the following information:
   	    &lt;dl&gt;
   	    &lt;dt&gt;&lt;b&gt;Name:&lt;/b&gt;
   	    &lt;dd&gt;{web::put [web::htmlify [web::formvar name]]}&lt;p&gt;
   	    &lt;dt&gt;&lt;b&gt;Address:&lt;/b&gt;
   	    &lt;dd&gt;{
  -		# take care of linebreaks in address
  -		regsub -all &quot;</FONT></B>\r\n<B><FONT COLOR="#BC8F8F">&quot; [web::htmlify [web::formvar addr]] &quot;</FONT></B>&lt;br&gt;<B><FONT COLOR="#BC8F8F">&quot; addr
  -		web::put $addr
  +		<I><FONT COLOR="#B22222"># take care of linebreaks in address
  +</FONT></I>		<B><FONT COLOR="#A020F0">regsub</FONT></B> -all <B><FONT COLOR="#BC8F8F">&quot;\r\n&quot;</FONT></B> [web::htmlify [web::formvar addr]] <B><FONT COLOR="#BC8F8F">&quot;&lt;br&gt;&quot;</FONT></B> addr
  +		web::put $<FONT COLOR="#B8860B">addr</FONT>
   	    }&lt;p&gt;
   	    &lt;dt&gt;&lt;b&gt;E-Mail:&lt;/b&gt;
   	    &lt;dd&gt;{web::put [web::htmlify [web::formvar email]]}&lt;p&gt;
   	    &lt;/dl&gt;
  -	    You should recieve a confirmation by e-mail shortly.
  +	    You should recieve a confirmation by e-mail shortly.&lt;br&gt;
  +	  &lt;b&gt;Note: to prevent misue, sending the actual email is disabled, so please don't wait <B><FONT COLOR="#A020F0">for</FONT></B> the mail ;-)&lt;/b&gt;
   	    &lt;br&gt;
  -	    {web::put &quot;</FONT></B>&lt;a href=\<B><FONT COLOR="#BC8F8F">&quot;[web::cmdurl default]\&quot;&gt;Order more&lt;/a&gt;&quot;</FONT></B>}
  +	    {web::put <B><FONT COLOR="#BC8F8F">&quot;&lt;a href=\&quot;[web::cmdurl default]\&quot;&gt;Order more&lt;/a&gt;&quot;</FONT></B>}
   	    cool stuff.
   	}
       }
  @@ -228,6 +230,6 @@
   
   web::dispatch</PRE>
   <HR>
  -<ADDRESS>Generated by <A HREF="http://www.iki.fi/~mtr/genscript/">GNU enscript 1.6.3</A>.</ADDRESS>
  +<ADDRESS>Generated by <A HREF="http://www.iki.fi/~mtr/genscript/">GNU enscript 1.6.4</A>.</ADDRESS>
   </BODY>
   </HTML>
  
  
  
  1.4       +7 -3      tcl-site/websh/examples/emailform.ws3
  
  Index: emailform.ws3
  ===================================================================
  RCS file: /home/cvs/tcl-site/websh/examples/emailform.ws3,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- emailform.ws3	28 Jul 2002 22:08:58 -0000	1.3
  +++ emailform.ws3	4 Jul 2004 13:23:30 -0000	1.4
  @@ -112,6 +112,9 @@
   # create the e-mail message and send it to the given e-mail address
   proc sendEmail {} {
   
  +    # disabled for security reasons, and because there is no sendmail on www.apache.org ;-)
  +    return
  +
       set emailtxt {
   
   Thank you for your submission.
  @@ -151,10 +154,10 @@
   	web::putx {
   	    <h3>Error</h3>
   	    An error occurred while processing your request.
  -	    Please {web::put <a href=\"[web::cmdurl default]\">try</a>} again
  +	    Please {web::put "<a href=\"[web::cmdurl default]\">try</a>"} again
   	    <br><br>
   	    If the problem persists, please contact the
  -	    {web::put <a href=\"mailto:webmaster@tcl.apache.org\">webmaster</a>}.
  +	    {web::put "<a href=\"mailto:webmaster@tcl.apache.org\">webmaster</a>"}.
   	}
       }
   }
  @@ -178,7 +181,8 @@
   	    <dt><b>E-Mail:</b>
   	    <dd>{web::put [web::htmlify [web::formvar email]]}<p>
   	    </dl>
  -	    You should recieve a confirmation by e-mail shortly.
  +	    You should recieve a confirmation by e-mail shortly.<br>
  +	  <b>Note: to prevent misue, sending the actual email is disabled, so please don't wait for the mail ;-)</b>
   	    <br>
   	    {web::put "<a href=\"[web::cmdurl default]\">Order more</a>"}
   	    cool stuff.
  
  
  
  1.4       +7 -3      tcl-site/websh/examples/emailform_ws3.txt
  
  Index: emailform_ws3.txt
  ===================================================================
  RCS file: /home/cvs/tcl-site/websh/examples/emailform_ws3.txt,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- emailform_ws3.txt	28 Jul 2002 22:08:58 -0000	1.3
  +++ emailform_ws3.txt	4 Jul 2004 13:23:30 -0000	1.4
  @@ -112,6 +112,9 @@
   # create the e-mail message and send it to the given e-mail address
   proc sendEmail {} {
   
  +    # disabled for security reasons, and because there is no sendmail on www.apache.org ;-)
  +    return
  +
       set emailtxt {
   
   Thank you for your submission.
  @@ -151,10 +154,10 @@
   	web::putx {
   	    <h3>Error</h3>
   	    An error occurred while processing your request.
  -	    Please {web::put <a href=\"[web::cmdurl default]\">try</a>} again
  +	    Please {web::put "<a href=\"[web::cmdurl default]\">try</a>"} again
   	    <br><br>
   	    If the problem persists, please contact the
  -	    {web::put <a href=\"mailto:webmaster@tcl.apache.org\">webmaster</a>}.
  +	    {web::put "<a href=\"mailto:webmaster@tcl.apache.org\">webmaster</a>"}.
   	}
       }
   }
  @@ -178,7 +181,8 @@
   	    <dt><b>E-Mail:</b>
   	    <dd>{web::put [web::htmlify [web::formvar email]]}<p>
   	    </dl>
  -	    You should recieve a confirmation by e-mail shortly.
  +	    You should recieve a confirmation by e-mail shortly.<br>
  +	  <b>Note: to prevent misue, sending the actual email is disabled, so please don't wait for the mail ;-)</b>
   	    <br>
   	    {web::put "<a href=\"[web::cmdurl default]\">Order more</a>"}
   	    cool stuff.
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: site-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: site-cvs-help@tcl.apache.org