minor changes

This commit is contained in:
tomas 2005-02-20 21:26:18 +00:00
parent c2272766f2
commit 90f154c31c
2 changed files with 8 additions and 5 deletions

View File

@ -23,7 +23,7 @@
Author : $Author: tomas $ Author : $Author: tomas $
Version : $Revision: 1.39 $ Version : $Revision: 1.40 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/GreenBox.php,v $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/GreenBox.php,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -35,7 +35,7 @@ require_once "BasicStor.php";
* LiveSupport file storage module * LiveSupport file storage module
* *
* @author $Author: tomas $ * @author $Author: tomas $
* @version $Revision: 1.39 $ * @version $Revision: 1.40 $
* @see BasicStor * @see BasicStor
*/ */
class GreenBox extends BasicStor{ class GreenBox extends BasicStor{
@ -99,7 +99,9 @@ class GreenBox extends BasicStor{
{ {
if(($res = $this->_authorize('write', $parid, $sessid)) !== TRUE) if(($res = $this->_authorize('write', $parid, $sessid)) !== TRUE)
return $res; return $res;
if(!file_exists($mdataFileLP)){ $mdataFileLP = dirname(__FILE__).'/emptyMdata.xml'; } if(!file_exists($mdataFileLP)){
$mdataFileLP = dirname(__FILE__).'/emptyMdata.xml';
}
$oid = $this->bsPutFile( $oid = $this->bsPutFile(
$parid, $fileName, '', $mdataFileLP, $gunid, 'webstream' $parid, $fileName, '', $mdataFileLP, $gunid, 'webstream'
); );

View File

@ -23,7 +23,7 @@
Author : $Author: tomas $ Author : $Author: tomas $
Version : $Revision: 1.33 $ Version : $Revision: 1.34 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/LocStor.php,v $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/LocStor.php,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -484,7 +484,8 @@ class LocStor extends BasicStor{
$oid = $this->addObj($tmpFname , 'File', $parid); $oid = $this->addObj($tmpFname , 'File', $parid);
if(PEAR::isError($oid)) return $oid; if(PEAR::isError($oid)) return $oid;
$ac =& StoredFile::insert($this, $oid, '', '', $ac =& StoredFile::insert($this, $oid, '', '',
'../emptyPlaylist.xml', 'file', $playlistId, 'playlist' dirname(__FILE__).'/emptyPlaylist.xml',
'file', $playlistId, 'playlist'
); );
if(PEAR::isError($ac)){ if(PEAR::isError($ac)){
$res = $this->removeObj($oid); $res = $this->removeObj($oid);