Index: branches/RC/core/units/general/helpers/fck_helper.php =================================================================== diff -u -N -r10974 -r11849 --- branches/RC/core/units/general/helpers/fck_helper.php (.../fck_helper.php) (revision 10974) +++ branches/RC/core/units/general/helpers/fck_helper.php (.../fck_helper.php) (revision 11849) @@ -1,13 +1,13 @@ Config['AllowedExtensions']['Files'] = array('jpg','gif','jpeg','png','swf','fla','jpg','gif','jpeg','png','avi','mpg','mpeg','zip','rar','arj','gz','tar','doc','pdf','ppt','rdp','swf','swt','txt','vsd','xls','csv','odt') ; $this->Config['DeniedExtensions']['Files'] = array('php','asp','aspx','ascx','jsp','cfm','cfc','pl','bat','exe','dll','reg') ; $this->Config['AllowedExtensions']['Images'] = array('jpg','gif','jpeg','png', 'bmp') ; @@ -18,21 +18,21 @@ $this->Config['DeniedExtensions']['Media'] = array('php','asp','aspx','ascx','jsp','cfm','cfc','pl','bat','exe','dll','reg'); $this->Config['AllowedExtensions']['Documents'] = array('doc','pdf','ppt','rdp','swf','swt','txt','vsd','xls','csv','zip','odt') ; $this->Config['DeniedExtensions']['Documents'] = array('php','asp','aspx','ascx','jsp','cfm','cfc','pl','bat','exe','dll','reg'); - + } function CreateFolder($folder = '') { if (!$folder) return false; $folderPath = WRITEABLE.'/user_files/'.$folder; if (file_exists($folderPath) && is_dir($folderPath)) return false; - + $permissions = defined(FCK_FOLDERS_PERMISSIONS) ? FCK_FOLDERS_PERMISSIONS : '0777'; - mkdir( $folderPath) ; // , $permissions + mkdir( $folderPath) ; // , $permissions return true; } - - function IsAllowedExtension($folder, $file_name) + + function IsAllowedExtension($folder, $file_name) { $base_folder = $this->getBaseFolder($folder); eregi("(\.[a-zA-Z0-9]{1,10})$", $file_name, $regs); @@ -49,8 +49,8 @@ } return true; } - - function getBaseFolder($folder) + + function getBaseFolder($folder) { $end = strpos("/", $folder); if ($end) { @@ -63,18 +63,18 @@ { $aFolders = array(); $oCurrentFolder = opendir($files_dir) ; - $KernelSystemFolders = defined('KERNEL_SYSTEM_FOLDERS') ? KERNEL_SYSTEM_FOLDERS : array('icons','CVS'); + $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; } } - closedir( $oCurrentFolder ) ; + closedir( $oCurrentFolder ) ; return $aFolders; } - - + + function ReadFiles($files_dir) { $aFiles = array(); @@ -85,11 +85,11 @@ $aFiles[] = $sFile; } } - closedir( $oCurrentFolder ) ; + closedir( $oCurrentFolder ) ; return $aFiles; } - + function PrintFolders() { $order_by = $this->Application->GetVar('order_by'); @@ -113,16 +113,16 @@ } return $ret; } - + function CalculateFileSize($size) { if ( $size > 0 ) { $size = round( $size / 1024 ); $size = ($size < 1)? 1:$size;// round( $iFileSize / 1024 ) ; - } + } return $size; } - + function CheckIconType($v) { $a_ext = Array('ai','avi','bmp','cs','dll','doc','exe','fla','gif','htm','html','jpg','js','mdb','mp3','pdf','png','ppt','rdp','swf','swt','txt','vsd','xls','xml','zip'); @@ -137,12 +137,12 @@ } return $icon; } - + function GetXmlString($size,$url,$icon,$date,$file_name) { return ''.$file_name.''."\n"; } - + function PrintFiles() { $order_by = $this->Application->GetVar('order_by'); @@ -158,15 +158,15 @@ if ($sort_by == 'name' && $order_by == '_desc') { $aFiles = array_reverse($aFiles,TRUE); } - - foreach ($aFiles as $k => $v) + + foreach ($aFiles as $k => $v) { $aFilesSize[$k] = filesize( $files_dir . $v); $aFilesDate[$k] = filectime( $files_dir . $v); } if ($sort_by == 'name') { foreach ($aFiles as $k => $file) { - $size = $this->CalculateFileSize($aFilesSize[$k]); + $size = $this->CalculateFileSize($aFilesSize[$k]); $date = date($date_format, $aFilesDate[$k]); $icon = $this->CheckIconType($file); $ret .= $this->GetXmlString($size,$files_url.$file,$icon,$date,$file); @@ -179,7 +179,7 @@ } foreach ($aFilesDate as $k => $date) { $size = $this->CalculateFileSize($aFilesSize[$k]); - $file = $aFiles[$k]; + $file = $aFiles[$k]; $date = date($date_format, $date); $icon = $this->CheckIconType($file); $ret .= $this->GetXmlString($size,$files_url.$file,$icon,$date,$file); @@ -192,28 +192,28 @@ } foreach ($aFilesSize as $k => $size) { $size = $this->CalculateFileSize($size); - $file = $aFiles[$k]; + $file = $aFiles[$k]; $date = date($date_format, $aFilesDate[$k]); $icon = $this->CheckIconType($file); $ret .= $this->GetXmlString($size,$files_url.$file,$icon,$date,$file); } } return $ret; - } - + } + function UploadFile() { $Extensions['Allowed']['Files'] = array('jpg','gif','jpeg','png','swf','fla','jpg','gif','jpeg','png','avi','mpg','mpeg','zip','rar','arj','gz','tar','doc','pdf','ppt','rdp','swf','swt','txt','vsd','xls','csv','odt') ; $Extensions['Allowed']['Images'] = array('jpg','gif','jpeg','png', 'bmp') ; $Extensions['Allowed']['Flash'] = array('swf','fla') ; $Extensions['Allowed']['Media'] = array('asf','asx','avi','wav','wax','wma','wm','wmv','m3u','mp2v','mpg','mpeg','m1v','mp2','mp3','mpa','mpe','mpv2','mp4','mid','midi','rmi','qt','aif','aifc','aiff','mov','flv','rm','svcd','swf','vcd') ; $Extensions['Allowed']['Documents'] = array('doc','pdf','ppt','rdp','swf','swt','txt','vsd','xls','csv','zip','odt') ; - + $upload_dir = $this->Application->GetVar('upload_dir'); $type = explode("/",$upload_dir); $type = $type[0]; $sServerDir = WRITEABLE."/user_files/".$upload_dir."/"; - + $aUpFile = $_FILES['NewFile']; $sFileName = $aUpFile['name']; $sOriginalFileName = $aUpFile['name']; @@ -223,7 +223,7 @@ { if (in_array($sExtension,$Extensions['Allowed'][$type])) { - + if (!$aUpFile['error']) { $iCounter = 0 ; while ( true ) @@ -246,7 +246,7 @@ // Restore the configurations. ini_restore( 'track_errors' ) ; ini_restore( 'error_reporting' ) ; - + if ( is_file( $sFilePath ) ) { $oldumask = umask(0) ; @@ -267,10 +267,10 @@ echo 'window.parent.frames["frmUpload"].OnUploadCompleted(' . $sErrorNumber . ',"' . str_replace( '"', '\\"', $sFileName ) . '") ;' ; echo '' ; } - + function RemoveExtension( $fileName ) { return substr( $fileName, 0, strrpos( $fileName, '.' ) ) ; } - + } \ No newline at end of file Index: branches/RC/core/units/general/helpers/themes_helper.php =================================================================== diff -u -N -r11830 -r11849 --- branches/RC/core/units/general/helpers/themes_helper.php (.../themes_helper.php) (revision 11830) +++ branches/RC/core/units/general/helpers/themes_helper.php (.../themes_helper.php) (revision 11849) @@ -255,10 +255,13 @@ function refreshThemes() { $themes_found = Array(); + $skip_filenames = Array ('.', '..', 'CVS', '.svn'); $fh = opendir($this->themesFolder.'/'); while (($filename = readdir($fh))) { - if ($filename == '.' || $filename == '..' || $filename == 'CVS') continue; + if (in_array($filename, $skip_filenames)) { + continue; + } if (is_dir($this->themesFolder.'/'.$filename)) { $theme_id = $this->refreshTheme($filename); Index: branches/RC/core/units/fck/fck_tp.php =================================================================== diff -u -N -r10974 -r11849 --- branches/RC/core/units/fck/fck_tp.php (.../fck_tp.php) (revision 10974) +++ branches/RC/core/units/fck/fck_tp.php (.../fck_tp.php) (revision 11849) @@ -1,38 +1,38 @@ 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; + $aFolders[] = $v; } } } - + if (count($aFolders) > 0) { natcasesort($aFolders); foreach($aFolders AS $k=>$v) { @@ -60,7 +60,7 @@ } return $ret; } - + function PrintFolders($params) { $order_by = $this->Application->GetVar('order_by'); @@ -78,7 +78,7 @@ } return $ret; } - + function PrintFiles($params) { $params['folder'] = $this->Application->GetVar('folder'); @@ -95,8 +95,8 @@ if ( $size > 0 ) { $size = round( $size / 1024 ); $size = ($size < 1)? 1:$size;// round( $iFileSize / 1024 ) ; - } - + } + eregi("(\.[a-zA-Z0-9]{1,10})$", $v, $regs); $ext = strtolower(ltrim($regs[1],".")); if (in_array($ext, $a_ext)) @@ -105,7 +105,7 @@ } else { $icon = 'default.icon'; } - + $block_params['file_name'] = $v; $block_params['size'] = $size; $block_params['url'] = $files_url.$v; @@ -115,7 +115,7 @@ $ret .= $this->Application->ParseBlock($block_params); } return $ret; - } - - - } + } + + + }