Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG	(revision 1167)
+++ branches/2.8.x/CHANGELOG	(revision 1168)
@@ -12,6 +12,8 @@
 
 ------------------------------------- 2.8.1 -------------------------------------
 12-Oct-2009 Dietmar Woellbrink
+!	security update FCKeditor (tks to Ruebenwurzel)
+12-Oct-2009 Dietmar Woellbrink
 +	added old version of fancybox.js
 !	rename new version fancybox 
 +	added missing language variables in newsmodul
Index: branches/2.8.x/wb/modules/fckeditor/include.php
===================================================================
--- branches/2.8.x/wb/modules/fckeditor/include.php	(revision 1167)
+++ branches/2.8.x/wb/modules/fckeditor/include.php	(revision 1168)
@@ -99,7 +99,7 @@
 
 	// custom templates can be defined via /wb_config/wb_fcktemplates.xml
 	if(file_exists(WB_PATH .'/modules/fckeditor/wb_config/wb_fcktemplates.xml')) {
-		$oFCKeditor->Config['TemplatesXmlPath'] = WB_URL.'/modules/FCKeditor/wb_config/wb_fcktemplates.xml';
+		$oFCKeditor->Config['TemplatesXmlPath'] = WB_URL.'/modules/fckeditor/wb_config/wb_fcktemplates.xml';
 	}
 
   // set required file connectors (overwrite settings which may be made in fckconfig.js or my_fckconfig.js)
Index: branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/filemanager/browser/default/frmresourcetype.html
===================================================================
--- branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/filemanager/browser/default/frmresourcetype.html	(revision 1167)
+++ branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/filemanager/browser/default/frmresourcetype.html	(revision 1168)
@@ -43,6 +43,7 @@
 
 window.onload = function()
 {
+	/* HIDE RESOURCE TYPES - NOT USED WITHIN WEBSITE BAKER
 	var oCombo = document.getElementById('cmbType') ;
 	oCombo.innerHTML = '' ;
 	for ( var i = 0 ; i < aTypes.length ; i++ )
@@ -50,11 +51,13 @@
 		if ( oConnector.ShowAllTypes || aTypes[i][0] == oConnector.ResourceType )
 			AddSelectOption( oCombo, aTypes[i][1], aTypes[i][0] ) ;
 	}
+	*/
 }
 
 		</script>
 	</head>
 	<body>
+		<!-- HIDE RESOURCE TYPES - NOT USED IN WEBSITE BAKER 	
 		<table class="fullHeight" cellSpacing="0" cellPadding="0" width="100%" border="0">
 			<tr>
 				<td nowrap>
@@ -65,5 +68,6 @@
 				</td>
 			</tr>
 		</table>
+		-->
 	</body>
 </html>
Index: branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/filemanager/browser/default/frmresourceslist.html
===================================================================
--- branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/filemanager/browser/default/frmresourceslist.html	(revision 1167)
+++ branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/filemanager/browser/default/frmresourceslist.html	(revision 1168)
@@ -157,7 +157,11 @@
 		var oFileUrlAtt = oNodes[j].attributes.getNamedItem('url') ;
 		var sFileUrl = oFileUrlAtt != null ? oFileUrlAtt.value : encodeURI( sCurrentFolderUrl + sFileName ).replace( /#/g, '%23' ) ;
 
-		oHtml.Append( oListManager.GetFileRowHtml( sFileName, sFileUrl, sFileSize ) ) ;
+		// hide index.php in browse media - added for Website Baker
+		if (sFileName != "index.php") 
+		{
+			oHtml.Append( oListManager.GetFileRowHtml( sFileName, sFileUrl, sFileSize ) ) ;
+		}
 	}
 
 	oHtml.Append( '<\/table>' ) ;
