molong/sentcms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request !6 from jackfinal/master

Browse Source
This commit is contained in:
jackfinal
2016-12-10 15:20:12 +08:00
committed by 腾速科技
parent c7cec78999 e0284d61c3
commit fadfaa356e
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
application/common/controller/Upload.php
View File

@@ -62,7 +62,8 @@ class Upload {
public function editor() { public function editor() {
$callback = request()->get('callback'); $callback = request()->get('callback');
$file = request()->file('upfile'); $CKEditorFuncNum = request()->get('CKEditorFuncNum');
$file = request()->file('upload');
$info = $file->move(config('editor_upload.rootPath'), true, false); $info = $file->move(config('editor_upload.rootPath'), true, false);
if ($info) { if ($info) {
$fileInfo = $this->parseFile($info); $fileInfo = $this->parseFile($info);
@@ -82,6 +83,8 @@ class Upload {
*/ */
if($callback) { if($callback) {
return '<script>'.$callback.'('.json_encode($data).')</script>'; return '<script>'.$callback.'('.json_encode($data).')</script>';
}elseif($CKEditorFuncNum) {
return '<script>window.parent.CKEDITOR.tools.callFunction("'.$CKEditorFuncNum.'","'.$fileInfo['url'].'","'.$data['state'].'");</script>';
} else { } else {
return json_encode($data); return json_encode($data);
} }