Index: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG	(revision 819)
+++ trunk/CHANGELOG	(revision 820)
@@ -10,7 +10,9 @@
 # = Bugfix
 ! = Update/Change
 
-------------------------------------- 2.7.0 -------------------------------------
+------------------------------------- 2.7.0 -------------------------------------
+13-Apr-2008 Thomas Hornik
+!	ASP: off per default. CAPTCHA: removed unneeded $admin. Filename: just convert chars like quote, doublequote, < > & to empty string.
 10-Apr-2008 Christian Sommer
 !	fixed WB-Link Plugin to work with WB versions below 2.7 ($admin->page_is_visible() only available in WB 2.7)
 09-Apr-2008 Christian Sommer
Index: trunk/wb/upgrade-script.php
===================================================================
--- trunk/wb/upgrade-script.php	(revision 819)
+++ trunk/wb/upgrade-script.php	(revision 820)
@@ -54,7 +54,7 @@
 	status_msg(', WB 2.7 core files uploaded: ');
 	@include_once(WB_PATH .'/framework/functions.php');
 	@include_once(ADMIN_PATH .'/interface/version.php');
-	if(defined('VERSION') && VERSION == '2.7 (RC3a)'
+	if(defined('VERSION') && VERSION == '2.7 (RC3)'
 		&& function_exists('get_variable_content') 
 		&& file_exists(WB_PATH .'/modules/menu_link/languages/DE.php') 
 		&& file_exists(WB_PATH .'/modules/output_filter/filter-routines.php') 
@@ -523,7 +523,7 @@
 $database->query("DROP TABLE IF EXISTS `$table`");
 $database->query("CREATE TABLE `$table` (
 	`enabled_captcha` VARCHAR(1) NOT NULL DEFAULT '1',
-	`enabled_asp` VARCHAR(1) NOT NULL DEFAULT '1',
+	`enabled_asp` VARCHAR(1) NOT NULL DEFAULT '0',
 	`captcha_type` VARCHAR(255) NOT NULL DEFAULT 'calc_text',
 	`asp_session_min_age` INT(11) NOT NULL DEFAULT '20',
 	`asp_view_min_age` INT(11) NOT NULL DEFAULT '10',
Index: trunk/wb/include/captcha/captchas/text.php
===================================================================
--- trunk/wb/include/captcha/captchas/text.php	(revision 819)
+++ trunk/wb/include/captcha/captchas/text.php	(revision 820)
@@ -26,7 +26,6 @@
 // Must include code to stop this file being accessed directly
 if(defined('WB_PATH') == false) { exit("Cannot access this file directly"); }
 
-global $admin;
 global $database;
 $name = 'text';
 $file = WB_PATH."/temp/.captcha_$name.php";
Index: trunk/wb/include/captcha/captcha.php
===================================================================
--- trunk/wb/include/captcha/captcha.php	(revision 819)
+++ trunk/wb/include/captcha/captcha.php	(revision 820)
@@ -26,11 +26,6 @@
 // Must include code to stop this file being accessed directly
 if(!defined('WB_PATH')) { exit("Cannot access this file directly"); }
 
-if(!isset($admin)) {
-	require_once(WB_PATH.'/framework/class.wb.php');
-	$admin = new wb;
-}
-
 // check if module language file exists for the language set by the user (e.g. DE, EN)
 global $MOD_CAPTCHA;
 if(!file_exists(WB_PATH.'/modules/captcha_control/languages/'.LANGUAGE .'.php')) {
Index: trunk/wb/framework/functions-utf8.php
===================================================================
--- trunk/wb/framework/functions-utf8.php	(revision 819)
+++ trunk/wb/framework/functions-utf8.php	(revision 820)
@@ -407,7 +407,7 @@
 	$str = str_replace('&#39;', '&apos;', $str);
 	$str = preg_replace('/&#([0-9]+);/e', "dechex('$1')",  $str);
 	// maybe there are some &gt; &lt; &apos; &quot; &amp; &nbsp; left, replace them too
-	$entities = array('&gt;'=>'_','&lt;'=>'_','&apos;'=>'_','&quot;'=>'_','&amp;'=>'_','&nbsp;'=>' ');
+	$entities = array('&gt;'=>'','&lt;'=>'','&apos;'=>'','\''=>'','&quot;'=>'','&amp;'=>'','&nbsp;'=>' ');
 	$str = strtr($str, $entities);
 	
 	return($str);
Index: trunk/wb/modules/captcha_control/install.php
===================================================================
--- trunk/wb/modules/captcha_control/install.php	(revision 819)
+++ trunk/wb/modules/captcha_control/install.php	(revision 820)
@@ -31,7 +31,7 @@
 
 $database->query("CREATE TABLE `$table` (
 	`enabled_captcha` VARCHAR(1) NOT NULL DEFAULT '1',
-	`enabled_asp` VARCHAR(1) NOT NULL DEFAULT '1',
+	`enabled_asp` VARCHAR(1) NOT NULL DEFAULT '0',
 	`captcha_type` VARCHAR(255) NOT NULL DEFAULT 'calc_text',
 	`asp_session_min_age` INT(11) NOT NULL DEFAULT '20',
 	`asp_view_min_age` INT(11) NOT NULL DEFAULT '10',