Index: branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/filemanager/connectors/test.html
===================================================================
--- branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/filemanager/connectors/test.html	(revision 1167)
+++ branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/filemanager/connectors/test.html	(revision 1168)
@@ -24,187 +24,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 	<title>FCKeditor - Connectors Tests</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-	<script type="text/javascript">
-
-// Automatically detect the correct document.domain (#1919).
-(function()
-{
-	var d = document.domain ;
-
-	while ( true )
-	{
-		// Test if we can access a parent property.
-		try
-		{
-			var test = window.opener.document.domain ;
-			break ;
-		}
-		catch( e ) {}
-
-		// Remove a domain part: www.mytest.example.com => mytest.example.com => example.com ...
-		d = d.replace( /.*?(?:\.|$)/, '' ) ;
-
-		if ( d.length == 0 )
-			break ;		// It was not able to detect the domain.
-
-		try
-		{
-			document.domain = d ;
-		}
-		catch (e)
-		{
-			break ;
-		}
-	}
-})() ;
-
-function BuildBaseUrl( command )
-{
-	var sUrl =
-		document.getElementById('cmbConnector').value +
-		'?Command=' + command +
-		'&Type=' + document.getElementById('cmbType').value +
-		'&CurrentFolder=' + encodeURIComponent(document.getElementById('txtFolder').value) ;
-
-	return sUrl ;
-}
-
-function SetFrameUrl( url )
-{
-	document.getElementById('eRunningFrame').src = url ;
-
-	document.getElementById('eUrl').innerHTML = url ;
-}
-
-function GetFolders()
-{
-	SetFrameUrl( BuildBaseUrl( 'GetFolders' ) ) ;
-	return false ;
-}
-
-function GetFoldersAndFiles()
-{
-	SetFrameUrl( BuildBaseUrl( 'GetFoldersAndFiles' ) ) ;
-	return false ;
-}
-
-function CreateFolder()
-{
-	var sFolder = prompt( 'Type the folder name:', 'Test Folder' ) ;
-
-	if ( ! sFolder )
-		return false ;
-
-	var sUrl = BuildBaseUrl( 'CreateFolder' ) ;
-	sUrl += '&NewFolderName=' + encodeURIComponent( sFolder ) ;
-
-	SetFrameUrl( sUrl ) ;
-	return false ;
-}
-
-function OnUploadCompleted( errorNumber, fileName )
-{
-	switch ( errorNumber )
-	{
-		case 0 :
-			alert( 'File uploaded with no errors' ) ;
-			break ;
-		case 201 :
-			GetFoldersAndFiles() ;
-			alert( 'A file with the same name is already available. The uploaded file has been renamed to "' + fileName + '"' ) ;
-			break ;
-		case 202 :
-			alert( 'Invalid file' ) ;
-			break ;
-		default :
-			alert( 'Error on file upload. Error number: ' + errorNumber ) ;
-			break ;
-	}
-}
-
-this.frames.frmUpload = this ;
-
-function SetAction()
-{
-	var sUrl = BuildBaseUrl( 'FileUpload' ) ;
-	document.getElementById('eUrl').innerHTML = sUrl ;
-	document.getElementById('frmUpload').action = sUrl ;
-}
-
-	</script>
 </head>
 <body>
