Folder copy/move disabled - needs to be fixed.
This commit is contained in:
parent
4047e33474
commit
3ed796c74d
1 changed files with 49 additions and 10 deletions
|
@ -23,7 +23,7 @@
|
||||||
|
|
||||||
|
|
||||||
Author : $Author: tomas $
|
Author : $Author: tomas $
|
||||||
Version : $Revision: 1.17 $
|
Version : $Revision: 1.18 $
|
||||||
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/BasicStor.php,v $
|
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/BasicStor.php,v $
|
||||||
|
|
||||||
------------------------------------------------------------------------------*/
|
------------------------------------------------------------------------------*/
|
||||||
|
@ -50,7 +50,7 @@ require_once "StoredFile.php";
|
||||||
* Core of LiveSupport file storage module
|
* Core of LiveSupport file storage module
|
||||||
*
|
*
|
||||||
* @author $Author: tomas $
|
* @author $Author: tomas $
|
||||||
* @version $Revision: 1.17 $
|
* @version $Revision: 1.18 $
|
||||||
* @see Alib
|
* @see Alib
|
||||||
*/
|
*/
|
||||||
class BasicStor extends Alib{
|
class BasicStor extends Alib{
|
||||||
|
@ -180,13 +180,31 @@ class BasicStor extends Alib{
|
||||||
*/
|
*/
|
||||||
function bsMoveFile($id, $did)
|
function bsMoveFile($id, $did)
|
||||||
{
|
{
|
||||||
if($this->getObjType($did) !== 'Folder')
|
|
||||||
return PEAR::raiseError(
|
|
||||||
"BasicStor::moveFile: destination is not folder ($did)", GBERR_WRTYPE
|
|
||||||
);
|
|
||||||
$parid = $this->getParent($id);
|
$parid = $this->getParent($id);
|
||||||
if($parid == $did) return TRUE;
|
if($parid == $did) return TRUE;
|
||||||
$this->_relocateSubtree($id, $did);
|
if($id == $did){
|
||||||
|
return PEAR::raiseError(
|
||||||
|
"BasicStor::moveFile: can't move to itself",
|
||||||
|
GBERR_WRTYPE
|
||||||
|
);
|
||||||
|
}
|
||||||
|
if($this->getObjType($did) !== 'Folder')
|
||||||
|
return PEAR::raiseError(
|
||||||
|
"BasicStor::moveFile: destination is not folder ($did)",
|
||||||
|
GBERR_WRTYPE
|
||||||
|
);
|
||||||
|
switch($this->getObjType($id)){
|
||||||
|
case"audioclip":
|
||||||
|
case"playlist":
|
||||||
|
case"File":
|
||||||
|
return $this->_relocateSubtree($id, $did);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
return PEAR::raiseError(
|
||||||
|
"BasicStor::moveFile: only file move supported now, sorry.",
|
||||||
|
GBERR_WRTYPE
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -198,11 +216,32 @@ class BasicStor extends Alib{
|
||||||
*/
|
*/
|
||||||
function bsCopyFile($id, $did)
|
function bsCopyFile($id, $did)
|
||||||
{
|
{
|
||||||
if($this->getObjType($did) !== 'Folder')
|
$parid = $this->getParent($id);
|
||||||
|
if($parid == $did) return TRUE;
|
||||||
|
if($id == $did){
|
||||||
return PEAR::raiseError(
|
return PEAR::raiseError(
|
||||||
'BasicStor::bsCopyFile: destination is not folder', GBERR_WRTYPE
|
"BasicStor::bsCopyFile: can't move to itself",
|
||||||
|
GBERR_WRTYPE
|
||||||
);
|
);
|
||||||
|
}
|
||||||
|
if($this->getObjType($did) !== 'Folder'){
|
||||||
|
return PEAR::raiseError(
|
||||||
|
'BasicStor::bsCopyFile: destination is not folder',
|
||||||
|
GBERR_WRTYPE
|
||||||
|
);
|
||||||
|
}
|
||||||
|
switch($this->getObjType($id)){
|
||||||
|
case"audioclip":
|
||||||
|
case"playlist":
|
||||||
|
case"File":
|
||||||
return $this->_copySubtree($id, $did);
|
return $this->_copySubtree($id, $did);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
return PEAR::raiseError(
|
||||||
|
"BasicStor::moveFile: only file sopy supported now, sorry.",
|
||||||
|
GBERR_WRTYPE
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue