Index: branches/5.2.x/core/units/helpers/fck_helper.php
===================================================================
diff -u -N -r13840 -r14095
--- branches/5.2.x/core/units/helpers/fck_helper.php (.../fck_helper.php) (revision 13840)
+++ branches/5.2.x/core/units/helpers/fck_helper.php (.../fck_helper.php) (revision 14095)
@@ -1,6 +1,6 @@
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');
@@ -32,8 +32,8 @@
$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');
-
- $this->Config['ExtensionIcons'] = 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');
+
+ $this->Config['ExtensionIcons'] = 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');
}
function CreateFolder($folder = '')
@@ -54,7 +54,7 @@
function IsAllowedExtension($folder, $file_name)
{
- $base_folder = $this->getBaseFolder($folder);
+ $base_folder = $this->getBaseFolder($folder);
$ext = strtolower( pathinfo($file_name, PATHINFO_EXTENSION) );
if (isset($this->Config['DeniedExtensions'][$folder])) {
if (in_array($ext, $this->Config['DeniedExtensions'][$folder])) {
@@ -113,20 +113,20 @@
$sort_by = $this->Application->GetVar('sort_by');
$folder = $this->Application->GetVar('folder');
$files_dir = WRITEABLE . '/user_files/' . $folder . '/';
- $aFolders = $this->ReadFolders($files_dir);
+ $aFolders = $this->ReadFolders($files_dir);
$order_by = $this->Application->GetVar('order_by');
$sort_by = $this->Application->GetVar('sort_by');
natcasesort($aFolders);
-
- $ret = '';
+
+ $ret = '';
foreach ($aFolders as $k => $v) {
$ret .= ''.$v.''."\n";
}
-
+
if ($sort_by == 'name' && $order_by == '_desc') {
$aFolders = array_reverse($aFolders);
}
-
+
foreach ($aFolders as $k => $v) {
$ret .= ''.$v.''."\n";
}
@@ -143,7 +143,7 @@
}
function CheckIconType($v)
- {
+ {
$ext = strtolower( pathinfo($v, PATHINFO_EXTENSION) );
return ($ext && in_array($ext, $this->Config['ExtensionIcons']))? $ext : 'default.icon';
}
@@ -212,7 +212,7 @@
}
function UploadFile()
- {
+ {
$upload_dir = $this->Application->GetVar('upload_dir');
$type = explode('/', $upload_dir);
$type = $type[0];
@@ -242,13 +242,13 @@
{
// Turn off all error reporting.
error_reporting( 0 ) ;
-
+
// Enable error tracking to catch the error.
ini_set( 'track_errors', '1' );
-
+
move_uploaded_file( $aUpFile['tmp_name'], $sFilePath );
$sErrorMsg = $php_errormsg;
-
+
// Restore the configurations.
ini_restore( 'track_errors' );
ini_restore( 'error_reporting' );
@@ -262,11 +262,11 @@
}
}
}
- }
+ }
else {
$sErrorNumber = '203';
}
- }
+ }
else {
$sErrorNumber = '202' ;
}