-	<table height="100%" cellspacing="0" cellpadding="0" width="100%" border="0">
-		<tr>
-			<td>
-				<table cellspacing="0" cellpadding="0" border="0">
-					<tr>
-						<td>
-							Connector:<br />
-							<select id="cmbConnector" name="cmbConnector">
-								<option value="asp/connector.asp" selected="selected">ASP</option>
-								<option value="aspx/connector.aspx">ASP.Net</option>
-								<option value="cfm/connector.cfm">ColdFusion</option>
-								<option value="lasso/connector.lasso">Lasso</option>
-								<option value="perl/connector.cgi">Perl</option>
-								<option value="php/connector.php">PHP</option>
-								<option value="py/connector.py">Python</option>
-							</select>
-						</td>
-						<td>
-							&nbsp;&nbsp;&nbsp;</td>
-						<td>
-							Current Folder<br />
-							<input id="txtFolder" type="text" value="/" name="txtFolder" /></td>
-						<td>
-							&nbsp;&nbsp;&nbsp;</td>
-						<td>
-							Resource Type<br />
-							<select id="cmbType" name="cmbType">
-								<option value="File" selected="selected">File</option>
-								<option value="Image">Image</option>
-								<option value="Flash">Flash</option>
-								<option value="Media">Media</option>
-								<option value="Invalid">Invalid Type (for testing)</option>
-							</select>
-						</td>
-					</tr>
-				</table>
-				<br />
-				<table cellspacing="0" cellpadding="0" border="0">
-					<tr>
-						<td valign="top">
-							<a href="#" onclick="GetFolders();">Get Folders</a></td>
-						<td>
-							&nbsp;&nbsp;&nbsp;</td>
-						<td valign="top">
-							<a href="#" onclick="GetFoldersAndFiles();">Get Folders and Files</a></td>
-						<td>
-							&nbsp;&nbsp;&nbsp;</td>
-						<td valign="top">
-							<a href="#" onclick="CreateFolder();">Create Folder</a></td>
-						<td>
-							&nbsp;&nbsp;&nbsp;</td>
-						<td valign="top">
-							<form id="frmUpload" action="" target="eRunningFrame" method="post" enctype="multipart/form-data">
-								File Upload<br />
-								<input id="txtFileUpload" type="file" name="NewFile" />
-								<input type="submit" value="Upload" onclick="SetAction();" />
-							</form>
-						</td>
-					</tr>
-				</table>
-				<br />
-				URL: <span id="eUrl"></span>
-			</td>
-		</tr>
-		<tr>
-			<td height="100%" valign="top">
-				<iframe id="eRunningFrame" src="javascript:void(0)" name="eRunningFrame" width="100%"
-					height="100%"></iframe>
-			</td>
-		</tr>
-	</table>
 </body>
 </html>
Index: branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/filemanager/connectors/uploadtest.html
===================================================================
--- branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/filemanager/connectors/uploadtest.html	(revision 1167)
+++ branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/filemanager/connectors/uploadtest.html	(revision 1168)
@@ -23,170 +23,7 @@
 <html>
 	<head>
 		<title>FCKeditor - Uploaders Tests</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-		<script type="text/javascript">
-
-// Automatically detect the correct document.domain (#1919).
-(function()
-{
-	var d = document.domain ;
-
-	while ( true )
-	{
-		// Test if we can access a parent property.
-		try
-		{
-			var test = window.opener.document.domain ;
-			break ;
-		}
-		catch( e ) {}
-
-		// Remove a domain part: www.mytest.example.com => mytest.example.com => example.com ...
-		d = d.replace( /.*?(?:\.|$)/, '' ) ;
-
-		if ( d.length == 0 )
-			break ;		// It was not able to detect the domain.
-
-		try
-		{
-			document.domain = d ;
-		}
-		catch (e)
-		{
-			break ;
-		}
-	}
-})() ;
-
-function SendFile()
-{
-	var sUploaderUrl = cmbUploaderUrl.value ;
-
-	if ( sUploaderUrl.length == 0 )
-		sUploaderUrl = txtCustomUrl.value ;
-
-	if ( sUploaderUrl.length == 0 )
-	{
-		alert( 'Please provide your custom URL or select a default one' ) ;
-		return ;
-	}
-
-	eURL.innerHTML = sUploaderUrl ;
-	txtUrl.value = '' ;
-
-	var date = new Date()
-
-	frmUpload.action = sUploaderUrl + '?time=' + date.getTime();
-	if (document.getElementById('cmbType').value) {
-		frmUpload.action = frmUpload.action + '&Type='+document.getElementById('cmbType').value;
-	}
-	if (document.getElementById('CurrentFolder').value) {
-		frmUpload.action = frmUpload.action + '&CurrentFolder='+document.getElementById('CurrentFolder').value;
-	}
-	frmUpload.submit() ;
-}
-
-function OnUploadCompleted( errorNumber, fileUrl, fileName, customMsg )
-{
-	switch ( errorNumber )
-	{
-		case 0 :	// No errors
-			txtUrl.value = fileUrl ;
-			alert( 'File uploaded with no errors' ) ;
-			break ;
-		case 1 :	// Custom error
-			alert( customMsg ) ;
-			break ;
-		case 10 :	// Custom warning
-			txtUrl.value = fileUrl ;
-			alert( customMsg ) ;
-			break ;
-		case 201 :
-			txtUrl.value = fileUrl ;
-			alert( 'A file with the same name is already available. The uploaded file has been renamed to "' + fileName + '"' ) ;
-			break ;
-		case 202 :
-			alert( 'Invalid file' ) ;
-			break ;
-		case 203 :
-			alert( "Security error. You probably don't have enough permissions to upload. Please check your server." ) ;
-			break ;
-		default :
-			alert( 'Error on file upload. Error number: ' + errorNumber ) ;
-			break ;
-	}
-}
-
-		</script>
 	</head>
 	<body>
