Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG	(revision 1895)
+++ branches/2.8.x/CHANGELOG	(revision 1896)
@@ -13,6 +13,10 @@
 
 
 
+20 Mar-2013 Build 1896 Dietmar Woellbrink (Luisehahne)
+# solved install exeption
+! update wrapper module and set version to 2.8.4
+! update wysiwyg install.php, info.php
 20 Mar-2013 Build 1895 Dietmar Woellbrink (Luisehahne)
 ! update jsadmin module and set Version to 1.4.1
 ! update news module and set Version to 3.8.7
Index: branches/2.8.x/wb/upgrade-script.php
===================================================================
--- branches/2.8.x/wb/upgrade-script.php	(revision 1895)
+++ branches/2.8.x/wb/upgrade-script.php	(revision 1896)
@@ -954,7 +954,7 @@
 	 */
 	$aModuleList = array(
 	              'captcha_control','code','form','jsadmin',
-	              'menu_link','news','output_filter','wysiwyg');
+	              'menu_link','news','output_filter','wrapper','wysiwyg');
 	if(sizeof($aModuleList)) 
 	{
 		echo '<h3>Step '.(++$stepID).': Upgrade proofed modules</h3>';
Index: branches/2.8.x/wb/config.php.new
===================================================================
--- branches/2.8.x/wb/config.php.new	(revision 1895)
+++ branches/2.8.x/wb/config.php.new	(revision 1896)
@@ -0,0 +1 @@
+<?php
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php	(revision 1895)
+++ branches/2.8.x/wb/admin/interface/version.php	(revision 1896)
@@ -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', '1895');
+if(!defined('REVISION')) define('REVISION', '1896');
 if(!defined('SP')) define('SP', '');
Index: branches/2.8.x/wb/setup.ini.php.new
===================================================================
--- branches/2.8.x/wb/setup.ini.php.new	(revision 1895)
+++ branches/2.8.x/wb/setup.ini.php.new	(revision 1896)
@@ -0,0 +1 @@
+<?php
Index: branches/2.8.x/wb/install/save.php
===================================================================
--- branches/2.8.x/wb/install/save.php	(revision 1895)
+++ branches/2.8.x/wb/install/save.php	(revision 1896)
@@ -39,10 +39,16 @@
 include(dirname(dirname(__FILE__)).'/framework/WbAutoloader.php');
 WbAutoloader::doRegister(array('admin'=>'a', 'modules'=>'m'));
 
-/**
- * Set constants for system/install values
- * @throws RuntimeException
- */
+function errorLogs($error_str)
+{
+	$log_error = true;
+	if ( ! function_exists('error_log') ) { $log_error = false; }
+	$log_file = @ini_get('error_log');
+	if ( !empty($log_file) && ('syslog' != $log_file) && !@is_writable($log_file) ) {
+		$log_error = false;
+	}
+	if ( $log_error ) {@error_log($error_str, 0);}
+}
 
 /**
  * Read DB settings from configuration file
@@ -407,17 +413,15 @@
 	set_error("The configuration file $sConfigName is not writable. Change its permissions so it is, then re-run step 4.");
 }
 
-// load db configuration ---
-$sDbConnectType = 'url'; // depending from class WbDatabase it can be 'url' or 'dsn'
-$aSqlData = _readConfiguration($sDbConnectType);
-
 //_SetInstallPathConstants();
-//$TABLE_PREFIX = $table_prefix;
-//$WB_PATH = (dirname(dirname(__FILE__)));
-//$ADMIN_PATH = $WB_PATH.'/admin';
+if(!defined('WB_INSTALL_PROCESS')){ define('WB_INSTALL_PROCESS', true ); }
+if(!defined('WB_URL')){ define('WB_URL', trim( $wb_url,'/' )); }
 if(!defined('WB_PATH')){ define('WB_PATH', dirname(dirname(__FILE__))); }
 if(!defined('ADMIN_URL')){ define('ADMIN_URL', WB_URL.'/admin'); }
 if(!defined('ADMIN_PATH')){ define('ADMIN_PATH', WB_PATH.'/admin'); }
+// load db configuration ---
+$sDbConnectType = 'url'; // depending from class WbDatabase it can be 'url' or 'dsn'
+$aSqlData = _readConfiguration($sDbConnectType);
 
 if(!file_exists(WB_PATH.'/framework/class.admin.php')) {
 	set_error('It appears the Absolute path that you entered is incorrect');
Index: branches/2.8.x/wb/modules/wrapper/sql/mod_wrapper.sql
===================================================================
--- branches/2.8.x/wb/modules/wrapper/sql/mod_wrapper.sql	(nonexistent)
+++ branches/2.8.x/wb/modules/wrapper/sql/mod_wrapper.sql	(revision 1896)
@@ -0,0 +1,23 @@
+-- phpMyAdmin SQL Dump
+-- Server version 5.5.7
+-- Erstellungszeit: 15. Mrz 2013 um 18:21
+--
+SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
+-- --------------------------------------------------------
+-- Database structure for WebsiteBaker core
+--
+-- Replacements: {TABLE_PREFIX}, {TABLE_ENGINE}, {TABLE_COLLATION}
+--
+-- --------------------------------------------------------
+--
+-- Tabellenstruktur für Tabelle `mod_wrapper`
+--
+CREATE TABLE IF NOT EXISTS `{TABLE_PREFIX}mod_wrapper` (
+  `section_id` int(11) NOT NULL DEFAULT '0',
+  `page_id` int(11) NOT NULL DEFAULT '0',
+  `url` text{TABLE_COLLATION} NOT NULL DEFAULT '',
+  `height` int(11) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`section_id`)
+){TABLE_ENGINE};
+--
+-- EndOfFile
\ No newline at end of file
Index: branches/2.8.x/wb/modules/wrapper/info.php
===================================================================
--- branches/2.8.x/wb/modules/wrapper/info.php	(revision 1895)
+++ branches/2.8.x/wb/modules/wrapper/info.php	(revision 1896)
@@ -4,22 +4,21 @@
  * @category        modules
  * @package         wrapper
  * @author          WebsiteBaker Project
- * @copyright       2009-2011, Website Baker Org. e.V.
- * @link			http://www.websitebaker2.org/
+ * @copyright       2009-2013, WebsiteBaker 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: http://svn.websitebaker2.org/branches/2.8.x/wb/modules/wrapper/install.php $
+ * @version         $Id$
+ * @filesource      $HeadURL: http://svn.websitebaker2.org/branches/2.8.x/wb/modules/wrapper/install.php $
  * @lastmodified    $Date: 2011-01-10 13:21:47 +0100 (Mo, 10 Jan 2011) $
  *
  */
-// Must include code to stop this file being access 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>');
+// Must include code to stop this file being accessed directly
+if(!defined('WB_PATH')) {
+	require_once(dirname(dirname(dirname(__FILE__))).'/framework/globalExceptionHandler.php');
+	throw new IllegalFileException();
 }
 /* -------------------------------------------------------- */
 
@@ -26,8 +25,8 @@
 $module_directory = 'wrapper';
 $module_name = 'Wrapper';
 $module_function = 'page';
-$module_version = '2.8.3';
-$module_platform = '2.7 | 2.8.x';
+$module_version = '2.8.4';
+$module_platform = '2.8.4';
 $module_author = 'Ryan Djurovich';
 $module_license = 'GNU General Public License';
 $module_description = 'This module allows you to wrap your site around another using an inline frame';
Index: branches/2.8.x/wb/modules/wrapper/install.php
===================================================================
--- branches/2.8.x/wb/modules/wrapper/install.php	(revision 1895)
+++ branches/2.8.x/wb/modules/wrapper/install.php	(revision 1896)
@@ -4,27 +4,26 @@
  * @category        modules
  * @package         wrapper
  * @author          WebsiteBaker Project
- * @copyright       2009-2011, Website Baker Org. e.V.
- * @link			http://www.websitebaker2.org/
+ * @copyright       2009-2013, WebsiteBaker 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$
+ * @version         $Id$
+ * @filesource      $HeadURL$
  * @lastmodified    $Date$
  *
  */
-
-if(defined('WB_URL')) {
-	
+/* -------------------------------------------------------- */
+// Must include code to stop this file being accessed directly
+if(!defined('WB_PATH')) {
+	require_once(dirname(dirname(dirname(__FILE__))).'/framework/globalExceptionHandler.php');
+	throw new IllegalFileException();
+} else {
+// Create tables
+	$aError = array();
 	// Create table
-	// $database->query("DROP TABLE IF EXISTS `".TABLE_PREFIX."mod_wrapper`");
-	$mod_wrapper = 'CREATE TABLE IF NOT EXISTS `'.TABLE_PREFIX.'mod_wrapper` ('
-		. ' `section_id` INT NOT NULL DEFAULT \'0\','
-		. ' `page_id` INT NOT NULL DEFAULT \'0\','
-		. ' `url` TEXT NOT NULL,'
-		. ' `height` INT NOT NULL DEFAULT \'0\','
-		. ' PRIMARY KEY ( `section_id` ) '
-		. ' ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci';
-	$database->query($mod_wrapper);
+	if(!$database->SqlImport(dirname(__FILE__).'/sql/mod_wrapper.sql','',false)){
+		$aError[] = $database->get_error();
+	}
 }
Index: branches/2.8.x/wb/modules/wrapper/upgrade.php
===================================================================
--- branches/2.8.x/wb/modules/wrapper/upgrade.php	(revision 1895)
+++ branches/2.8.x/wb/modules/wrapper/upgrade.php	(revision 1896)
@@ -4,34 +4,75 @@
  * @category        modules
  * @package         wrapper
  * @author          WebsiteBaker Project
- * @copyright       2009-2011, Website Baker Org. e.V.
- * @link			http://www.websitebaker2.org/
+ * @copyright       2009-2013, WebsiteBaker 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$
+ * @version         $Id$
+ * @filesource      $HeadURL$
  * @lastmodified    $Date$
  *
  */
-// Must include code to stop this file being access 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>');
+// Must include code to stop this file being accessed directly
+if(!defined('WB_URL')) {
+	require_once(dirname(dirname(dirname(__FILE__))).'/framework/globalExceptionHandler.php');
+	throw new IllegalFileException();
 }
 /* -------------------------------------------------------- */
 
-$msg = '';
-$sTable = TABLE_PREFIX.'mod_wrapper';
-if(($sOldType = $database->getTableEngine($sTable))) {
-	if(('myisam' != strtolower($sOldType))) {
-		if(!$database->query('ALTER TABLE `'.$sTable.'` Engine = \'MyISAM\' ')) {
-			$msg = $database->get_error();
+	function mod_wrapper_upgrade($bDebug=false) {
+		global $OK ,$FAIL;
+		$database=WbDatabase::getInstance();
+		$msg = array();
+		$callingScript = $_SERVER["SCRIPT_NAME"];
+		// check if upgrade startet by upgrade-script to echo a message
+		$tmp = 'upgrade-script.php';
+		$globalStarted = substr_compare($callingScript, $tmp,(0-strlen($tmp)),strlen($tmp)) === 0;
+// check for missing tables, if true stop the upgrade
+		$aTable = array('mod_wrapper');
+		$aPackage = UpgradeHelper::existsAllTables($aTable);
+		if( sizeof($aPackage) > 0){
+			$msg[] =  'TABLE '.implode(' missing! '.$FAIL.'<br />TABLE ',$aPackage).' missing! '.$FAIL;
+			$msg[] = 'Mod_Wrapper upgrade failed'." $FAIL";
+			if($globalStarted) {
+				echo '<strong>'.implode('<br />',$msg).'</strong><br />';
+			}
+			return ( ($globalStarted==true ) ? $globalStarted : $msg);
+		} else {
+			for($x=0; $x<sizeof($aTable);$x++) {
+				if(($sOldType = $database->getTableEngine($database->TablePrefix.$aTable[$x]))) {
+					if(('myisam' != strtolower($sOldType))) {
+						if(!$database->query('ALTER TABLE `'.$database->TablePrefix.$aTable[$x].'` Engine = \'MyISAM\' ')) {
+							$msg[] = $database->get_error();
+						} else{
+							$msg[] = 'TABLE `'.$database->TablePrefix.$aTable[$x].'` changed to Engine = \'MyISAM\''." $OK";
+						}
+					} else {
+						$msg[] = 'TABLE `'.$database->TablePrefix.$aTable[$x].'` has Engine = \'MyISAM\''." $OK";
+					}
+				} else {
+					$msg[] = $database->get_error();
+				}
+			}
+// only for upgrade-script
+			if($globalStarted) {
+				if($bDebug) {
+					echo '<strong>'.implode('<br />',$msg).'</strong><br />';
+				}
+			}
 		}
+		$msg[] = 'Mod_Wrapper upgrade successfull finished '." $OK";
+		if($globalStarted) {
+			echo "<strong>Mod_Wrapper upgrade successfull finished $OK</strong><br />";
+		}
+		return ( ($globalStarted==true ) ? $globalStarted : $msg);
 	}
-} else {
-	$msg = $database->get_error();
+// ------------------------------------
+
+$bDebugModus = ((isset($bDebugModus)) ? $bDebugModus : false);
+// Don't show the messages twice
+if( is_array($msg = mod_wrapper_upgrade($bDebugModus)) ) {
+	echo '<strong>'.implode('<br />',$msg).'</strong><br />';
 }
-// ------------------------------------
\ No newline at end of file
Index: branches/2.8.x/wb/modules/wysiwyg/info.php
===================================================================
--- branches/2.8.x/wb/modules/wysiwyg/info.php	(revision 1895)
+++ branches/2.8.x/wb/modules/wysiwyg/info.php	(revision 1896)
@@ -4,7 +4,7 @@
  * @category        modules
  * @package         wysiwyg
  * @author          WebsiteBaker Project
- * @copyright       2009-2012, WebsiteBaker Org. e.V.
+ * @copyright       2009-2013, WebsiteBaker Org. e.V.
  * @link            http://www.websitebaker2.org/
  * @license         http://www.gnu.org/licenses/gpl.html
  * @platform        WebsiteBaker 2.8.3
Index: branches/2.8.x/wb/modules/wysiwyg/install.php
===================================================================
--- branches/2.8.x/wb/modules/wysiwyg/install.php	(revision 1895)
+++ branches/2.8.x/wb/modules/wysiwyg/install.php	(revision 1896)
@@ -4,13 +4,13 @@
  * @category        modules
  * @package         wysiwyg
  * @author          WebsiteBaker Project
- * @copyright       2009-2012, Website Baker Org. e.V.
- * @link			http://www.websitebaker2.org/
+ * @copyright       2009-2013, WebsiteBaker Org. e.V.
+ * @link            http://www.websitebaker2.org/
  * @license         http://www.gnu.org/licenses/gpl.html
  * @platform        WebsiteBaker 2.8.3
  * @requirements    PHP 5.2.2 and higher
- * @version      	$Id$
- * @filesource		$HeadURL$
+ * @version         $Id$
+ * @filesource      $HeadURL$
  * @lastmodified    $Date$
  *
  */
@@ -21,9 +21,12 @@
 	throw new IllegalFileException();
 } else {
 	// Create table
+	$aError = array();
+	// Create table
+	if(!$database->SqlImport(dirname(__FILE__).'/sql/mod_wysiwyg.sql','',false)){
+		$aError[] = $database->get_error();
+	}
 
-$database->SqlImport(dirname(__FILE__).'/sql/mod_wysiwyg.sql','',false);
-
 // remove old version of search (deprecated)
 
 }