Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG	(revision 1535)
+++ branches/2.8.x/CHANGELOG	(revision 1536)
@@ -12,6 +12,9 @@
 
 =========================== add small Features 2.8.2 ==========================
 10 Dez-2011 Build 1535 Dietmar Woellbrink (Luisehahne)
++ add upgrade.php to captcha_control and small changes
++ add FolderProtectFile to quickskin
+10 Dez-2011 Build 1535 Dietmar Woellbrink (Luisehahne)
 ! changes in code modul
 + add function getTableEngine to class.database 
 + add Quickskin to include folder
Index: branches/2.8.x/wb/include/quickSkin/qx/index.php
===================================================================
--- branches/2.8.x/wb/include/quickSkin/qx/index.php	(nonexistent)
+++ branches/2.8.x/wb/include/quickSkin/qx/index.php	(revision 1536)
@@ -0,0 +1,20 @@
+<?php
+/**
+ *
+ * @category        Security
+ * @package         FolderProtectFile
+ * @author          WebsiteBaker Project
+ * @copyright       2009-2011, Website Baker Org. e.V.
+ * @link            http://www.websitebaker2.org/
+ * @license         http://www.gnu.org/licenses/gpl.html
+ * @platform        WebsiteBaker 2.8.x
+ * @requirements    PHP 5.2.2 and higher
+ * @version         $Id$
+ * @filesource      $HeadURL$
+ * @lastmodified    $Date$
+ *
+ */
+
+header('HTTP/1.1 301 Moved Permanently');
+header("Location: ../../../index.php");
+

Property changes on: branches/2.8.x/wb/include/quickSkin/qx/index.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Date Author Id Revision HeadURL
\ No newline at end of property
Index: branches/2.8.x/wb/include/quickSkin/index.php
===================================================================
--- branches/2.8.x/wb/include/quickSkin/index.php	(nonexistent)
+++ branches/2.8.x/wb/include/quickSkin/index.php	(revision 1536)
@@ -0,0 +1,20 @@
+<?php
+/**
+ *
+ * @category        Security
+ * @package         FolderProtectFile
+ * @author          WebsiteBaker Project
+ * @copyright       2009-2011, Website Baker Org. e.V.
+ * @link            http://www.websitebaker2.org/
+ * @license         http://www.gnu.org/licenses/gpl.html
+ * @platform        WebsiteBaker 2.8.x
+ * @requirements    PHP 5.2.2 and higher
+ * @version         $Id$
+ * @filesource      $HeadURL$
+ * @lastmodified    $Date$
+ *
+ */
+
+header('HTTP/1.1 301 Moved Permanently');
+header("Location: ../../index.php");
+

Property changes on: branches/2.8.x/wb/include/quickSkin/index.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Date Author Id Revision HeadURL
\ No newline at end of property
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php	(revision 1535)
+++ branches/2.8.x/wb/admin/interface/version.php	(revision 1536)
@@ -52,5 +52,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.2');
-if(!defined('REVISION')) define('REVISION', '1535');
+if(!defined('REVISION')) define('REVISION', '1536');
 if(!defined('SP')) define('SP', 'SP2');
Index: branches/2.8.x/wb/modules/captcha_control/uninstall.php
===================================================================
--- branches/2.8.x/wb/modules/captcha_control/uninstall.php	(revision 1535)
+++ branches/2.8.x/wb/modules/captcha_control/uninstall.php	(revision 1536)
@@ -3,9 +3,7 @@
  *
  * @category        modules
  * @package         captcha_control
- * @author          Independend-Software-Team
  * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
  * @copyright       2009-2011, Website Baker Org. e.V.
  * @link            http://www.websitebaker2.org/
  * @license         http://www.gnu.org/licenses/gpl.html
@@ -18,7 +16,13 @@
  */
 
 // prevent this file from being accessed directly
