Index: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG	(revision 761)
+++ trunk/CHANGELOG	(revision 762)
@@ -14,6 +14,7 @@
 24-Mar-2008 Thomas Hornik
 #	search: great speed-up with large pages - requires PHP >= 4.3.3; small speed-up for PHP < 4.3.3
 #	FCK-Editor: loads large pages faster
+-	removed include/captcha/asp.php. css have to be added to module's css-files.
 23-Mar-2008 Matthias Gallas
 ! 	Updated form modul for valid output, removed all javascript (Big thanks to BerndJM)
 17-Mar-2008 Thomas Hornik
Index: trunk/wb/include/captcha/asp.php
===================================================================
--- trunk/wb/include/captcha/asp.php	(revision 761)
+++ trunk/wb/include/captcha/asp.php	(nonexistent)
@@ -1,37 +0,0 @@
-<?php
-
-// $Id$
-
-/*
-
- Website Baker Project <http://www.websitebaker.org/>
- Copyright (C) 2004-2008, Ryan Djurovich
-
- Website Baker is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- Website Baker is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Website Baker; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-*/
-
-// Must include code to stop this file being accessed directly
-if(!defined('WB_PATH')) { exit("Cannot access this file directly"); }
-
-if(ENABLED_ASP) {
-?>
-	<style type="text/css">
-		.nixhier { display:none; }
-	</style>
-<?php
-}
-
-?>
\ No newline at end of file

Property changes on: trunk/wb/include/captcha/asp.php
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-Id
\ No newline at end of property
Index: trunk/wb/account/signup_form.php
===================================================================
--- trunk/wb/account/signup_form.php	(revision 761)
+++ trunk/wb/account/signup_form.php	(revision 762)
@@ -28,13 +28,15 @@
 	exit(0);
 }
 require_once(WB_PATH.'/include/captcha/captcha.php');
-require_once(WB_PATH.'/include/captcha/asp.php');
+
 ?>
-
-<style>
+<style type="text/css">
 .value_input input, .value_input text, .value_input select {
 	width: 300px;
 }
+<?php if(ENABLED_ASP) { ?>
+.nixhier { display:none; }
+<?php } ?>
 </style>
 
 <h1>&nbsp;<?php echo $TEXT['SIGNUP']; ?></h1>
@@ -48,13 +50,13 @@
 	<input type="hidden" name="submitted_when" value="<?php $t=time(); echo $t; $_SESSION['submitted_when']=$t; ?>" />
 	<p class="nixhier">
 	email-address:
-	<label for="email-address">Leave this field empty, dont enter your e-mail address:</label>
+	<label for="email-address">Leave this field email-address blank:</label>
 	<input id="email-address" name="email-address" size="60" value="" /><br />
 	username (id):
-	<label for="name">Enter your user name or id not here:</label>
+	<label for="name">Leave this field name blank:</label>
 	<input id="name" name="name" size="60" value="" /><br />
 	Full Name:
-	<label for="full_name">This is to leave blank, dont enter your full name here:</label>
+	<label for="full_name">Leave this field full_name blank:</label>
 	<input id="full_name" name="full_name" size="60" value="" /><br />
 	</p>
 	<?php }
Index: trunk/wb/modules/form/view.php
===================================================================
--- trunk/wb/modules/form/view.php	(revision 761)
+++ trunk/wb/modules/form/view.php	(revision 762)
@@ -40,7 +40,6 @@
 } 
 
 require_once(WB_PATH.'/include/captcha/captcha.php');
-require_once(WB_PATH.'/include/captcha/asp.php');
 
 // Function for generating an optionsfor a select field
 if (!function_exists('make_option')) {
@@ -130,16 +129,16 @@
 <input type="hidden" name="submitted_when" value="<?php $t=time(); echo $t; $_SESSION['submitted_when']=$t; ?>" />
 <p class="nixhier">
 email address:
-<label for="email">Your e-mail address is not relevant Leave this field blank:</label>
+<label for="email">Leave this field email-address blank:</label>
 <input id="email" name="email" size="56" value="" /><br />
 Homepage:
-<label for="homepage">Do not enter a homepage-url www.whatever.com here:</label>
+<label for="homepage">Leave this field homepage blank:</label>
 <input id="homepage" name="homepage" size="55" value="" /><br />
 URL:
-<label for="url">Don't write anything in this field:</label>
+<label for="url">Leave this field url blank:</label>
 <input id="url" name="url" size="61" value="" /><br />
 Comment:
-<label for="comment">Enter not your comment here:</label>
+<label for="comment">Leave this field comment blank:</label>
 <textarea id="comment" name="comment" cols="50" rows="10"></textarea><br />
 </p>
 
Index: trunk/wb/modules/news/comment_page.php
===================================================================
--- trunk/wb/modules/news/comment_page.php	(revision 761)
+++ trunk/wb/modules/news/comment_page.php	(revision 762)
@@ -30,7 +30,6 @@
 }
 
 require_once(WB_PATH.'/include/captcha/captcha.php');
-require_once(WB_PATH.'/include/captcha/asp.php');
 
 // Get comments page template details from db
 $query_settings = $database->query("SELECT comments_page,use_captcha,commenting FROM ".TABLE_PREFIX."mod_news_settings WHERE section_id = '".SECTION_ID."'");
@@ -49,16 +48,16 @@
 	<input type="hidden" name="submitted_when" value="<?php $t=time(); echo $t; $_SESSION['submitted_when']=$t; ?>" />
 	<p class="nixhier">
 	email address:
-	<label for="email">We dont want to know your email-address. Leave this field empty:</label>
+	<label for="email">Leave this field email blank:</label>
 	<input id="email" name="email" size="60" value="" /><br />
 	Homepage:
-	<label for="homepage">Do not enter a homepage-url here, use field comment instead if you want:</label>
+	<label for="homepage">Leave this field homepage blank:</label>
 	<input id="homepage" name="homepage" size="60" value="" /><br />
 	URL:
-	<label for="url">Don't write anything in this url field:</label>
+	<label for="url">Leave this field url blank:</label>
 	<input id="url" name="url" size="60" value="" /><br />
 	Comment:
-	<label for="comment">Leave not your comment here:</label>
+	<label for="comment">Leave this field comment blank:</label>
 	<input id="comment" name="comment" size="60" value="" /><br />
 	</p>
 	<?php }