Project

General

Profile

« Previous | Next » 

Revision 820

Added by thorn over 16 years ago

ASP: off per default. CAPTCHA: removed unneeded $admin. Filename: just convert chars like quote, doublequote, < > & to empty string.

View differences:

trunk/CHANGELOG
10 10
# = Bugfix
11 11
! = Update/Change
12 12

  
13
------------------------------------- 2.7.0 -------------------------------------
13
------------------------------------- 2.7.0 -------------------------------------
14
13-Apr-2008 Thomas Hornik
15
!	ASP: off per default. CAPTCHA: removed unneeded $admin. Filename: just convert chars like quote, doublequote, < > & to empty string.
14 16
10-Apr-2008 Christian Sommer
15 17
!	fixed WB-Link Plugin to work with WB versions below 2.7 ($admin->page_is_visible() only available in WB 2.7)
16 18
09-Apr-2008 Christian Sommer
trunk/wb/upgrade-script.php
54 54
	status_msg(', WB 2.7 core files uploaded: ');
55 55
	@include_once(WB_PATH .'/framework/functions.php');
56 56
	@include_once(ADMIN_PATH .'/interface/version.php');
57
	if(defined('VERSION') && VERSION == '2.7 (RC3a)'
57
	if(defined('VERSION') && VERSION == '2.7 (RC3)'
58 58
		&& function_exists('get_variable_content') 
59 59
		&& file_exists(WB_PATH .'/modules/menu_link/languages/DE.php') 
60 60
		&& file_exists(WB_PATH .'/modules/output_filter/filter-routines.php') 
......
523 523
$database->query("DROP TABLE IF EXISTS `$table`");
524 524
$database->query("CREATE TABLE `$table` (
525 525
	`enabled_captcha` VARCHAR(1) NOT NULL DEFAULT '1',
526
	`enabled_asp` VARCHAR(1) NOT NULL DEFAULT '1',
526
	`enabled_asp` VARCHAR(1) NOT NULL DEFAULT '0',
527 527
	`captcha_type` VARCHAR(255) NOT NULL DEFAULT 'calc_text',
528 528
	`asp_session_min_age` INT(11) NOT NULL DEFAULT '20',
529 529
	`asp_view_min_age` INT(11) NOT NULL DEFAULT '10',
trunk/wb/include/captcha/captchas/text.php
26 26
// Must include code to stop this file being accessed directly
27 27
if(defined('WB_PATH') == false) { exit("Cannot access this file directly"); }
28 28

  
29
global $admin;
30 29
global $database;
31 30
$name = 'text';
32 31
$file = WB_PATH."/temp/.captcha_$name.php";
trunk/wb/include/captcha/captcha.php
26 26
// Must include code to stop this file being accessed directly
27 27
if(!defined('WB_PATH')) { exit("Cannot access this file directly"); }
28 28

  
29
if(!isset($admin)) {
30
	require_once(WB_PATH.'/framework/class.wb.php');
31
	$admin = new wb;
32
}
33

  
34 29
// check if module language file exists for the language set by the user (e.g. DE, EN)
35 30
global $MOD_CAPTCHA;
36 31
if(!file_exists(WB_PATH.'/modules/captcha_control/languages/'.LANGUAGE .'.php')) {
trunk/wb/framework/functions-utf8.php
407 407
	$str = str_replace('&#39;', '&apos;', $str);
408 408
	$str = preg_replace('/&#([0-9]+);/e', "dechex('$1')",  $str);
409 409
	// maybe there are some &gt; &lt; &apos; &quot; &amp; &nbsp; left, replace them too
410
	$entities = array('&gt;'=>'_','&lt;'=>'_','&apos;'=>'_','&quot;'=>'_','&amp;'=>'_','&nbsp;'=>' ');
410
	$entities = array('&gt;'=>'','&lt;'=>'','&apos;'=>'','\''=>'','&quot;'=>'','&amp;'=>'','&nbsp;'=>' ');
411 411
	$str = strtr($str, $entities);
412 412
	
413 413
	return($str);
trunk/wb/modules/captcha_control/install.php
31 31

  
32 32
$database->query("CREATE TABLE `$table` (
33 33
	`enabled_captcha` VARCHAR(1) NOT NULL DEFAULT '1',
34
	`enabled_asp` VARCHAR(1) NOT NULL DEFAULT '1',
34
	`enabled_asp` VARCHAR(1) NOT NULL DEFAULT '0',
35 35
	`captcha_type` VARCHAR(255) NOT NULL DEFAULT 'calc_text',
36 36
	`asp_session_min_age` INT(11) NOT NULL DEFAULT '20',
37 37
	`asp_view_min_age` INT(11) NOT NULL DEFAULT '10',

Also available in: Unified diff