fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-02 01:52:10 +09:00
Code Issues Projects Releases Packages Wiki Activity

#18310681 관련 SSL 사용시 혼합 모드 경고창 뜨는 것 수정, 코드 중에 탭키 띄어쓰기로 바꾸고 빈줄 지움.

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/sandbox@6838 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
misol 2009-10-10 12:14:23 +00:00
parent 146c36df62
commit 1d357e72df
2 changed files with 22 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

3
common/js/common.js
View file

@ -463,7 +463,8 @@ function _displayMultimedia(src, width, height, options) {
html = '<embed src="'+request_uri+'common/tpl/images/flvplayer.swf" allowfullscreen="true" autostart="'+autostart+'" width="'+width+'" height="'+height+'" flashvars="&file='+src+'&width='+width+'&height='+height+'&autostart='+autostart+'" wmode="'+params.wmode+'" />';
} else if(/\.swf/i.test(src)) {
clsid = 'clsid:D27CDB6E-AE6D-11cf-96B8-444553540000';
codebase = "http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,28,0";
if(!enforce_ssl) { codebase = "http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,28,0"; }
else { codebase = "https://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,28,0"; }
html = '<object classid="'+clsid+'" codebase="'+codebase+'" width="'+width+'" height="'+height+'" flashvars="'+params.flashvars+'">';
html += '<param name="movie" value="'+src+'" />';
for(var name in params) {

40
modules/file/file.controller.php
View file

@ -66,8 +66,8 @@
// file_srl이 요청되었을 경우 삭제 후 재업로드 시도
$file_srl = Context::get('file_srl');
if($file_srl) $this->deleteFile($file_srl);
if($file_srl) $this->deleteFile($file_srl);
$file_info = Context::get('Filedata');
// 정상적으로 업로드된 파일이 아니면 오류 출력
@ -76,7 +76,7 @@
Context::set('uploaded_fileinfo',$output);
}
Context::set('layout','none');
Context::set('layout','none');
$this->setTemplatePath($this->module_path.'tpl');
$this->setTemplateFile('iframe');
@ -88,26 +88,26 @@
**/
function procFileImageResize() {
$source_src = Context::get('source_src');
$width = Context::get('width');
$height = Context::get('height');
$type = Context::get('type');
$width = Context::get('width');
$height = Context::get('height');
$type = Context::get('type');
$output_src = Context::get('output_src');
if(!$source_src || !$width) return new Object(-1,'msg_invalid_request');
if(!$source_src || !$width) return new Object(-1,'msg_invalid_request');
if(!$output_src){
$output_src = $source_src . '.resized' . strrchr($source_src,'.');
}
if(!$type) $type = 'ratio';
if(!$height) $height = $width-1;
$output_src = $source_src . '.resized' . strrchr($source_src,'.');
}
if(!$type) $type = 'ratio';
if(!$height) $height = $width-1;
if(FileHandler::createImageFile($source_src,$output_src,$width,$height,'','ratio')){
$output->info = getimagesize($output_src);
$output->src = $output_src;
}else{
return new Object(-1,'msg_invalid_request');
}
$this->add('resized_info',$output);
if(FileHandler::createImageFile($source_src,$output_src,$width,$height,'','ratio')){
$output->info = getimagesize($output_src);
$output->src = $output_src;
}else{
return new Object(-1,'msg_invalid_request');
}
$this->add('resized_info',$output);
}
@ -390,7 +390,7 @@
if(preg_match("/\.(jpg|jpeg|gif|png|wmv|wma|mpg|mpeg|avi|swf|flv|mp1|mp2|mp3|asaf|wav|asx|mid|midi|asf|mov|moov|qt|rm|ram|ra|rmm|m4v)$/i", $file_info['name'])) {
// direct 파일에 해킹을 의심할 수 있는 확장자가 포함되어 있으면 바로 삭제함
$file_info['name'] = preg_replace('/\.(php|phtm|html|htm|cgi|pl|exe|jsp|asp|inc)/i', '$0-x',$file_info['name']);
$file_info['name'] = str_replace(array('<','>'),array('%3C','%3E'),$file_info['name']);
$file_info['name'] = str_replace(array('<','>'),array('%3C','%3E'),$file_info['name']);
$path = sprintf("./files/attach/images/%s/%s", $module_srl,getNumberingPath($upload_target_srl,3));
$filename = $path.$file_info['name'];