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

minor changes

This commit is contained in:
tomas 2005-02-18 18:43:11 +00:00
parent aae5e8288f
commit 0b961e9c32
2 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
livesupport/modules/storageServer/var/BasicStor.php
View File

@ -23,7 +23,7 @@
Author : $Author: tomas $ Author : $Author: tomas $
Version : $Revision: 1.31 $ Version : $Revision: 1.32 $
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 $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -52,7 +52,7 @@ require_once "Transport.php";
* Core of LiveSupport file storage module * Core of LiveSupport file storage module
* *
* @author $Author: tomas $ * @author $Author: tomas $
* @version $Revision: 1.31 $ * @version $Revision: 1.32 $
* @see Alib * @see Alib
*/ */
class BasicStor extends Alib{ class BasicStor extends Alib{
@ -987,12 +987,8 @@ class BasicStor extends Alib{
*/ */
function _checkGunid($gunid) function _checkGunid($gunid)
{ {
if(!preg_match("|^([0-9a-fA-F]{16})?$|", $gunid)){ $res = preg_match("|^([0-9a-fA-F]{16})?$|", $gunid);
return PEAR::raiseError( return $res;
"BasicStor.php: Wrong gunid ($gunid)"
);
}
return TRUE;
} }
/** /**

19
livesupport/modules/storageServer/var/GreenBox.php
View File

@ -23,7 +23,7 @@
Author : $Author: tomas $ Author : $Author: tomas $
Version : $Revision: 1.36 $ Version : $Revision: 1.37 $
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.36 $ * @version $Revision: 1.37 $
* @see BasicStor * @see BasicStor
*/ */
class GreenBox extends BasicStor{ class GreenBox extends BasicStor{
@ -394,8 +394,11 @@ class GreenBox extends BasicStor{
* @param sessid string, session ID * @param sessid string, session ID
* @return int, local id of created playlist * @return int, local id of created playlist
*/ */
function createPlaylist($parid, $fname, $gunid, $sessid) function createPlaylist($parid, $fname, $gunid=NULL, $sessid='')
{ {
if(!$this->_checkGunid($gunid)){
$gunid = StoredFile::_createGunid();
}
require_once"LocStor.php"; require_once"LocStor.php";
$lc =& new LocStor($this->dbc, $this->config); $lc =& new LocStor($this->dbc, $this->config);
$gunid2 = $lc->createPlaylist($sessid, $gunid, $fname); $gunid2 = $lc->createPlaylist($sessid, $gunid, $fname);
@ -708,7 +711,7 @@ class GreenBox extends BasicStor{
/** /**
* Delete a Playlist metafile. * Delete a Playlist metafile.
* *
* @param parid int, parent id * @param id int, local id
* @param sessid string, session ID * @param sessid string, session ID
* @return boolean * @return boolean
*/ */
@ -723,11 +726,11 @@ class GreenBox extends BasicStor{
/** /**
* Check whether a Playlist metafile with the given playlist ID exists. * Check whether a Playlist metafile with the given playlist ID exists.
* *
* @param parid int, parent id * @param id int, local id
* @param sessid string, session ID * @param sessid string, session ID
* @return boolean * @return boolean
*/ */
function existsPlaylist($gunid, $sessid) function existsPlaylist($id, $sessid)
{ {
$gunid = $this->_gunidFromId($id); $gunid = $this->_gunidFromId($id);
require_once"LocStor.php"; require_once"LocStor.php";
@ -740,11 +743,11 @@ class GreenBox extends BasicStor{
* is available for editing, i.e., exists and is not marked as * is available for editing, i.e., exists and is not marked as
* beeing edited. * beeing edited.
* *
* @param parid int, parent id * @param id int, local id
* @param sessid string, session ID * @param sessid string, session ID
* @return boolean * @return boolean
*/ */
function playlistIsAvailable($gunid, $sessid) function playlistIsAvailable($id, $sessid)
{ {
$gunid = $this->_gunidFromId($id); $gunid = $this->_gunidFromId($id);
require_once"LocStor.php"; require_once"LocStor.php";