-if(!defined('WB_PATH')) { exit('Cannot access this file directly'); }
+/* -------------------------------------------------------- */
+if(defined('WB_PATH') == false)
+{
+	// Stop this file being access directly
+		die('<head><title>Access denied</title></head><body><h2 style="color:red;margin:3em auto;text-align:center;">Cannot access this file directly</h2></body></html>');
+}
+/* -------------------------------------------------------- */
 
 $table = TABLE_PREFIX .'mod_captcha_control';
 $database->query("DROP TABLE `$table`");
Index: branches/2.8.x/wb/modules/captcha_control/info.php
===================================================================
--- branches/2.8.x/wb/modules/captcha_control/info.php	(revision 1535)
+++ branches/2.8.x/wb/modules/captcha_control/info.php	(revision 1536)
@@ -1,40 +1,33 @@
 <?php
+/**
+ *
+ * @category        modules
+ * @package         captcha_control
+ * @author          WebsiteBaker Project
+ * @copyright       2009-2011, Website Baker Org. e.V.
+ * @link            http://www.websitebaker2.org/
+ * @license         http://www.gnu.org/licenses/gpl.html
+ * @platform        WebsiteBaker 2.8.x
+ * @requirements    PHP 5.2.2 and higher
+ * @version         $Id$
+ * @filesource      $HeadURL$
+ * @lastmodified    $Date$
+ *
+ */
 
-// $Id$
-
-/*
-
- Website Baker Project <http://www.websitebaker.org/>
- Copyright (C) 2004-2009, 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
-
- -----------------------------------------------------------------------------------------
-  This is a control-tool for captcha and ASP
- -----------------------------------------------------------------------------------------
-V1.0 - inital version
-
-*/
-
+// prevent this file from being accessed directly
+/* -------------------------------------------------------- */
+if(defined('WB_PATH') == false)
+{
+	// Stop this file being access directly
+		die('<head><title>Access denied</title></head><body><h2 style="color:red;margin:3em auto;text-align:center;">Cannot access this file directly</h2></body></html>');
+}
+/* -------------------------------------------------------- */
 $module_directory 	= 'captcha_control';
-$module_name 			= 'Captcha and Advanced-Spam-Protection (ASP) Control';
-$module_function 		= 'tool';
-$module_version 		= '1.1';
-$module_platform 		= '2.7 | 2.8.x';
-$module_author 		= 'Thomas Hornik (thorn)';
-$module_license 		= 'GNU General Public License';
-$module_description 	= 'Admin-Tool to control CAPTCHA and ASP';
-
-?>
\ No newline at end of file
+$module_name        = 'Captcha and Advanced-Spam-Protection (ASP) Control';
+$module_function    = 'tool';
+$module_version     = '1.2.0';
+$module_platform    = '2.7 | 2.8.x';
+$module_author      = 'Thomas Hornik (thorn)';
+$module_license     = 'GNU General Public License';
+$module_description = 'Admin-Tool to control CAPTCHA and ASP';
Index: branches/2.8.x/wb/modules/captcha_control/tool.php
===================================================================
--- branches/2.8.x/wb/modules/captcha_control/tool.php	(revision 1535)
+++ branches/2.8.x/wb/modules/captcha_control/tool.php	(revision 1536)
@@ -3,9 +3,7 @@
  *
  * @category        modules
  * @package         captcha_control
- * @author          Independend-Software-Team
  * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
  * @copyright       2009-2011, Website Baker Org. e.V.
  * @link            http://www.websitebaker2.org/
  * @license         http://www.gnu.org/licenses/gpl.html
@@ -17,8 +15,14 @@
  *
  */
 
