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

CC-2282 Import script does not restore storage from backup if database is intact

Browse source 
making spaces after ifs to follow coding standards.
This commit is contained in:
Naomi 2011-05-20 16:12:50 -04:00 • committed by Paul Baranowski
parent 71ac8d4b1b
commit 2866bf46cd
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1790,11 +1790,11 @@ class StoredFile {
die('{"jsonrpc" : "2.0", "error" : {"code": 101, "message": ' . $duplicate->getMessage() .'}}'); die('{"jsonrpc" : "2.0", "error" : {"code": 101, "message": ' . $duplicate->getMessage() .'}}');
} }
else { else {
if(file_exists($duplicate->getRealFilePath())) { if (file_exists($duplicate->getRealFilePath())) {
$duplicateName = $duplicate->getMetadataValue(UI_MDATA_KEY_TITLE); $duplicateName = $duplicate->getMetadataValue(UI_MDATA_KEY_TITLE);
die('{"jsonrpc" : "2.0", "error" : {"code": 101, "message": "An identical audioclip named ' . $duplicateName . ' already exists in the storage server."}}'); die('{"jsonrpc" : "2.0", "error" : {"code": 101, "message": "An identical audioclip named ' . $duplicateName . ' already exists in the storage server."}}');
} }
else{ else {
$res = $duplicate->replaceFile($audio_file); $res = $duplicate->replaceFile($audio_file);
if (PEAR::isError($res)) { if (PEAR::isError($res)) {
die('{"jsonrpc" : "2.0", "error" : {"code": 101, "message": ' . $duplicate->getMessage() .'}}'); die('{"jsonrpc" : "2.0", "error" : {"code": 101, "message": ' . $duplicate->getMessage() .'}}');

2
utils/airtime-import.php
View file

@ -211,7 +211,7 @@ function import_audio_file($p_filepath, $p_importMode = null, $p_testOnly = fals
} }
//row exists in database //row exists in database
if(isset($duplicate)) { if (isset($duplicate)) {
if (file_exists($duplicate->getRealFilePath())) { if (file_exists($duplicate->getRealFilePath())) {
echo "DUPLICATE: $p_filepath\n"; echo "DUPLICATE: $p_filepath\n";
$g_duplicates++; $g_duplicates++;