-		<table cellSpacing="0" cellPadding="0" width="100%" border="0" height="100%">
-			<tr>
-				<td>
-					<table cellSpacing="0" cellPadding="0" width="100%" border="0">
-						<tr>
-							<td nowrap>
-								Select the "File Uploader" to use: <br>
-								<select id="cmbUploaderUrl">
-									<option selected value="asp/upload.asp">ASP</option>
-									<option value="aspx/upload.aspx">ASP.Net</option>
-									<option value="cfm/upload.cfm">ColdFusion</option>
-									<option value="lasso/upload.lasso">Lasso</option>
-									<option value="perl/upload.cgi">Perl</option>
-									<option value="php/upload.php">PHP</option>
-									<option value="py/upload.py">Python</option>
-									<option value="">(Custom)</option>
-								</select>
-							</td>
-						<td>
-							Resource Type<br />
-							<select id="cmbType" name="cmbType">
-								<option value="">None</option>
-								<option value="File">File</option>
-								<option value="Image">Image</option>
-								<option value="Flash">Flash</option>
-								<option value="Media">Media</option>
-								<option value="Invalid">Invalid Type (for testing)</option>
-							</select>
-						</td>
-						<td>
-						Current Folder: <br>
-						<input type="text" name="CurrentFolder" id="CurrentFolder" value="/">
-						</td>
-							<td nowrap>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-							<td width="100%">
-								Custom Uploader URL:<BR>
-								<input id="txtCustomUrl" style="WIDTH: 100%; BACKGROUND-COLOR: #dcdcdc" disabled type="text">
-							</td>
-						</tr>
-					</table>
-					<br>
-					<table cellSpacing="0" cellPadding="0" width="100%" border="0">
-						<tr>
-							<td noWrap>
-								<form id="frmUpload" target="UploadWindow" enctype="multipart/form-data" action="" method="post">
-									Upload a new file:<br>
-									<input type="file" name="NewFile"><br>
-
-									<input type="button" value="Send it to the Server" onclick="SendFile();">
-								</form>
-							</td>
-							<td style="WIDTH: 16px">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-							<td vAlign="top" width="100%">
-								Uploaded File URL:<br>
-								<INPUT id="txtUrl" style="WIDTH: 100%" readonly type="text">
-							</td>
-						</tr>
-					</table>
-					<br>
-					Post URL: <span id="eURL">&nbsp;</span>
-				</td>
-			</tr>
-			<tr>
-				<td height="100%">
-					<iframe name="UploadWindow" width="100%" height="100%" src="javascript:void(0)"></iframe>
-				</td>
-			</tr>
-		</table>
 	</body>
 </html>
