Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

CC-3426: apache log errors from plupload

Browse source 
-fixed
This commit is contained in:
Martin Konecny 2012-03-26 19:00:40 -04:00
parent a50b1ffe73
commit 3f713ca8dc
3 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
airtime_mvc/application/controllers/ApiController.php
View file

@ -469,9 +469,10 @@ class ApiController extends Zend_Controller_Action
$fileName = isset($_REQUEST["name"]) ? $_REQUEST["name"] : ''; $fileName = isset($_REQUEST["name"]) ? $_REQUEST["name"] : '';
$result = Application_Model_StoredFile::copyFileToStor($upload_dir, $fileName, $tempFileName); $result = Application_Model_StoredFile::copyFileToStor($upload_dir, $fileName, $tempFileName);
if (isset($result)){
die('{"jsonrpc" : "2.0", "error" : {"code": '.$result[code].', "message" : "'.$result[message].'"}}'); if (!is_null($result)){
} die('{"jsonrpc" : "2.0", "error" : {"code": '.$result[code].', "message" : "'.$result[message].'"}}');
}
} }
public function uploadRecordedAction() public function uploadRecordedAction()

2
airtime_mvc/application/controllers/PluploadController.php
View file

@ -39,7 +39,7 @@ class PluploadController extends Zend_Controller_Action
$filename = $this->_getParam('name'); $filename = $this->_getParam('name');
$tempname = $this->_getParam('tempname'); $tempname = $this->_getParam('tempname');
$result = Application_Model_StoredFile::copyFileToStor($upload_dir, $filename, $tempname); $result = Application_Model_StoredFile::copyFileToStor($upload_dir, $filename, $tempname);
if (isset($result)) if (!is_null($result))
die('{"jsonrpc" : "2.0", "error" : {"code": '.$result['code'].', "message" : "'.$result['message'].'"}}'); die('{"jsonrpc" : "2.0", "error" : {"code": '.$result['code'].', "message" : "'.$result['message'].'"}}');
die('{"jsonrpc" : "2.0"}'); die('{"jsonrpc" : "2.0"}');

16
airtime_mvc/application/models/StoredFile.php
View file

@ -783,7 +783,9 @@ Logging::log("getting media! - 2");
$freeSpace = ceil($freeSpace/1024/1024); $freeSpace = ceil($freeSpace/1024/1024);
$fileSize = ceil($fileSize/1024/1024); $fileSize = ceil($fileSize/1024/1024);
return array("code" => 107, "message" => "The file was not uploaded, there is ".$freeSpace."MB of disk space left and the file you are uploading has a size of ".$fileSize."MB."); return array("code" => 107, "message" => "The file was not uploaded, there is ".$freeSpace."MB of disk space left and the file you are uploading has a size of ".$fileSize."MB.");
return false;
} else {
return true;
} }
} }
@ -792,6 +794,8 @@ Logging::log("getting media! - 2");
Logging::log('copyFileToStor: moving file '.$audio_file); Logging::log('copyFileToStor: moving file '.$audio_file);
$md5 = md5_file($audio_file); $md5 = md5_file($audio_file);
$duplicate = Application_Model_StoredFile::RecallByMd5($md5); $duplicate = Application_Model_StoredFile::RecallByMd5($md5);
$result = null;
if ($duplicate) { if ($duplicate) {
if (PEAR::isError($duplicate)) { if (PEAR::isError($duplicate)) {
$result = array("code" => 105, "message" => $duplicate->getMessage()); $result = array("code" => 105, "message" => $duplicate->getMessage());
@ -802,13 +806,13 @@ Logging::log("getting media! - 2");
} }
} }
if (!isset($result)){//The file has no duplicate, so procceed to copy. if (!isset($result)){//The file has no duplicate, so proceed to copy.
$storDir = Application_Model_MusicDir::getStorDir(); $storDir = Application_Model_MusicDir::getStorDir();
$stor = $storDir->getDirectory(); $stor = $storDir->getDirectory();
//check to see if there is enough space in $stor to continue. //check to see if there is enough space in $stor to continue.
$result = Application_Model_StoredFile::checkForEnoughDiskSpaceToCopy($stor, $audio_file); $enough_space = Application_Model_StoredFile::checkForEnoughDiskSpaceToCopy($stor, $audio_file);
if (!isset($result)){//if result not set then there's enough disk space to copy the file over if ($enough_space){
$stor .= "/organize"; $stor .= "/organize";
$audio_stor = $stor . DIRECTORY_SEPARATOR . $fileName; $audio_stor = $stor . DIRECTORY_SEPARATOR . $fileName;
@ -822,9 +826,9 @@ Logging::log("getting media! - 2");
unlink($audio_file);//remove the file from the organize after failed rename unlink($audio_file);//remove the file from the organize after failed rename
$result = array("code" => 108, "message" => "The file was not uploaded, this error will occur if the computer hard drive does not have enough disk space."); $result = array("code" => 108, "message" => "The file was not uploaded, this error will occur if the computer hard drive does not have enough disk space.");
} }
}
} }
} return $result;
return $result;
} }