Index: branches/5.1.x/core/units/fck/fck_tp.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/fck/fck_tp.php	(.../fck_tp.php)	(revision 12127)
+++ branches/5.1.x/core/units/fck/fck_tp.php	(.../fck_tp.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: fck_tp.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: fck_tp.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,22 +12,22 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
+	defined('FULL_PATH') or die('restricted access!');
+
 	class FckTagProcessor extends  kDBTagProcessor {
 
 
 		function ReadFolders($files_dir)
 		{
-			$aFolders = array();
-			$oCurrentFolder = opendir($files_dir) ;
-			$KernelSystemFolders = defined('KERNEL_SYSTEM_FOLDERS') ? KERNEL_SYSTEM_FOLDERS : array('icons', 'CVS', '.svn');
-			while ( $sFile = readdir( $oCurrentFolder ) )
-			{
-				if (is_dir($files_dir . $sFile ) && !in_array($sFile,$KernelSystemFolders) && $sFile != '.' && $sFile != '..') {
-					$aFolders[] = $sFile;
-				}
+			$folders = glob($files_dir . '*', GLOB_ONLYDIR);
+			if (!$folders) {
+				return Array ();
 			}
-			closedir( $oCurrentFolder ) ;
-			return $aFolders;
+
+			$folders = array_map('basename', $folders);
+			$system_folders = defined('KERNEL_SYSTEM_FOLDERS') ? KERNEL_SYSTEM_FOLDERS : Array ('icons', 'CVS', '.svn');
+
+			return array_diff($folders, $system_folders);
 		}
 
 		function ReadFiles($files_dir)
@@ -47,29 +47,27 @@
 
 		function CheckCreateDefaultFolders()
 		{
-			$user_files_dir = WRITEABLE."/user_files/";
-			$FCKDefaultFolders = defined('FCK_DEFAULT_FOLDERS') ? FCK_DEFAULT_FOLDERS : array('Files','Images','Flash','Documents');
-			$ret = '';
-			$aFolders = $this->ReadFolders($user_files_dir);
 			$fck_helper =& $this->Application->recallObject('FCKHelper');
 			/* @var fck_helper fckFCKHelper*/
 
-			foreach ($FCKDefaultFolders as $k=>$v)
-			{
-				if (!in_array($v,$aFolders)) {
-					if ($fck_helper->CreateFolder($v)) {
-						$aFolders[] = $v;
-					}
+			$default_folders = defined('FCK_DEFAULT_FOLDERS') ? FCK_DEFAULT_FOLDERS : Array ('Files', 'Images', 'Flash', 'Documents');
+
+			foreach ($default_folders as $index => $folder) {
+				if (!$fck_helper->CreateFolder($folder)) {
+					unset($default_folders[$index]);
 				}
 			}
 
-			if (count($aFolders) > 0) {
-				natcasesort($aFolders);
-				foreach($aFolders AS $k=>$v) {
-					$selected = ($this->Application->GetVar('type') == $v) ? 'selected' : '';
-					$ret.=  '<option value="' . $v . '" '.$selected.' />' . $v ;
-				}
+			if (!$default_folders) {
+				return '';
 			}
+
+			$ret = '';
+			foreach ($default_folders as $folder) {
+				$selected = ($this->Application->GetVar('type') == $folder) ? 'selected' : '';
+				$ret.=  '<option value="' . $folder . '" '.$selected.' />' . $folder;
+			}
+
 			return $ret;
 		}
 
@@ -94,8 +92,8 @@
 		function PrintFiles($params)
 		{
 			$params['folder'] = $this->Application->GetVar('folder');
-			$files_dir = WRITEABLE."/user_files/".$params['folder']."/";
-			$files_url = BASE_PATH.WRITEBALE_BASE."/user_files/".$params['folder']."/";
+			$files_dir = WRITEABLE . "/user_files/" . $params['folder'] . "/";
+			$files_url = BASE_PATH . WRITEBALE_BASE . "/user_files/" . $params['folder']."/";
 			$aFiles = $this->ReadFiles($files_dir);
 			$block_params = $this->prepareTagParams($params);
 			$block_params['name'] = $block_params['render_as'];
@@ -128,6 +126,4 @@
 			}
 			return $ret;
 		}
-
-
-	}
+	}
\ No newline at end of file