Upgraded to latest icehrm core
This commit is contained in:
@@ -10,7 +10,7 @@ include_once ('server.includes.inc.php');
|
||||
/**
|
||||
* Handle file uploads via regular form post (uses the $_FILES array)
|
||||
*/
|
||||
class qqUploadedFileForm {
|
||||
class qqUploadedFileForm {
|
||||
/**
|
||||
* Save the file to the specified path
|
||||
* @return boolean TRUE on success
|
||||
@@ -30,64 +30,64 @@ class qqUploadedFileForm {
|
||||
}
|
||||
|
||||
class qqFileUploader {
|
||||
var $log = null;
|
||||
var $log = null;
|
||||
private $allowedExtensions = array();
|
||||
private $sizeLimit = 10485760;
|
||||
//private $sizeLimit = 2485760;
|
||||
private $file;
|
||||
|
||||
function __construct(array $allowedExtensions = array(), $sizeLimit = 10485760){
|
||||
function __construct(array $allowedExtensions = array(), $sizeLimit = 10485760){
|
||||
$allowedExtensions = array_map("strtolower", $allowedExtensions);
|
||||
$this->allowedExtensions = $allowedExtensions;
|
||||
$this->allowedExtensions = $allowedExtensions;
|
||||
$this->sizeLimit = $sizeLimit;
|
||||
$this->checkServerSettings();
|
||||
$this->file = new qqUploadedFileForm();
|
||||
$this->checkServerSettings();
|
||||
$this->file = new qqUploadedFileForm();
|
||||
}
|
||||
|
||||
private function checkServerSettings(){
|
||||
|
||||
private function checkServerSettings(){
|
||||
$postSize = $this->toBytes(ini_get('post_max_size'));
|
||||
$uploadSize = $this->toBytes(ini_get('upload_max_filesize'));
|
||||
|
||||
$uploadSize = $this->toBytes(ini_get('upload_max_filesize'));
|
||||
|
||||
/*if ($postSize < $this->sizeLimit || $uploadSize < $this->sizeLimit){
|
||||
$size = max(1, $this->sizeLimit / 1024 / 1024) . 'M';
|
||||
die("{'error':'increase post_max_size and upload_max_filesize to $size'}");
|
||||
}*/
|
||||
$size = max(1, $this->sizeLimit / 1024 / 1024) . 'M';
|
||||
die("{'error':'increase post_max_size and upload_max_filesize to $size'}");
|
||||
}*/
|
||||
}
|
||||
|
||||
|
||||
private function toBytes($str){
|
||||
$val = trim($str);
|
||||
$last = strtolower($str[strlen($str)-1]);
|
||||
switch($last) {
|
||||
case 'g': $val *= 1024;
|
||||
case 'm': $val *= 1024;
|
||||
case 'k': $val *= 1024;
|
||||
case 'k': $val *= 1024;
|
||||
}
|
||||
return $val;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Returns array('success'=>1) or array('error'=>'error message')
|
||||
*/
|
||||
function handleUpload($uploadDirectory,$saveFileName, $replaceOldFile = FALSE){
|
||||
if (!is_writable($uploadDirectory)){
|
||||
return array('success'=>0,'error' => "Server error. Upload directory isn't writable.");
|
||||
return array('success'=>0,'error' => "Server error. Upload directory ($uploadDirectory) is not writable");
|
||||
}
|
||||
|
||||
|
||||
if (!$this->file){
|
||||
return array('success'=>0,'error' => 'No files were uploaded.');
|
||||
}
|
||||
|
||||
|
||||
$size = $this->file->getSize();
|
||||
LogManager::getInstance()->info('file size ='.$size);
|
||||
LogManager::getInstance()->info('file size limit ='.$this->sizeLimit);
|
||||
if ($size == 0) {
|
||||
return array('success'=>0,'error' => 'File is empty');
|
||||
}
|
||||
|
||||
|
||||
if ($size > $this->sizeLimit) {
|
||||
return array('success'=>0,'error' => 'File is too large');
|
||||
}
|
||||
|
||||
|
||||
$pathinfo = pathinfo($this->file->getName());
|
||||
$filename = $pathinfo['filename'];
|
||||
//$filename = md5(uniqid());
|
||||
@@ -100,18 +100,18 @@ class qqFileUploader {
|
||||
//$filename .= microtime(true);
|
||||
$filename = $saveFileName; // file with only name
|
||||
$saveFileName = $saveFileName.'.'.strtolower($ext); // file with extention
|
||||
|
||||
|
||||
$final_img_location = $uploadDirectory . $saveFileName;
|
||||
|
||||
if ($this->file->save($final_img_location)){
|
||||
$arr = explode("/", $final_img_location);
|
||||
return array('success'=>1,'filename'=>$arr[count($arr)-1],'error'=>'');
|
||||
$arr = explode("/", $final_img_location);
|
||||
return array('success'=>1,'filename'=>$arr[count($arr)-1],'error'=>'');
|
||||
} else {
|
||||
return array('success'=>0,'error'=> 'Could not save uploaded file.' .
|
||||
'The upload was cancelled, or server error encountered');
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
//Generate File Name
|
||||
$saveFileName = $_POST['file_name'];
|
||||
@@ -119,12 +119,12 @@ $saveFileName = str_replace("..","",$saveFileName);
|
||||
$saveFileName = str_replace("/","",$saveFileName);
|
||||
|
||||
if(stristr($saveFileName,".php")){
|
||||
$saveFileName = str_replace(".php","",$saveFileName);
|
||||
$saveFileName = str_replace(".php","",$saveFileName);
|
||||
}
|
||||
|
||||
if(empty($saveFileName) || $saveFileName == "_NEW_"){
|
||||
$saveFileName = microtime();
|
||||
$saveFileName = str_replace(".", "-", $saveFileName);
|
||||
$saveFileName = microtime();
|
||||
$saveFileName = str_replace(".", "-", $saveFileName);
|
||||
}
|
||||
|
||||
$file = new File();
|
||||
@@ -150,45 +150,45 @@ $uploadedToS3 = false;
|
||||
LogManager::getInstance()->info($uploadFilesToS3."|".$uploadFilesToS3Key."|".$uploadFilesToS3Secret."|".$s3Bucket."|".$s3WebUrl."|".CLIENT_NAME);
|
||||
|
||||
if($uploadFilesToS3.'' == '1' && !empty($uploadFilesToS3Key) && !empty($uploadFilesToS3Secret) &&
|
||||
!empty($s3Bucket) && !empty($s3WebUrl)){
|
||||
|
||||
$localFile = CLIENT_BASE_PATH.'data/'.$result['filename'];
|
||||
|
||||
$f_size = filesize($localFile);
|
||||
$uploadname = CLIENT_NAME."/".$result['filename'];
|
||||
LogManager::getInstance()->info("Upload file to s3:".$uploadname);
|
||||
LogManager::getInstance()->info("Local file:".$localFile);
|
||||
LogManager::getInstance()->info("Local file size:".$f_size);
|
||||
|
||||
|
||||
$s3FileSys = new S3FileSystem($uploadFilesToS3Key, $uploadFilesToS3Secret);
|
||||
$res = $s3FileSys->putObject($s3Bucket, $uploadname, $localFile, 'authenticated-read');
|
||||
|
||||
$file_url = $s3WebUrl.$uploadname;
|
||||
$file_url = $s3FileSys->generateExpiringURL($file_url);
|
||||
LogManager::getInstance()->info("Response from s3 file sys:".print_r($res,true));
|
||||
unlink($localFile);
|
||||
|
||||
$uploadedToS3 = true;
|
||||
!empty($s3Bucket) && !empty($s3WebUrl)){
|
||||
|
||||
$localFile = CLIENT_BASE_PATH.'data/'.$result['filename'];
|
||||
|
||||
$f_size = filesize($localFile);
|
||||
$uploadname = CLIENT_NAME."/".$result['filename'];
|
||||
LogManager::getInstance()->info("Upload file to s3:".$uploadname);
|
||||
LogManager::getInstance()->info("Local file:".$localFile);
|
||||
LogManager::getInstance()->info("Local file size:".$f_size);
|
||||
|
||||
|
||||
$s3FileSys = new S3FileSystem($uploadFilesToS3Key, $uploadFilesToS3Secret);
|
||||
$res = $s3FileSys->putObject($s3Bucket, $uploadname, $localFile, 'authenticated-read');
|
||||
|
||||
$file_url = $s3WebUrl.$uploadname;
|
||||
$file_url = $s3FileSys->generateExpiringURL($file_url);
|
||||
LogManager::getInstance()->info("Response from s3 file sys:".print_r($res,true));
|
||||
unlink($localFile);
|
||||
|
||||
$uploadedToS3 = true;
|
||||
}
|
||||
|
||||
if($result['success'] == 1){
|
||||
$file->name = $saveFileName;
|
||||
$file->filename = $result['filename'];
|
||||
$signInMappingField = SIGN_IN_ELEMENT_MAPPING_FIELD_NAME;
|
||||
$file->$signInMappingField = $_POST['user']=="_NONE_"?null:$_POST['user'];
|
||||
$file->file_group = $_POST['file_group'];
|
||||
$file->Save();
|
||||
if($uploadedToS3){
|
||||
$result['data'] = $file_url;
|
||||
}else{
|
||||
$result['data'] = CLIENT_BASE_URL.'data/'.$result['filename'];
|
||||
}
|
||||
$result['data'] .= "|".$saveFileName;
|
||||
$result['data'] .= "|".$file->id;
|
||||
$file->name = $saveFileName;
|
||||
$file->filename = $result['filename'];
|
||||
$signInMappingField = SIGN_IN_ELEMENT_MAPPING_FIELD_NAME;
|
||||
$file->$signInMappingField = $_POST['user']=="_NONE_"?null:$_POST['user'];
|
||||
$file->file_group = $_POST['file_group'];
|
||||
$file->Save();
|
||||
if($uploadedToS3){
|
||||
$result['data'] = $file_url;
|
||||
}else{
|
||||
$result['data'] = CLIENT_BASE_URL.'data/'.$result['filename'];
|
||||
}
|
||||
$result['data'] .= "|".$saveFileName;
|
||||
$result['data'] .= "|".$file->id;
|
||||
}
|
||||
|
||||
|
||||
echo "<script>parent.closeUploadDialog(".$result['success'].",'".$result['error']."','".$result['data']."');</script>";
|
||||
echo "<script>parent.closeUploadDialog(".$result['success'].",'".$result['error']."','".$result['data']."');</script>";
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user