Index: branches/5.2.x/core/units/fck/fck_eh.php =================================================================== diff -u -N -r14572 -r14628 --- branches/5.2.x/core/units/fck/fck_eh.php (.../fck_eh.php) (revision 14572) +++ branches/5.2.x/core/units/fck/fck_eh.php (.../fck_eh.php) (revision 14628) @@ -1,6 +1,6 @@ Application->isAdminUser) { // this limits all event execution only to logged-in users in admin @@ -101,15 +103,15 @@ } $fck_helper =& $this->Application->recallObject('FCKHelper'); - /* @var fck_helper fckFCKHelper*/ + /* @var $fck_helper fckFCKHelper*/ - if (!$fck_helper->IsAllowedExtension($folder, $new_name)) { + if ( !$fck_helper->IsAllowedExtension($folder, $new_name) ) { echo 203; return; } - if (!rename($sServerDir.$old_name,$sServerDir.$new_name)) { - // echo $sServerDir.$old_name.' -> '.$sServerDir.$new_name; + if ( !rename($sServerDir . $old_name, $sServerDir . $new_name) ) { +// echo $sServerDir.$old_name.' -> '.$sServerDir.$new_name; echo 205; return; } @@ -192,16 +194,24 @@ } } - function OnUploadFile(&$event) + /** + * Uploads a file from FCK file browser + * + * @param kEvent $event + * @return void + * @access protected + */ + protected function OnUploadFile(&$event) { $event->status = kEvent::erSTOP; - if ($this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1)) { + if ( $this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1) ) { return; } $fck_helper =& $this->Application->recallObject('FCKHelper'); - /* @var fck_helper fckFCKHelper*/ + /* @var $fck_helper fckFCKHelper*/ + $fck_helper->UploadFile(); } } \ No newline at end of file