[svn r21856] FS#4383 - In addition, changes for mainstream code: A minor typo-correction in _whatsnew.html; updating the build number, because within the editor in SVN there are more patches applied; updating the file commands.php (*); updating fck_about.html.

documentation/changelog.html

@@ -32,7 +32,8 @@
   <li>A transliteration function has been added. Currently, it is used in uploading files. Files with non-English names get names that contain ASCII letters only, remaining readable in the corresponding language. Rationale: The PHP5 run-time environment does not manage file name encodings, adding such a non-native feature involves too much work. For avoiding character encoding problems, transliteration of file names is the possible solution. (FS#306)</li>
   <li>An internationalization option has been added for improving sorting in arbitrary language. When the <a href="http://php.net/manual/en/book.intl.php" target="_blank">intl</a> php-extension has been installed, various sorting routines exploit it for better sorting. Rationale: The PHP5 run-time environment does not provide native and reliable way for sorting UTF-8 strings. (FS#306)</li>
   <li>The installation sript: The page about system requilements has been updated. Also, at the very beginning, a check has been added whether the <a href="http://php.net/manual/en/book.mbstring.php" target="_blank">mbstring</a> php-extension is installed - see <a href="http://dokeos.com/forum/viewtopic.php?t=29548" target="_blank">the related forum topic</a>. (FS#306)</li>
-  <li>The online editor (FCKEditor 2.6.4): Several known bug-fixes have been implemented, tickets <a href="http://dev.fckeditor.net/ticket/2821" target="_blank">#2821</a>, <a href="http://dev.fckeditor.net/ticket/2856" target="_blank">#2856</a>, <a href="http://dev.fckeditor.net/ticket/2915" target="_blank">#2915</a>, <a href="http://dev.fckeditor.net/ticket/3120" target="_blank">#3120</a>, <a href="http://dev.fckeditor.net/ticket/3181" target="_blank">#3181</a>, <a href="http://dev.fckeditor.net/ticket/3429" target="_blank">#3429</a>, <a href="http://dev.fckeditor.net/ticket/3439" target="_blank">#3439</a>, <a href="http://dev.fckeditor.net/ticket/3880" target="_blank">#3880</a>. (FS#2867)</li>
+  <li>The online editor: A upgrade from FCKEditor 2.6.4 to FCKEditor 2.6.4.1 has been implemented. (FS#4383)</li>
+  <li>The online editor: Several known bug-fixes from FCKEditor 2.6.5 SVN have been implemented, tickets <a href="http://dev.fckeditor.net/ticket/2821" target="_blank">#2821</a>, <a href="http://dev.fckeditor.net/ticket/2856" target="_blank">#2856</a>, <a href="http://dev.fckeditor.net/ticket/2915" target="_blank">#2915</a>, <a href="http://dev.fckeditor.net/ticket/3120" target="_blank">#3120</a>, <a href="http://dev.fckeditor.net/ticket/3181" target="_blank">#3181</a>, <a href="http://dev.fckeditor.net/ticket/3429" target="_blank">#3429</a>, <a href="http://dev.fckeditor.net/ticket/3439" target="_blank">#3439</a>, <a href="http://dev.fckeditor.net/ticket/3880" target="_blank">#3880</a>. (FS#2867)</li>
   <li>The online editor: Blocking copy/paste for trainees has been added. The feature is configurable through editing the file .../dokeos/main/inc/lib/fckeditor/myconfig.js . (FS#2867)</li>
   <li>The online editor: Preview tabs have been added to the dialogs for inserting video, flv-video, and YouTube video. (FS#2867)</li>
   <li>The online editor: The "audio" plugin has been activated by default as an implementation of the "Insert audio / Audio properties" dialog. This new plugin is intended to replace the "MP3" plugin. (FS#2867)</li>

main/inc/lib/fckeditor/_whatsnew.html

@@ -38,7 +38,7 @@
 		Fixed Bugs:</p>
 	<ul>
  		<li><strong>Security release, upgrade is highly recommended.</strong></li>
-	</u>
+	</ul>
 	<h3>
 		Version 2.6.4</h3>
 	<p>

main/inc/lib/fckeditor/editor/_source/fckeditorapi.js

@@ -41,7 +41,7 @@ function InitializeAPI()
 		var sScript =
 			'window.FCKeditorAPI = {' +
 				'Version : "2.6.4.1",' +
-				'VersionBuild : "23187",' +
+				'VersionBuild : "23195",' +
 				'Instances : window.FCKeditorAPI && window.FCKeditorAPI.Instances || {},' +
 
 				'GetInstance : function( name )' +

main/inc/lib/fckeditor/editor/dialog/fck_about.html

@@ -78,7 +78,7 @@ window.onload = function()
 								border-left: #000000 1px solid; border-bottom: #000000 1px solid">
 								<span fcklang="DlgAboutVersion">version</span>
 								<br />
-								<b>2.6.4</b><br />
+								<b>2.6.4.1</b><br />
 								Build 23195</td>
 						</tr>
 					</table>

main/inc/lib/fckeditor/editor/filemanager/connectors/php/commands.php

@@ -76,41 +76,45 @@ function GetFoldersAndFiles( $resourceType, $currentFolder )
 	$aFolders	= array() ;
 	$aFiles		= array() ;
 
-	$oCurrentFolder = opendir( $sServerDir ) ;
+	$oCurrentFolder = @opendir( $sServerDir ) ;
 
 	$in_group = api_is_in_group();
 	$in_shared_folder = $currentFolder == '/shared_folder/';
 	$user_id = api_get_user_id();
 
-	while ( $sFile = readdir( $oCurrentFolder ) )
+	if ($oCurrentFolder !== false)
 	{
-		$is_dir = @is_dir( $sServerDir . $sFile );
-		if ( $sFile != '.' && $sFile != '..'
-			&& strpos( $sFile, '_DELETED_' ) === false
-			&& strpos( $sFile, 'chat_files' ) === false
-			&& strpos( $sFile, 'HotPotatoes_files' ) === false
-			&& ( $in_group || ( !$in_group && strpos( $sFile, '_groupdocs' ) === false ) )
-			&& (!$in_shared_folder || ($in_shared_folder && (!$is_dir || ($is_dir && $sFile == $user_id))))
-			&& $sFile != '.thumbs'
-			&& $sFile != '.svn' )
+		while ( $sFile = readdir( $oCurrentFolder ) )
 		{
-			if ( $is_dir )
-				$aFolders[] = '<Folder name="' . ConvertToXmlAttribute( $sFile ) . '" />' ;
-			else
+			$is_dir = @is_dir( $sServerDir . $sFile );
+			if ( $sFile != '.' && $sFile != '..'
+				&& strpos( $sFile, '_DELETED_' ) === false
+				&& strpos( $sFile, 'chat_files' ) === false
+				&& strpos( $sFile, 'HotPotatoes_files' ) === false
+				&& ( $in_group || ( !$in_group && strpos( $sFile, '_groupdocs' ) === false ) )
+				&& (!$in_shared_folder || ($in_shared_folder && (!$is_dir || ($is_dir && $sFile == $user_id))))
+				&& $sFile != '.thumbs'
+				&& $sFile != '.svn' )
 			{
-				$iFileSize = @filesize( $sServerDir . $sFile ) ;
-				if ( !$iFileSize ) {
-					$iFileSize = 0 ;
-				}
-				if ( $iFileSize > 0 )
+				if ( $is_dir )
+					$aFolders[] = '<Folder name="' . ConvertToXmlAttribute( $sFile ) . '" />' ;
+				else
 				{
-					$iFileSize = round( $iFileSize / 1024 ) ;
-					if ( $iFileSize < 1 ) $iFileSize = 1 ;
-				}
+					$iFileSize = @filesize( $sServerDir . $sFile ) ;
+					if ( !$iFileSize ) {
+						$iFileSize = 0 ;
+					}
+					if ( $iFileSize > 0 )
+					{
+						$iFileSize = round( $iFileSize / 1024 ) ;
+						if ( $iFileSize < 1 ) $iFileSize = 1 ;
+					}
 
-				$aFiles[] = '<File name="' . ConvertToXmlAttribute( $sFile ) . '" size="' . $iFileSize . '" />' ;
+					$aFiles[] = '<File name="' . ConvertToXmlAttribute( $sFile ) . '" size="' . $iFileSize . '" />' ;
+				}
 			}
 		}
+		closedir( $oCurrentFolder ) ;
 	}
 
 	// Send the folders