-// Must include code to stop this file being access directly
-if(defined('WB_PATH') == false) { die("Cannot access this file directly"); }
+// prevent this file from being accessed directly
+/* -------------------------------------------------------- */
+if(defined('WB_PATH') == false)
+{
+	// Stop this file being access directly
+		die('<head><title>Access denied</title></head><body><h2 style="color:red;margin:3em auto;text-align:center;">Cannot access this file directly</h2></body></html>');
+}
+/* -------------------------------------------------------- */
 
 // check if module language file exists for the language set by the user (e.g. DE, EN)
 if(!file_exists(WB_PATH .'/modules/captcha_control/languages/'.LANGUAGE .'.php')) {
Index: branches/2.8.x/wb/modules/captcha_control/install.php
===================================================================
--- branches/2.8.x/wb/modules/captcha_control/install.php	(revision 1535)
+++ branches/2.8.x/wb/modules/captcha_control/install.php	(revision 1536)
@@ -3,9 +3,7 @@
  *
  * @category        modules
  * @package         captcha_control
- * @author          Independend-Software-Team
  * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
  * @copyright       2009-2011, Website Baker Org. e.V.
  * @link            http://www.websitebaker2.org/
  * @license         http://www.gnu.org/licenses/gpl.html
@@ -18,12 +16,18 @@
  */
 
 // prevent this file from being accessed directly
-if(!defined('WB_PATH')) { exit('Cannot access this file directly'); }
+/* -------------------------------------------------------- */
+if(defined('WB_PATH') == false)
+{
+	// Stop this file being access directly
+		die('<head><title>Access denied</title></head><body><h2 style="color:red;margin:3em auto;text-align:center;">Cannot access this file directly</h2></body></html>');
+}
+/* -------------------------------------------------------- */
 
 $table = TABLE_PREFIX.'mod_captcha_control';
 $database->query("DROP TABLE IF EXISTS `$table`");
 
-$database->query("CREATE TABLE `$table` (
+$database->query("CREATE TABLE IF NOT EXISTS `$table` (
 	`enabled_captcha` VARCHAR(1) NOT NULL DEFAULT '1',
 	`enabled_asp` VARCHAR(1) NOT NULL DEFAULT '0',
 	`captcha_type` VARCHAR(255) NOT NULL DEFAULT 'calc_text',
@@ -31,7 +35,7 @@
 	`asp_view_min_age` INT(11) NOT NULL DEFAULT '10',
 	`asp_input_min_age` INT(11) NOT NULL DEFAULT '5',
 	`ct_text` LONGTEXT NOT NULL
-	)"
+	) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci"
 );
 
 // add new row using the table default values defined above
Index: branches/2.8.x/wb/modules/captcha_control/upgrade.php
===================================================================
--- branches/2.8.x/wb/modules/captcha_control/upgrade.php	(nonexistent)
+++ branches/2.8.x/wb/modules/captcha_control/upgrade.php	(revision 1536)
@@ -0,0 +1,37 @@
+<?php
+/**
+ *
+ * @category        modules
+ * @package         captcha_control
+ * @author          WebsiteBaker Project
+ * @copyright       2009-2011, Website Baker Org. e.V.
+ * @link            http://www.websitebaker2.org/
+ * @license         http://www.gnu.org/licenses/gpl.html
+ * @platform        WebsiteBaker 2.8.x
+ * @requirements    PHP 5.2.2 and higher
+ * @version         $Id$
+ * @filesource      $HeadURL$
+ * @lastmodified    $Date$
+ *
+ */
+
+// prevent this file from being accessed directly
+/* -------------------------------------------------------- */
+if(defined('WB_PATH') == false)
+{
+	// Stop this file being access directly
+		die('<head><title>Access denied</title></head><body><h2 style="color:red;margin:3em auto;text-align:center;">Cannot access this file directly</h2></body></html>');
+}
+/* -------------------------------------------------------- */
+$msg = '';
+$sTable = TABLE_PREFIX.'mod_captcha_control';
+if(($sOldType = $database->getTableEngine($sTable))) {
+	if(('myisam' != strtolower($sOldType))) {
+		if(!$database->query('ALTER TABLE `'.$sTable.'` Engine = \'MyISAM\' ')) {
+			$msg = $database->get_error();
+		}
+	}
+} else {
+	$msg = $database->get_error();
+}
+// ------------------------------------
\ No newline at end of file

Property changes on: branches/2.8.x/wb/modules/captcha_control/upgrade.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Date Author Id Revision HeadURL
\ No newline at end of property