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

Fix to prevent double-import in the Web interface. Part of #1805

This commit is contained in:
paul 2007-01-15 23:12:54 +00:00
parent 4f49f64e63
commit a1d90f6bbc
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
campcaster/src/modules/htmlUI/var/html/ui_handler.php
View File

@ -25,7 +25,7 @@ switch ($_REQUEST['act']) {
$uiHandler->logout(TRUE); $uiHandler->logout(TRUE);
break; break;
## file/webstream handling // file/webstream handling
case "addFileData": case "addFileData":
if (($ui_tmpid = $uiHandler->uploadFile(array_merge($_REQUEST, $_FILES), $ui_fmask["file"])) !== FALSE) { if (($ui_tmpid = $uiHandler->uploadFile(array_merge($_REQUEST, $_FILES), $ui_fmask["file"])) !== FALSE) {
$uiHandler->SCRATCHPAD->addItem($ui_tmpid); $uiHandler->SCRATCHPAD->addItem($ui_tmpid);
@ -260,9 +260,11 @@ switch ($_REQUEST['act']) {
break; break;
case "PL.addItem": case "PL.addItem":
if ($uiHandler->PLAYLIST->addItem($_REQUEST['id'], $_REQUEST['playlength']) !== FALSE) { if (isset($_REQUEST['id']) && isset($_REQUEST['playlength'])) {
$uiHandler->SCRATCHPAD->addItem($_REQUEST['id']); if ($uiHandler->PLAYLIST->addItem($_REQUEST['id'], $_REQUEST['playlength']) !== FALSE) {
} $uiHandler->SCRATCHPAD->addItem($_REQUEST['id']);
}
}
$uiHandler->PLAYLIST->setReload(); $uiHandler->PLAYLIST->setReload();
break; break;

2
campcaster/src/modules/htmlUI/var/ui_conf.php
View File

@ -2,7 +2,7 @@
ini_set('memory_limit', '64M'); ini_set('memory_limit', '64M');
// Warning/Error level // Warning/Error level
define('UI_DEBUG', TRUE); define('UI_DEBUG', FALSE);
define('UI_VERBOSE', FALSE); define('UI_VERBOSE', FALSE);
define('UI_WARNING', TRUE); define('UI_WARNING', TRUE);
define('UI_ERROR', TRUE); define('UI_ERROR', TRUE);

24
campcaster/src/modules/htmlUI/var/ui_handler.class.php
View File

@ -136,6 +136,14 @@ class uiHandler extends uiBase {
return FALSE; return FALSE;
} }
$md5 = md5_file($formdata['mediafile']['tmp_name']);
$duplicate = StoredFile::RecallByMd5($md5);
if ($duplicate) {
$this->_retMsg('The file "'.basename($formdata['mediafile']['name']).'" already exists in the database.');
$this->redirUrl = UI_BROWSER."?act=addFileData&folderId=".$formdata['folderId'];
return FALSE;
}
$metadata = camp_get_audio_metadata($formdata['mediafile']['tmp_name']); $metadata = camp_get_audio_metadata($formdata['mediafile']['tmp_name']);
if (PEAR::isError($metadata)) { if (PEAR::isError($metadata)) {
$this->_retMsg($metadata->getMessage()); $this->_retMsg($metadata->getMessage());
@ -162,12 +170,12 @@ class uiHandler extends uiBase {
} }
$this->setMetadataValue($r, UI_MDATA_KEY_TITLE, $formdata['mediafile']['name']); $this->setMetadataValue($r, UI_MDATA_KEY_TITLE, $formdata['mediafile']['name']);
$this->transMData($r); $this->translateMetadata($r);
// set records in default language too // set records in default language too
if (UI_UPLOAD_LANGID !== UI_DEFAULT_LANGID) { if (UI_UPLOAD_LANGID !== UI_DEFAULT_LANGID) {
$this->setMetadataValue($r, UI_MDATA_KEY_TITLE, $formdata['mediafile']['name'], UI_UPLOAD_LANGID); $this->setMetadataValue($r, UI_MDATA_KEY_TITLE, $formdata['mediafile']['name'], UI_UPLOAD_LANGID);
$this->transMData($r, UI_UPLOAD_LANGID); $this->translateMetadata($r, UI_UPLOAD_LANGID);
} }
$this->redirUrl = UI_BROWSER."?act=addFileMData&id=$r"; $this->redirUrl = UI_BROWSER."?act=addFileMData&id=$r";
@ -191,12 +199,11 @@ class uiHandler extends uiBase {
/** /**
* @todo Rename this function.
* @param unknown_type $id * @param unknown_type $id
* @param unknown_type $langid * @param unknown_type $langid
* @return void * @return void
*/ */
function transMData($id, $langid=UI_DEFAULT_LANGID) function translateMetadata($id, $langid=UI_DEFAULT_LANGID)
{ {
include(dirname(__FILE__).'/formmask/metadata.inc.php'); include(dirname(__FILE__).'/formmask/metadata.inc.php');
@ -431,15 +438,6 @@ class uiHandler extends uiBase {
{ {
$this->redirUrl = UI_BROWSER."?popup[]=_reload_parent&popup[]=_close"; $this->redirUrl = UI_BROWSER."?popup[]=_reload_parent&popup[]=_close";
/* no folder support yet
if (!($delOverride==$id) && (count(BasicStor::GetObjType($id)=='Folder'?
$this->gb->listFolder($id, $this->sessid):NULL))) {
$this->_retMsg("Folder is not empty. You can override this protection by clicking DEL again");
$this->redirUrl = UI_BROWSER."?act=fileList&id=".$this->pid."&delOverride=$id";
return FALSE;
}
*/
if (is_array($id)) { if (is_array($id)) {
$ids = $id; $ids = $id;
} else { } else {