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

changed session name, destory timing in file module

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12607 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
chschy 2013-01-29 09:21:14 +00:00
parent eafb2a9a8f
commit f88e5368a8
1 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

25
modules/file/file.controller.php
View file

@ -261,7 +261,7 @@ class fileController extends file
// Call a trigger (after)
$output = ModuleHandler::triggerCall('file.downloadFile', 'after', $file_obj);
$file_key = $_SESSION['__FILE_KEY__'][$file_srl] = hash('md5',rand());
$file_key = $_SESSION['__XE_FILE_KEY__'][$file_srl] = hash('md5',rand());
header('Location: '.getNotEncodedUrl('', 'act', 'procFileOutput','file_srl',$file_srl,'file_key',$file_key));
Context::close();
exit();
@ -275,19 +275,19 @@ class fileController extends file
$file_key = Context::get('file_key');
if(strstr($_SERVER['HTTP_USER_AGENT'], "Android")) $is_android = true;
if($is_android && $_SESSION['__FILE_KEY_AND__'][$file_srl]) $session_key = '__FILE_KEY_AND__';
else $session_key = '__FILE_KEY__';
if($is_android && $_SESSION['__XE_FILE_KEY_AND__'][$file_srl]) $session_key = '__XE_FILE_KEY_AND__';
else $session_key = '__XE_FILE_KEY__';
$columnList = array('source_filename', 'uploaded_filename', 'file_size');
$file_obj = $oFileModel->getFile($file_srl, $columnList);
$uploaded_filename = $file_obj->uploaded_filename;
if(!file_exists($uploaded_filename)) return $this->stop('msg_file_not_found');
$_SESSION[$session_key][$file_srl];
if(!$file_key || $_SESSION[$session_key][$file_srl] != $file_key)
{
unset($_SESSION[$session_key][$file_srl]);
return $this->stop('invalid_request');
return $this->stop('msg_invalid_request');
}
$file_size = $file_obj->file_size;
@ -298,6 +298,13 @@ class fileController extends file
$filename = preg_replace('/\./', '%2e', $filename, substr_count($filename, '.') - 1);
}
if($is_android)
{
if($_SESSION['__XE_FILE_KEY__'][$file_srl]) $_SESSION['__XE_FILE_KEY_AND__'][$file_srl] = $file_key;
}
unset($_SESSION[$session_key][$file_srl]);
$fp = fopen($uploaded_filename, 'rb');
if(!$fp) return $this->stop('msg_file_not_found');
@ -321,14 +328,6 @@ class fileController extends file
fpassthru($fp);
}
if($is_android)
{
if($_SESSION['__FILE_KEY__'][$file_srl]) $_SESSION['__FILE_KEY_ADNROID__'][$file_srl] = $file_key;
}
unset($_SESSION[$session_key][$file_srl]);
Context::close();
exit();