Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1746) +++ branches/2.8.x/CHANGELOG (revision 1747) @@ -13,6 +13,8 @@ +08 Sep-2012 Build 1747 Dietmar Woellbrink (Luisehahne) +# fixed issues with older table strucure for earlier WB installations 08 Sep-2012 Build 1746 Dietmar Woellbrink (Luisehahne) # add prefix wb_ to class name for content container if module has the same name as a html markup e.g code Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1746) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1747) @@ -51,5 +51,5 @@ // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled) if(!defined('VERSION')) define('VERSION', '2.8.3'); -if(!defined('REVISION')) define('REVISION', '1746'); +if(!defined('REVISION')) define('REVISION', '1747'); if(!defined('SP')) define('SP', ''); Index: branches/2.8.x/wb/framework/functions.php =================================================================== --- branches/2.8.x/wb/framework/functions.php (revision 1746) +++ branches/2.8.x/wb/framework/functions.php (revision 1747) @@ -1165,6 +1165,8 @@ } $sql .= '`directory`=\''.$language_code.'\', '; $sql .= '`name`=\''.$language_name.'\', '; + $sql .= '`description`=\'\', '; + $sql .= '`function`=\'\', '; $sql .= '`type`=\'language\', '; $sql .= '`version`=\''.$language_version.'\', '; $sql .= '`platform`=\''.$language_platform.'\', '; Index: branches/2.8.x/wb/modules/captcha_control/tool.php =================================================================== --- branches/2.8.x/wb/modules/captcha_control/tool.php (revision 1746) +++ branches/2.8.x/wb/modules/captcha_control/tool.php (revision 1747) @@ -20,7 +20,7 @@ if(defined('WB_PATH') == false) { // Stop this file being access directly - die('Access denied

Cannot access this file directly

'); + die('

Cannot access this file directly

'); } /* -------------------------------------------------------- */ @@ -43,27 +43,38 @@ if(!$admin_header) { $admin->print_header(); } $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], $js_back ); } - + + $ct_text = ''; + $captcha_type = 'calc_text'; // get configuration settings $enabled_captcha = ($_POST['enabled_captcha'] == '1') ? '1' : '0'; $enabled_asp = ($_POST['enabled_asp'] == '1') ? '1' : '0'; $captcha_type = $admin->add_slashes($_POST['captcha_type']); - - // update database settings - $database->query("UPDATE $table SET - enabled_captcha = '$enabled_captcha', - enabled_asp = '$enabled_asp', - captcha_type = '$captcha_type' - "); - // save text-captchas if($captcha_type == 'text') { // ct_text $text_qa=$admin->add_slashes($_POST['text_qa']); if(!preg_match('/### .*? ###/', $text_qa)) { - $database->query("UPDATE $table SET ct_text = '$text_qa'"); + $ct_text = $text_qa; } } - + + + // update database settings + + $sql = 'UPDATE '.$table.' '; + $sql .= 'SET `enabled_captcha` = \''.$enabled_captcha.'\', '; + $sql .= '`enabled_asp` = \''.$enabled_asp.'\', '; + $sql .= '`captcha_type` = \''.$captcha_type.'\', '; + $sql .= '`asp_session_min_age` = 20, '; + $sql .= '`asp_view_min_age` = 10, '; + $sql .= '`asp_input_min_age` = 5, '; + $sql .= '`ct_text` =\''.$ct_text.'\' '; + + if(!$database->query($sql)) { + // print '
function '.__FUNCTION__.'( '.''.' );  basename: '.basename(__FILE__).'  line: '.__LINE__.' -> 
';
+    //    print_r( explode(',',$sql) ); print '
'; // flush ();sleep(10); die(); + } + // check if there is a database error, otherwise say successful if(!$admin_header) { $admin->print_header(); } if($database->is_error()) { @@ -74,7 +85,7 @@ } else { } - + // include captcha-file require_once(WB_PATH .'/include/captcha/captcha.php'); @@ -103,10 +114,10 @@ pics["old_image"] = new Image(); pics["old_image"].src = ""; - + pics["calc_text"] = new Image(); pics["calc_text"].src = ""; - + pics["text"] = new Image(); pics["text"].src = ""; @@ -114,7 +125,7 @@ document.captcha_example.src = pics[document.store_settings.captcha_type.value].src; toggle_text_qa(); } - + function toggle_text_qa() { if(document.store_settings.captcha_type.value == 'text' ) { document.getElementById('text_qa').style.display = ''; @@ -138,7 +149,7 @@ $enabled_asp = '1'; $captcha_type = 'calc_text'; } - + // write out heading echo '

' .$MOD_CAPTCHA_CONTROL['HEADING'] .'

';