- \n".
+ );
+ }
+ }
+ $title = (isset($acOrPl['title']) ? htmlspecialchars($acOrPl['title']) : '' );
+ $desc = (isset($acOrPl['desc']) ? htmlspecialchars($acOrPl['desc']) : '' );
+ $link = htmlspecialchars($acOrPl['src']);
+ $desc = '';
+ $str = "$ind
- \n".
"$ind2$title\n".
"$ind2$desc\n".
"$ind2$link\n".
"$ind
\n";
- return $str;
- }
-}
-
-
-/**
- * @package Campcaster
- * @subpackage StorageServer
- * @copyright 2010 Sourcefabric O.P.S.
- * @license http://www.gnu.org/licenses/gpl.txt
- * @todo Rename this class to PlaylistAudioClip (notice the caps)
- */
-class PlaylistAudioClipExport
-{
-
- public static function OutputToSmil(&$pl, $plac, $ind='')
- {
- $gunid = $plac['attrs']['id'];
- $ac = StoredFile::RecallByGunid($gunid);
- if (is_null($ac) || PEAR::isError($ac)) {
- return $ac;
+ return $str;
+ }
}
- $RADext = $ac->getFileExtension();
- if (PEAR::isError($RADext)) {
- return $RADext;
- }
- return array(
+
+
+ /**
+ * @package Campcaster
+ * @subpackage StorageServer
+ * @copyright 2010 Sourcefabric O.P.S.
+ * @license http://www.gnu.org/licenses/gpl.txt
+ * @todo Rename this class to PlaylistAudioClip (notice the caps)
+ */
+ class PlaylistAudioClipExport
+ {
+
+ public static function OutputToSmil(&$pl, $plac, $ind='')
+ {
+ $gunid = $plac['attrs']['id'];
+ $ac = StoredFile::RecallByGunid($gunid);
+ if (is_null($ac) || PEAR::isError($ac)) {
+ return $ac;
+ }
+ $RADext = $ac->getFileExtension();
+ if (PEAR::isError($RADext)) {
+ return $RADext;
+ }
+ return array(
'type' => 'audioclip',
'gunid' => $gunid,
'src' => AC_URL_RELPATH."$gunid.$RADext",
'playlength' => $plac['attrs']['playlength'],
- );
- }
+ );
+ }
- public static function OutputToM3u(&$pl, $plac, $ind='')
- {
- $gunid = $plac['attrs']['id'];
- $ac = StoredFile::RecallByGunid($gunid);
- if (is_null($ac) || PEAR::isError($ac)) {
- return $ac;
- }
- $RADext = $ac->getFileExtension();
- if (PEAR::isError($RADext)) {
- return $RADext;
- }
- return array(
+ public static function OutputToM3u(&$pl, $plac, $ind='')
+ {
+ $gunid = $plac['attrs']['id'];
+ $ac = StoredFile::RecallByGunid($gunid);
+ if (is_null($ac) || PEAR::isError($ac)) {
+ return $ac;
+ }
+ $RADext = $ac->getFileExtension();
+ if (PEAR::isError($RADext)) {
+ return $RADext;
+ }
+ return array(
'playlength' => $plac['attrs']['playlength'],
'title' => $plac['attrs']['title'],
'uri' => AC_URL_RELPATH."$gunid.$RADext",
- );
- }
+ );
+ }
- public static function OutputToRss(&$pl, $plac, $ind='')
- {
- $id = $plac['attrs']['id'];
- $playlist = Playlist::Recall($id);
- if (is_null($playlist) || PEAR::isError($playlist)) {
- return $playlist;
- }
- $RADext = $playlist->getFileExtension();
- if (PEAR::isError($RADext)) {
- return $RADext;
- }
- $title = $playlist->getName();
- $desc = $playlist->getPLMetaData("dc:description");
- return array(
+ public static function OutputToRss(&$pl, $plac, $ind='')
+ {
+ $id = $plac['attrs']['id'];
+ $playlist = Playlist::Recall($id);
+ if (is_null($playlist) || PEAR::isError($playlist)) {
+ return $playlist;
+ }
+ $RADext = $playlist->getFileExtension();
+ if (PEAR::isError($RADext)) {
+ return $RADext;
+ }
+ $title = $playlist->getName();
+ $desc = $playlist->getPLMetaData("dc:description");
+ return array(
'type' => 'audioclip',
'gunid' => $id,
'src' => "http://XXX/YY/$id.$RADext",
'playlength' => $plac['attrs']['playlength'],
'title' => $title,
'desc' => $desc,
- );
- }
-}
+ );
+ }
+ }
-/**
- * @package Campcaster
- * @subpackage StorageServer
- * @copyright 2010 Sourcefabric O.P.S.
- * @license http://www.gnu.org/licenses/gpl.txt
- * @todo Rename this class "PlaylistFadeInfo" (notive the caps)
- */
-class PlaylistFadeInfoExport
-{
+ /**
+ * @package Campcaster
+ * @subpackage StorageServer
+ * @copyright 2010 Sourcefabric O.P.S.
+ * @license http://www.gnu.org/licenses/gpl.txt
+ * @todo Rename this class "PlaylistFadeInfo" (notive the caps)
+ */
+ class PlaylistFadeInfoExport
+ {
- public static function OutputToSmil(&$pl, $plfi, $ind='')
- {
- $r = array(
+ public static function OutputToSmil(&$pl, $plfi, $ind='')
+ {
+ $r = array(
'fi'=>$plfi['attrs']['fadeIn'],
'fo'=>$plfi['attrs']['fadeOut'],
- );
- return $r;
- }
+ );
+ return $r;
+ }
- public static function OutputToM3u(&$pl, $plfa, $ind='')
- {
- return '';
- }
+ public static function OutputToM3u(&$pl, $plfa, $ind='')
+ {
+ return '';
+ }
- public static function OutputToRss(&$pl, $plfa, $ind='')
- {
- return '';
- }
+ public static function OutputToRss(&$pl, $plfa, $ind='')
+ {
+ return '';
+ }
-}
+ }
-/**
- * @package Campcaster
- * @subpackage StorageServer
- * @copyright 2010 Sourcefabric O.P.S.
- * @license http://www.gnu.org/licenses/gpl.txt
- * @todo Rename this class to PlaylistMetadata (notice the caps)
- */
-class PlaylistMetadataExport
-{
- public static function OutputToSmil(&$pl, $md, $ind='')
- {
- return NULL;
- }
+ /**
+ * @package Campcaster
+ * @subpackage StorageServer
+ * @copyright 2010 Sourcefabric O.P.S.
+ * @license http://www.gnu.org/licenses/gpl.txt
+ * @todo Rename this class to PlaylistMetadata (notice the caps)
+ */
+ class PlaylistMetadataExport
+ {
+ public static function OutputToSmil(&$pl, $md, $ind='')
+ {
+ return NULL;
+ }
- public static function OutputToM3u(&$pl, $md, $ind='')
- {
- return NULL;
- }
+ public static function OutputToM3u(&$pl, $md, $ind='')
+ {
+ return NULL;
+ }
- public static function OutputToRss(&$pl, $md, $ind='')
- {
- return NULL;
- }
-}
+ public static function OutputToRss(&$pl, $md, $ind='')
+ {
+ return NULL;
+ }
+ }
-?>
+ ?>
diff --git a/backend/Prefs.php b/backend/Prefs.php
index 49f0dc6c9..c51a75402 100644
--- a/backend/Prefs.php
+++ b/backend/Prefs.php
@@ -44,19 +44,19 @@ class Prefs {
{
$subjid = GreenBox::GetSessUserId($sessid);
if (PEAR::isError($subjid)) {
- return $subjid;
+ return $subjid;
}
if (is_null($subjid)) {
return PEAR::raiseError("Prefs::loadPref: invalid session id",
- GBERR_SESS);
+ GBERR_SESS);
}
$val = $this->readVal($subjid, $key);
if (PEAR::isError($val)) {
- return $val;
+ return $val;
}
if ($val === FALSE) {
return PEAR::raiseError("Prefs::loadPref: invalid preference key",
- GBERR_PREF);
+ GBERR_PREF);
}
return $val;
}
@@ -77,20 +77,19 @@ class Prefs {
{
$subjid = GreenBox::GetSessUserId($sessid);
if (PEAR::isError($subjid)) {
- return $subjid;
+ return $subjid;
}
if (is_null($subjid)) {
- return PEAR::raiseError("Prefs::savePref: invalid session id",
- GBERR_SESS);
+ return PEAR::raiseError("Prefs::savePref: invalid session id", GBERR_SESS);
}
$r = $this->update($subjid, $key, $value);
if (PEAR::isError($r)) {
- return $r;
+ return $r;
}
if ($r === FALSE) {
$r = $this->insert($subjid, $key, $value);
if (PEAR::isError($r)) {
- return $r;
+ return $r;
}
}
return TRUE;
@@ -110,19 +109,17 @@ class Prefs {
{
$subjid = GreenBox::GetSessUserId($sessid);
if (PEAR::isError($subjid)) {
- return $subjid;
+ return $subjid;
}
if (is_null($subjid)) {
- return PEAR::raiseError("Prefs::delPref: invalid session id",
- GBERR_SESS);
+ return PEAR::raiseError("Prefs::delPref: invalid session id", GBERR_SESS);
}
$r = $this->delete($subjid, $key);
if (PEAR::isError($r)) {
- return $r;
+ return $r;
}
if ($r === FALSE) {
- return PEAR::raiseError("Prefs::delPref: invalid preference key",
- GBERR_PREF);
+ return PEAR::raiseError("Prefs::delPref: invalid preference key", GBERR_PREF);
}
return TRUE;
}
@@ -146,7 +143,7 @@ class Prefs {
// if sessid is would be used here fix Transport::cronCallMethod !
$subjid = Subjects::GetSubjId($group);
if (PEAR::isError($subjid)) {
- return $subjid;
+ return $subjid;
}
if (is_null($subjid)) {
return PEAR::raiseError(
@@ -154,7 +151,7 @@ class Prefs {
}
$val = $this->readVal($subjid, $key);
if (PEAR::isError($val)) {
- return $val;
+ return $val;
}
if ($val === FALSE) {
if ($returnErrorIfKeyNotExists) {
@@ -185,7 +182,7 @@ class Prefs {
{
$uid = GreenBox::GetSessUserId($sessid);
if (PEAR::isError($uid)) {
- return $uid;
+ return $uid;
}
if (is_null($uid)) {
return PEAR::raiseError(
@@ -193,7 +190,7 @@ class Prefs {
}
$gid = Subjects::GetSubjId($group);
if (PEAR::isError($gid)) {
- return $gid;
+ return $gid;
}
if (is_null($gid)) {
return PEAR::raiseError(
@@ -201,7 +198,7 @@ class Prefs {
}
$memb = Subjects::IsMemberOf($uid, $gid);
if (PEAR::isError($memb)) {
- return $memb;
+ return $memb;
}
if (!$memb) {
return PEAR::raiseError(
@@ -209,12 +206,12 @@ class Prefs {
}
$r = $this->update($gid, $key, $value);
if (PEAR::isError($r)) {
- return $r;
+ return $r;
}
if ($r === FALSE) {
$r = $this->insert($gid, $key, $value);
if (PEAR::isError($r)) {
- return $r;
+ return $r;
}
}
return TRUE;
@@ -235,7 +232,7 @@ class Prefs {
{
$uid = GreenBox::GetSessUserId($sessid);
if (PEAR::isError($uid)) {
- return $uid;
+ return $uid;
}
if (is_null($uid)) {
return PEAR::raiseError(
@@ -243,7 +240,7 @@ class Prefs {
}
$gid = Subjects::GetSubjId($group);
if (PEAR::isError($gid)) {
- return $gid;
+ return $gid;
}
if (is_null($gid)) {
return PEAR::raiseError(
@@ -251,7 +248,7 @@ class Prefs {
}
$memb = Subjects::IsMemberOf($uid, $gid);
if (PEAR::isError($memb)) {
- return $memb;
+ return $memb;
}
if (!$memb) {
return PEAR::raiseError(
@@ -259,7 +256,7 @@ class Prefs {
}
$r = $this->delete($gid, $key);
if (PEAR::isError($r)) {
- return $r;
+ return $r;
}
if ($r === FALSE) {
return PEAR::raiseError(
@@ -287,7 +284,7 @@ class Prefs {
global $CC_CONFIG, $CC_DBC;
$id = $CC_DBC->nextId($CC_CONFIG['prefSequence']);
if (PEAR::isError($id)) {
- return $id;
+ return $id;
}
$r = $CC_DBC->query("
INSERT INTO ".$CC_CONFIG['prefTable']."
@@ -296,7 +293,7 @@ class Prefs {
($id, $subjid, '$keystr', '$valstr')
");
if (PEAR::isError($r)) {
- return $r;
+ return $r;
}
return $id;
}
@@ -320,10 +317,10 @@ class Prefs {
WHERE subjid=$subjid AND keystr='$keystr'
");
if (PEAR::isError($val)) {
- return $val;
+ return $val;
}
if (is_null($val)) {
- return FALSE;
+ return FALSE;
}
return $val;
}
@@ -345,10 +342,10 @@ class Prefs {
WHERE subjid=$subjid
");
if (PEAR::isError($res)) {
- return $res;
+ return $res;
}
if (is_null($res)) {
- return FALSE;
+ return FALSE;
}
return $res;
}
@@ -374,10 +371,10 @@ class Prefs {
WHERE subjid=$subjid AND keystr='$keystr'
");
if (PEAR::isError($r)) {
- return $r;
+ return $r;
}
if ($CC_DBC->affectedRows() < 1) {
- return FALSE;
+ return FALSE;
}
return TRUE;
}
@@ -400,10 +397,10 @@ class Prefs {
WHERE subjid=$subjid AND keystr='$keystr'
");
if (PEAR::isError($r)) {
- return $r;
+ return $r;
}
if ($CC_DBC->affectedRows() < 1) {
- return FALSE;
+ return FALSE;
}
return TRUE;
}
@@ -422,7 +419,7 @@ class Prefs {
$testVal = 'abcDef 0123 ěščřžýáíé ĚŠČŘŽÝÁÍÉ';
$r = savePref($sessid, $testKey, $testVal);
if (PEAR::isError($r)) {
- return $r;
+ return $r;
}
$val = loadPref($sessid, $testKey);
if ($val != $testVal) {
@@ -431,7 +428,7 @@ class Prefs {
}
$r = savePref($sessid, $testKey, '');
if (PEAR::isError($r)) {
- return $r;
+ return $r;
}
$val = loadPref($sessid, $testKey);
if ($val != $testVal) {
diff --git a/backend/Renderer.php b/backend/Renderer.php
index 720d71397..81d636b70 100644
--- a/backend/Renderer.php
+++ b/backend/Renderer.php
@@ -35,12 +35,12 @@ class Renderer
// recall playlist:
$pl = StoredFile::RecallByGunid($plid);
if (is_null($pl) || PEAR::isError($pl)) {
- return $pl;
+ return $pl;
}
// smil export:
$smil = $pl->outputToSmil();
if (PEAR::isError($smil)) {
- return $smil;
+ return $smil;
}
// temporary file for smil:
$tmpn = tempnam($CC_CONFIG['bufferDir'], 'plRender_');
@@ -56,7 +56,7 @@ class Renderer
// open access to output file: /*gunid*/ /*parent*/
$acc = BasicStor::bsAccess($outf, RENDER_EXT, $plid, 'render', 0, $owner);
if (PEAR::isError($acc)) {
- return $acc;
+ return $acc;
}
extract($acc);
$statf = Renderer::getStatusFile($gb, $token);
@@ -70,7 +70,7 @@ class Renderer
if ($res === FALSE) {
return PEAR::raiseError(
'Renderer::rnRender2File: Error running renderer'
- );
+ );
}
return array('token'=>$token);
}
@@ -93,7 +93,7 @@ class Renderer
if (!file_exists($statf)) {
return PEAR::raiseError(
'Renderer::rnRender2FileCheck: Invalid token'
- );
+ );
}
$status = trim(file_get_contents($statf));
$url = Renderer::getUrl($gb, $token);
@@ -142,7 +142,7 @@ class Renderer
global $CC_CONFIG;
$r = BasicStor::bsRelease($token, 'render');
if (PEAR::isError($r)) {
- return $r;
+ return $r;
}
$realOgg = $r['realFname'];
$tmpn = $CC_CONFIG['bufferDir']."/".basename($realOgg, '.'.RENDER_EXT);
@@ -171,7 +171,7 @@ class Renderer
{
$r = Renderer::rnRender2FileCheck($gb, $token);
if (PEAR::isError($r)) {
- return $r;
+ return $r;
}
$status = $r['status'];
$res = array('status' => $status, 'gunid'=>'NULL');
@@ -182,7 +182,7 @@ class Renderer
case "success":
$r = Renderer::rnRender2StorageCore($gb, $token);
if (PEAR::isError($r)) {
- return $r;
+ return $r;
}
$res['gunid'] = $r['gunid'];
break;
@@ -205,36 +205,36 @@ class Renderer
*/
function rnRender2StorageCore(&$gb, $token)
{
-// $r = BasicStor::bsRelease($token, 'render');
-// if (PEAR::isError($r)) {
-// return $r;
-// }
-// $realOgg = $r['realFname'];
-// $owner = $r['owner'];
-// $gunid = $r['gunid'];
-// $fileName = 'rendered_playlist';
-// $id = BasicStor::IdFromGunid($gunid);
-// if (PEAR::isError($id)) {
-// return $id;
-// }
-// $mdata = '';
-// foreach (array('dc:title', 'dcterms:extent', 'dc:creator', 'dc:description') as $item) {
-// $val = $gb->bsGetMetadataValue($id, $item);
-// $mdata .= " <$item>$val\n";
-// }
-// $mdata = "\n \n$mdata \n\n";
-// //$mdata = "\n \n$mdata0\n\n\n";
-// $values = array(
-// "filename" => $fileName,
-// "filepath" => $realOgg,
-// "metadata" => $mdata,
-// "filetype" => "audioclip"
-// );
-// $storedFile = $gb->bsPutFile($values);
-// if (PEAR::isError($storedFile)) {
-// return $storedFile;
-// }
-// return array('gunid' => $storedFile->getGunid());
+ // $r = BasicStor::bsRelease($token, 'render');
+ // if (PEAR::isError($r)) {
+ // return $r;
+ // }
+ // $realOgg = $r['realFname'];
+ // $owner = $r['owner'];
+ // $gunid = $r['gunid'];
+ // $fileName = 'rendered_playlist';
+ // $id = BasicStor::IdFromGunid($gunid);
+ // if (PEAR::isError($id)) {
+ // return $id;
+ // }
+ // $mdata = '';
+ // foreach (array('dc:title', 'dcterms:extent', 'dc:creator', 'dc:description') as $item) {
+ // $val = $gb->bsGetMetadataValue($id, $item);
+ // $mdata .= " <$item>$val\n";
+ // }
+ // $mdata = "\n \n$mdata \n\n";
+ // //$mdata = "\n \n$mdata0\n\n\n";
+ // $values = array(
+ // "filename" => $fileName,
+ // "filepath" => $realOgg,
+ // "metadata" => $mdata,
+ // "filetype" => "audioclip"
+ // );
+ // $storedFile = $gb->bsPutFile($values);
+ // if (PEAR::isError($storedFile)) {
+ // return $storedFile;
+ // }
+ // return array('gunid' => $storedFile->getGunid());
}
diff --git a/backend/Restore.php b/backend/Restore.php
index afb7c01f3..892c0f19f 100644
--- a/backend/Restore.php
+++ b/backend/Restore.php
@@ -61,7 +61,7 @@ class Restore {
$this->token = null;
$this->logFile = $CC_CONFIG['bufferDir'].'/'.$this->ACCESS_TYPE.'.log';
if ($this->loglevel == 'debug') {
- $this->addLogItem("-I- ".date("Ymd-H:i:s")." construct\n");
+ $this->addLogItem("-I- ".date("Ymd-H:i:s")." construct\n");
}
}
@@ -131,9 +131,9 @@ class Restore {
}
$r['status'] = $stat;
if ($stat=='fault') {
- $r['faultString'] = $message;
+ $r['faultString'] = $message;
} else {
- $r['faultString'] = '';
+ $r['faultString'] = '';
}
return $r;
} else {
@@ -193,8 +193,8 @@ class Restore {
//simple check of archive format
if (is_dir($this->tmpDir.'audioClip/') &&
- is_dir($this->tmpDir.'meta-inf/') &&
- is_dir($this->tmpDir.'playlist/')) {
+ is_dir($this->tmpDir.'meta-inf/') &&
+ is_dir($this->tmpDir.'playlist/')) {
//search metafiles
$this->metafiles = $this->getMetaFiles();
#$this->addLogItem('metafiles:'.print_r($this->metafiles,true));
@@ -205,15 +205,15 @@ class Restore {
$this->addLogItem("-E- ".date("Ymd-H:i:s").
" startRestore - addFileToStorage \n".
"(".$put->getMessage()."/".$put->getUserInfo().")\n"
- );
- file_put_contents($this->statusFile, 'fault|'.$put->getMessage()."/".$put->getUserInfo());
- return;
+ );
+ file_put_contents($this->statusFile, 'fault|'.$put->getMessage()."/".$put->getUserInfo());
+ return;
}
}
} else {
$this->addLogItem("-E- ".date("Ymd-H:i:s")." startRestore - invalid archive format\n");
- file_put_contents($this->statusFile, 'fault|invalid archive format');
- return;
+ file_put_contents($this->statusFile, 'fault|invalid archive format');
+ return;
}
file_put_contents($this->statusFile, 'success');
// unlink($backupfile);
@@ -238,13 +238,13 @@ class Restore {
$playlists = scandir($this->tmpDir.'playlist/');
for ($i = 0; $i < count($audioclips); $i++) {
if (strpos($audioclips[$i],'xml')!==false)
- $r[] = array('file' => $this->tmpDir.'audioClip/'.$audioclips[$i],
+ $r[] = array('file' => $this->tmpDir.'audioClip/'.$audioclips[$i],
'type' => 'audioClip',
'id' => str_replace('.xml','',$audioclips[$i]));
}
for ($i = 0; $i < count($playlists); $i++) {
if (strpos($playlists[$i],'xml') !== false)
- $r[] = array('file' => $this->tmpDir.'playlist/'.$playlists[$i],
+ $r[] = array('file' => $this->tmpDir.'playlist/'.$playlists[$i],
'type' => 'playlist',
'id' => str_replace('.xml','',$playlists[$i]));
}
@@ -265,83 +265,83 @@ class Restore {
* @return mixed
* true if success or PEAR_error
*/
-// function addFileToStorage($file,$type,$gunid)
-// {
-// if ($this->loglevel=='debug') {
-// $this->addLogItem("-I- ".date("Ymd-H:i:s")." addFileToStorage - file:$file | type:$type | id:$gunid\n");
-// }
-// require_once("XmlParser.php");
-// $tree = XmlParser::parse($file);
-// $mediaFileLP = str_replace('.xml','',$file);
-// $mediaFileLP = ($type=='audioClip' && is_file($mediaFileLP))?$mediaFileLP:'';
-// $ex = $this->gb->existsFile($this->sessid,$gunid);
-// if (PEAR::isError($ex)) {
-// $this->addLogItem("-E- ".date("Ymd-H:i:s").
-// " addFileToStorage - existsFile($gunid) ".
-// "(".$ex->getMessage()."/".$ex->getUserInfo().")\n"
-// );
-// }
-// if (!PEAR::isError($ex) && $ex) { // file is exists in storage server
-// //replace it
-// $id = BasicStor::IdFromGunid($gunid);
-// $replace = $this->gb->replaceFile(
-// $id, # id int, virt.file's local id
-// $mediaFileLP, # mediaFileLP string, local path of media file
-// $file, # mdataFileLP string, local path of metadata file
-// $this->sessid); # sessid string, session id
-// if (PEAR::isError($replace)) {
-// $this->addLogItem("-E- ".date("Ymd-H:i:s").
-// " addFileToStorage - replaceFile Error ".
-// "(".$replace->getMessage()."/".$replace->getUserInfo().")\n"
-// );
-// file_put_contents($this->statusFile, 'fault|'.$replace->getMessage()."/".$replace->getUserInfo());
-// return $replace;
-// }
-// #$this->addLogItem("replace it \n");
-// } else {
-// // add as new
-// $name = $tree->children[0]->children[0]->content;
-// if (empty($name)) {
-// $name = $tree->attrs['title']->val;
-// }
-// if (empty($name)) {
-// $name = '???';
-// }
-// if ($this->loglevel=='debug') {
-// $this->addLogItem("-I- ".date("Ymd-H:i:s")." putFile\n".
-// "$name, $mediaFileLP, $file, {$this->sessid}, $gunid, $type \n"
-// );
-// }
-// $values = array(
-// "filename" => $name,
-// "filepath" => $mediaFileLP,
-// "metadata" => $file,
-// "gunid" => $gunid,
-// "filetype" => $type
-// );
-// $put = $this->gb->putFile($values, $this->sessid);
-// //$this->addLogItem("add as new \n");
-// if (PEAR::isError($put)) {
-// $this->addLogItem("-E- ".date("Ymd-H:i:s").
-// " addFileToStorage - putFile Error ".
-// "(".$put->getMessage()."/".$put->getUserInfo().")\n"
-// ."\n---\n".file_get_contents($file)."\n---\n"
-// );
-// file_put_contents($this->statusFile, 'fault|'.$put->getMessage()."/".$put->getUserInfo());
-// //$this->addLogItem("Error Object: ".print_r($put,true)."\n");
-// return $put;
-// }
-// }
-// $ac = StoredFile::RecallByGunid($gunid);
-// if (is_null($ac) || PEAR::isError($ac)) {
-// return $ac;
-// }
-// $res = $ac->setState('ready');
-// if (PEAR::isError($res)) {
-// return $res;
-// }
-// return true;
-// }
+ // function addFileToStorage($file,$type,$gunid)
+ // {
+ // if ($this->loglevel=='debug') {
+ // $this->addLogItem("-I- ".date("Ymd-H:i:s")." addFileToStorage - file:$file | type:$type | id:$gunid\n");
+ // }
+ // require_once("XmlParser.php");
+ // $tree = XmlParser::parse($file);
+ // $mediaFileLP = str_replace('.xml','',$file);
+ // $mediaFileLP = ($type=='audioClip' && is_file($mediaFileLP))?$mediaFileLP:'';
+ // $ex = $this->gb->existsFile($this->sessid,$gunid);
+ // if (PEAR::isError($ex)) {
+ // $this->addLogItem("-E- ".date("Ymd-H:i:s").
+ // " addFileToStorage - existsFile($gunid) ".
+ // "(".$ex->getMessage()."/".$ex->getUserInfo().")\n"
+ // );
+ // }
+ // if (!PEAR::isError($ex) && $ex) { // file is exists in storage server
+ // //replace it
+ // $id = BasicStor::IdFromGunid($gunid);
+ // $replace = $this->gb->replaceFile(
+ // $id, # id int, virt.file's local id
+ // $mediaFileLP, # mediaFileLP string, local path of media file
+ // $file, # mdataFileLP string, local path of metadata file
+ // $this->sessid); # sessid string, session id
+ // if (PEAR::isError($replace)) {
+ // $this->addLogItem("-E- ".date("Ymd-H:i:s").
+ // " addFileToStorage - replaceFile Error ".
+ // "(".$replace->getMessage()."/".$replace->getUserInfo().")\n"
+ // );
+ // file_put_contents($this->statusFile, 'fault|'.$replace->getMessage()."/".$replace->getUserInfo());
+ // return $replace;
+ // }
+ // #$this->addLogItem("replace it \n");
+ // } else {
+ // // add as new
+ // $name = $tree->children[0]->children[0]->content;
+ // if (empty($name)) {
+ // $name = $tree->attrs['title']->val;
+ // }
+ // if (empty($name)) {
+ // $name = '???';
+ // }
+ // if ($this->loglevel=='debug') {
+ // $this->addLogItem("-I- ".date("Ymd-H:i:s")." putFile\n".
+ // "$name, $mediaFileLP, $file, {$this->sessid}, $gunid, $type \n"
+ // );
+ // }
+ // $values = array(
+ // "filename" => $name,
+ // "filepath" => $mediaFileLP,
+ // "metadata" => $file,
+ // "gunid" => $gunid,
+ // "filetype" => $type
+ // );
+ // $put = $this->gb->putFile($values, $this->sessid);
+ // //$this->addLogItem("add as new \n");
+ // if (PEAR::isError($put)) {
+ // $this->addLogItem("-E- ".date("Ymd-H:i:s").
+ // " addFileToStorage - putFile Error ".
+ // "(".$put->getMessage()."/".$put->getUserInfo().")\n"
+ // ."\n---\n".file_get_contents($file)."\n---\n"
+ // );
+ // file_put_contents($this->statusFile, 'fault|'.$put->getMessage()."/".$put->getUserInfo());
+ // //$this->addLogItem("Error Object: ".print_r($put,true)."\n");
+ // return $put;
+ // }
+ // }
+ // $ac = StoredFile::RecallByGunid($gunid);
+ // if (is_null($ac) || PEAR::isError($ac)) {
+ // return $ac;
+ // }
+ // $res = $ac->setState('ready');
+ // if (PEAR::isError($res)) {
+ // return $res;
+ // }
+ // return true;
+ // }
/**
@@ -433,4 +433,4 @@ class Restore {
}
} // class Restore
-?>
+?>
diff --git a/backend/Schedule.php b/backend/Schedule.php
index 3defc158f..9953697f1 100644
--- a/backend/Schedule.php
+++ b/backend/Schedule.php
@@ -4,402 +4,407 @@ require_once("BasicStor.php");
class ScheduleGroup {
- private $groupId;
+ private $groupId;
- public function __construct($p_groupId = null) {
- $this->groupId = $p_groupId;
- }
+ public function __construct($p_groupId = null) {
+ $this->groupId = $p_groupId;
+ }
- /**
- * Convert a date to an ID by stripping out all characters
- * and padding with zeros.
- *
- * @param string $p_dateStr
- */
- public static function dateToId($p_dateStr) {
- $p_dateStr = str_replace(":", "", $p_dateStr);
- $p_dateStr = str_replace(" ", "", $p_dateStr);
- $p_dateStr = str_replace(".", "", $p_dateStr);
- $p_dateStr = str_replace("-", "", $p_dateStr);
- $p_dateStr = substr($p_dateStr, 0, 17);
- $p_dateStr = str_pad($p_dateStr, 17, "0");
- return $p_dateStr;
- }
+ /**
+ * Convert a date to an ID by stripping out all characters
+ * and padding with zeros.
+ *
+ * @param string $p_dateStr
+ */
+ public static function dateToId($p_dateStr) {
+ $p_dateStr = str_replace(":", "", $p_dateStr);
+ $p_dateStr = str_replace(" ", "", $p_dateStr);
+ $p_dateStr = str_replace(".", "", $p_dateStr);
+ $p_dateStr = str_replace("-", "", $p_dateStr);
+ $p_dateStr = substr($p_dateStr, 0, 17);
+ $p_dateStr = str_pad($p_dateStr, 17, "0");
+ return $p_dateStr;
+ }
- /**
- * Add the two times together, return the result.
- *
- * @param string $p_baseTime
- * Specified as YYYY-MM-DD HH:MM:SS
- *
- * @param string $p_addTime
- * Specified as HH:MM:SS.nnnnnn
- *
- * @return string
- * The end time, to the nearest second.
- */
-// protected function calculateEndTime($p_startTime, $p_trackTime) {
-// $p_trackTime = substr($p_startTime, 0, );
-// $start = new DateTime();
-// $interval = new DateInterval()
-//
-// }
+ /**
+ * Add the two times together, return the result.
+ *
+ * @param string $p_baseTime
+ * Specified as YYYY-MM-DD HH:MM:SS
+ *
+ * @param string $p_addTime
+ * Specified as HH:MM:SS.nnnnnn
+ *
+ * @return string
+ * The end time, to the nearest second.
+ */
+ // protected function calculateEndTime($p_startTime, $p_trackTime) {
+ // $p_trackTime = substr($p_startTime, 0, );
+ // $start = new DateTime();
+ // $interval = new DateInterval()
+ //
+ // }
- /**
- * Add a music clip or playlist to the schedule.
- *
- * @param $p_datetime
- * In the format YYYY-MM-DD HH:MM:SS.mmmmmm
- * @param $p_audioFileId
- * (optional, either this or $p_playlistId must be set) DB ID of the audio file
- * @param $p_playlistId
- * (optional, either this of $p_audioFileId must be set) DB ID of the playlist
- * @param $p_options
- * Does nothing at the moment.
- *
- * @return int|PEAR_Error
- * Return PEAR_Error if the item could not be added.
- * Error code 555 is a scheduling conflict.
- */
- public function add($p_datetime, $p_audioFileId = null, $p_playlistId = null, $p_options = null) {
- global $CC_CONFIG, $CC_DBC;
- if (!is_null($p_audioFileId)) {
- // Schedule a single audio track
+ /**
+ * Add a music clip or playlist to the schedule.
+ *
+ * @param $p_datetime
+ * In the format YYYY-MM-DD HH:MM:SS.mmmmmm
+ * @param $p_audioFileId
+ * (optional, either this or $p_playlistId must be set) DB ID of the audio file
+ * @param $p_playlistId
+ * (optional, either this of $p_audioFileId must be set) DB ID of the playlist
+ * @param $p_options
+ * Does nothing at the moment.
+ *
+ * @return int|PEAR_Error
+ * Return PEAR_Error if the item could not be added.
+ * Error code 555 is a scheduling conflict.
+ */
+ public function add($p_datetime, $p_audioFileId = null, $p_playlistId = null, $p_options = null) {
+ global $CC_CONFIG, $CC_DBC;
+ if (!is_null($p_audioFileId)) {
+ // Schedule a single audio track
- // Load existing track
- $track = StoredFile::Recall($p_audioFileId);
- if (is_null($track)) {
- return new PEAR_Error("Could not find audio track.");
- }
+ // Load existing track
+ $track = StoredFile::Recall($p_audioFileId);
+ if (is_null($track)) {
+ return new PEAR_Error("Could not find audio track.");
+ }
- // Check if there are any conflicts with existing entries
- $metadata = $track->getMetadata();
- $length = trim($metadata["length"]);
- if (empty($length)) {
- return new PEAR_Error("Length is empty.");
- }
- if (!Schedule::isScheduleEmptyInRange($p_datetime, $length)) {
- return new PEAR_Error("Schedule conflict.", 555);
- }
+ // Check if there are any conflicts with existing entries
+ $metadata = $track->getMetadata();
+ $length = trim($metadata["length"]);
+ if (empty($length)) {
+ return new PEAR_Error("Length is empty.");
+ }
+ if (!Schedule::isScheduleEmptyInRange($p_datetime, $length)) {
+ return new PEAR_Error("Schedule conflict.", 555);
+ }
- // Insert into the table
- $this->groupId = $CC_DBC->GetOne("SELECT nextval('schedule_group_id_seq')");
- $id = $this->dateToId($p_datetime);
- $sql = "INSERT INTO ".$CC_CONFIG["scheduleTable"]
- ." (id, playlist_id, starts, ends, clip_length, group_id, file_id)"
- ." VALUES ($id, 0, TIMESTAMP '$p_datetime', "
- ." (TIMESTAMP '$p_datetime' + INTERVAL '$length'),"
- ." '$length',"
- ." {$this->groupId}, $p_audioFileId)";
- $result = $CC_DBC->query($sql);
- if (PEAR::isError($result)) {
- var_dump($sql);
- return $result;
- }
- return $this->groupId;
+ // Insert into the table
+ $this->groupId = $CC_DBC->GetOne("SELECT nextval('schedule_group_id_seq')");
+ $id = $this->dateToId($p_datetime);
+ $sql = "INSERT INTO ".$CC_CONFIG["scheduleTable"]
+ ." (id, playlist_id, starts, ends, clip_length, group_id, file_id)"
+ ." VALUES ($id, 0, TIMESTAMP '$p_datetime', "
+ ." (TIMESTAMP '$p_datetime' + INTERVAL '$length'),"
+ ." '$length',"
+ ." {$this->groupId}, $p_audioFileId)";
+ $result = $CC_DBC->query($sql);
+ if (PEAR::isError($result)) {
+ var_dump($sql);
+ return $result;
+ }
+ return $this->groupId;
- } elseif (!is_null($p_playlistId)){
- // Schedule a whole playlist
+ } elseif (!is_null($p_playlistId)){
+ // Schedule a whole playlist
- // Load existing playlist
- $playlist = Playlist::Recall($p_playlistId);
- if (is_null($playlist)) {
- return new PEAR_Error("Could not find playlist.");
- }
+ // Load existing playlist
+ $playlist = Playlist::Recall($p_playlistId);
+ if (is_null($playlist)) {
+ return new PEAR_Error("Could not find playlist.");
+ }
- // Check if there are any conflicts with existing entries
- $length = trim($playlist->getLength());
- if (empty($length)) {
- return new PEAR_Error("Length is empty.");
- }
- if (!Schedule::isScheduleEmptyInRange($p_datetime, $length)) {
- return new PEAR_Error("Schedule conflict.", 555);
- }
+ // Check if there are any conflicts with existing entries
+ $length = trim($playlist->getLength());
+ var_dump($length);
+ if (empty($length)) {
+ return new PEAR_Error("Length is empty.");
+ }
+ if (!Schedule::isScheduleEmptyInRange($p_datetime, $length)) {
+ return new PEAR_Error("Schedule conflict.", 555);
+ }
- // Insert all items into the schedule
- $this->groupId = $CC_DBC->GetOne("SELECT nextval('schedule_group_id_seq')");
- $id = $this->dateToId($p_datetime);
- $itemStartTime = $p_datetime;
+ // Insert all items into the schedule
+ $this->groupId = $CC_DBC->GetOne("SELECT nextval('schedule_group_id_seq')");
+ $id = $this->dateToId($p_datetime);
+ $itemStartTime = $p_datetime;
- $plItems = $playlist->getContents();
- foreach ($plItems as $row) {
- $trackLength = $row["cliplength"];
- $sql = "INSERT INTO ".$CC_CONFIG["scheduleTable"]
- ." (id, playlist_id, starts, ends, group_id, file_id,"
- ." clip_length, cue_in, cue_out, fade_in, fade_out)"
- ." VALUES ($id, $p_playlistId, TIMESTAMP '$itemStartTime', "
- ." (TIMESTAMP '$itemStartTime' + INTERVAL '$trackLength'),"
- ." '{$this->groupId}', '{$row['file_id']}', '$trackLength', '{$row['cuein']}',"
- ." '{$row['cueout']}', '{$row['fadein']}','{$row['fadeout']}')";
- $result = $CC_DBC->query($sql);
- if (PEAR::isError($result)) {
- var_dump($sql);
- return $result;
+ $plItems = $playlist->getContents();
+ var_dump($plItems);
+ foreach ($plItems as $row) {
+ $trackLength = $row["cliplength"];
+ var_dump($trackLength);
+ $sql = "INSERT INTO ".$CC_CONFIG["scheduleTable"]
+ ." (id, playlist_id, starts, ends, group_id, file_id,"
+ ." clip_length, cue_in, cue_out, fade_in, fade_out)"
+ ." VALUES ($id, $p_playlistId, TIMESTAMP '$itemStartTime', "
+ ." (TIMESTAMP '$itemStartTime' + INTERVAL '$trackLength'),"
+ ." '{$this->groupId}', '{$row['file_id']}', '$trackLength', '{$row['cuein']}',"
+ ." '{$row['cueout']}', '{$row['fadein']}','{$row['fadeout']}')";
+ $result = $CC_DBC->query($sql);
+ if (PEAR::isError($result)) {
+ var_dump($sql);
+ return $result;
+ }
+ $itemStartTime = $CC_DBC->getOne("SELECT TIMESTAMP '$itemStartTime' + INTERVAL '$trackLength'");
+ $id = $this->dateToId($itemStartTime);
+ }
+ return $this->groupId;
}
- $itemStartTime = $CC_DBC->getOne("SELECT TIMESTAMP '$itemStartTime' + INTERVAL '$trackLength'");
- $id = $this->dateToId($itemStartTime);
- }
- return $this->groupId;
}
- }
- public function addAfter($p_groupId, $p_audioFileId) {
- global $CC_CONFIG, $CC_DBC;
- // Get the end time for the given entry
- $sql = "SELECT ends FROM ".$CC_CONFIG["scheduleTable"]
- ." WHERE group_id=$p_groupId";
- $startTime = $CC_DBC->GetOne($sql);
- return $this->add($startTime, $p_audioFileId);
- }
-
- public function update() {
-
- }
-
- /**
- * Remove the group from the schedule.
- * Note: does not check if it is in the past, you can remove anything.
- *
- * @return boolean
- * TRUE on success, false if there is no group ID defined.
- */
- public function remove() {
- global $CC_CONFIG, $CC_DBC;
- if (is_null($this->groupId) || !is_numeric($this->groupId)) {
- return false;
+ public function addAfter($p_groupId, $p_audioFileId) {
+ global $CC_CONFIG, $CC_DBC;
+ // Get the end time for the given entry
+ $sql = "SELECT ends FROM ".$CC_CONFIG["scheduleTable"]
+ ." WHERE group_id=$p_groupId";
+ $startTime = $CC_DBC->GetOne($sql);
+ return $this->add($startTime, $p_audioFileId);
}
- $sql = "DELETE FROM ".$CC_CONFIG["scheduleTable"]
- ." WHERE group_id = ".$this->groupId;
- return $CC_DBC->query($sql);
- }
+ public function update() {
- /**
- * Return the number of items in this group.
- * @return string
- */
- public function count() {
- global $CC_CONFIG, $CC_DBC;
- $sql = "SELECT COUNT(*) FROM {$CC_CONFIG['scheduleTable']}"
- ." WHERE group_id={$this->groupId}";
- return $CC_DBC->GetOne($sql);
- }
+ }
- /*
- * Return the list of items in this group as a 2D array.
- * @return array
- */
- public function getItems() {
- global $CC_CONFIG, $CC_DBC;
- $sql = "SELECT * FROM {$CC_CONFIG['scheduleTable']}"
- ." WHERE group_id={$this->groupId}";
- return $CC_DBC->GetAll($sql);
- }
+ /**
+ * Remove the group from the schedule.
+ * Note: does not check if it is in the past, you can remove anything.
+ *
+ * @return boolean
+ * TRUE on success, false if there is no group ID defined.
+ */
+ public function remove() {
+ global $CC_CONFIG, $CC_DBC;
+ if (is_null($this->groupId) || !is_numeric($this->groupId)) {
+ return false;
+ }
+ $sql = "DELETE FROM ".$CC_CONFIG["scheduleTable"]
+ ." WHERE group_id = ".$this->groupId;
- public function reschedule($toDateTime) {
- global $CC_CONFIG, $CC_DBC;
-// $sql = "UPDATE ".$CC_CONFIG["scheduleTable"]. " SET id=, starts=,ends="
- }
+ return $CC_DBC->query($sql);
+ }
+
+ /**
+ * Return the number of items in this group.
+ * @return string
+ */
+ public function count() {
+ global $CC_CONFIG, $CC_DBC;
+ $sql = "SELECT COUNT(*) FROM {$CC_CONFIG['scheduleTable']}"
+ ." WHERE group_id={$this->groupId}";
+ return $CC_DBC->GetOne($sql);
+ }
+
+ /*
+ * Return the list of items in this group as a 2D array.
+ * @return array
+ */
+ public function getItems() {
+ global $CC_CONFIG, $CC_DBC;
+ $sql = "SELECT * FROM {$CC_CONFIG['scheduleTable']}"
+ ." WHERE group_id={$this->groupId}";
+ return $CC_DBC->GetAll($sql);
+ }
+
+ public function reschedule($toDateTime) {
+ global $CC_CONFIG, $CC_DBC;
+ // $sql = "UPDATE ".$CC_CONFIG["scheduleTable"]. " SET id=, starts=,ends="
+ }
}
class Schedule {
- function __construct() {
+ function __construct() {
- }
-
- /**
- * Return true if there is nothing in the schedule for the given times.
- *
- * @param string $p_datetime
- * @param string $p_length
- *
- * @return boolean|PEAR_Error
- */
- public static function isScheduleEmptyInRange($p_datetime, $p_length) {
- global $CC_CONFIG, $CC_DBC;
- if (empty($p_length)) {
- return new PEAR_Error("Schedule::isSchedulerEmptyInRange: param p_length is empty.");
}
- $sql = "SELECT COUNT(*) FROM ".$CC_CONFIG["scheduleTable"]
- ." WHERE (starts >= '$p_datetime') "
- ." AND (ends <= (TIMESTAMP '$p_datetime' + INTERVAL '$p_length'))";
- //$_SESSION["debug"] = $sql;
- $count = $CC_DBC->GetOne($sql);
- return ($count == '0');
- }
-// public function onAddTrackToPlaylist($playlistId, $audioTrackId) {
-//
-// }
-//
-// public function onRemoveTrackFromPlaylist($playlistId, $audioTrackId) {
-//
-// }
-
- /**
- * Return TRUE if file is going to be played in the future.
- *
- * @param string $p_fileId
- */
- public function IsFileScheduledInTheFuture($p_fileId)
- {
- global $CC_CONFIG, $CC_DBC;
- $sql = "SELECT COUNT(*) FROM ".$CC_CONFIG["scheduleTable"]
- ." WHERE file_id = {$p_fileId} AND starts > NOW()";
- $count = $CC_DBC->GetOne($sql);
- if (is_numeric($count) && ($count != '0')) {
- return TRUE;
- } else {
- return FALSE;
+ /**
+ * Return true if there is nothing in the schedule for the given times.
+ *
+ * @param string $p_datetime
+ * @param string $p_length
+ *
+ * @return boolean|PEAR_Error
+ */
+ public static function isScheduleEmptyInRange($p_datetime, $p_length) {
+ global $CC_CONFIG, $CC_DBC;
+ if (empty($p_length)) {
+ return new PEAR_Error("Schedule::isSchedulerEmptyInRange: param p_length is empty.");
+ }
+ $sql = "SELECT COUNT(*) FROM ".$CC_CONFIG["scheduleTable"]
+ ." WHERE (starts >= '$p_datetime') "
+ ." AND (ends <= (TIMESTAMP '$p_datetime' + INTERVAL '$p_length'))";
+ //$_SESSION["debug"] = $sql;
+ var_dump($sql);
+ $count = $CC_DBC->GetOne($sql);
+ var_dump($count);
+ return ($count == '0');
+ }
+
+ // public function onAddTrackToPlaylist($playlistId, $audioTrackId) {
+ //
+ // }
+ //
+ // public function onRemoveTrackFromPlaylist($playlistId, $audioTrackId) {
+ //
+ // }
+
+ /**
+ * Return TRUE if file is going to be played in the future.
+ *
+ * @param string $p_fileId
+ */
+ public function IsFileScheduledInTheFuture($p_fileId)
+ {
+ global $CC_CONFIG, $CC_DBC;
+ $sql = "SELECT COUNT(*) FROM ".$CC_CONFIG["scheduleTable"]
+ ." WHERE file_id = {$p_fileId} AND starts > NOW()";
+ $count = $CC_DBC->GetOne($sql);
+ if (is_numeric($count) && ($count != '0')) {
+ return TRUE;
+ } else {
+ return FALSE;
+ }
}
- }
- /**
- * Returns array indexed numberically of:
- * "playlistId"/"playlist_id" (aliases to the same thing)
- * "start"/"starts" (aliases to the same thing) as YYYY-MM-DD HH:MM:SS.nnnnnn
- * "end"/"ends" (aliases to the same thing) as YYYY-MM-DD HH:MM:SS.nnnnnn
- * "group_id"/"id" (aliases to the same thing)
- * "clip_length" (for playlists only, this is the length of the entire playlist)
- * "name" (playlist only)
- * "creator" (playlist only)
- * "file_id" (audioclip only)
- * "count" (number of items in the playlist, always 1 for audioclips.
- * Note that playlists with one item will also have count = 1.
- *
- * @param string $p_fromDateTime
- * In the format YYYY-MM-DD HH:MM:SS.nnnnnn
- * @param string $p_toDateTime
- * In the format YYYY-MM-DD HH:MM:SS.nnnnnn
- * @param boolean $p_playlistsOnly
- * Retreive playlists as a single item.
- * @return array
- * Returns empty array if nothing found
- */
- public static function GetItems($p_fromDateTime, $p_toDateTime, $p_playlistsOnly = true) {
- global $CC_CONFIG, $CC_DBC;
- $rows = array();
- if (!$p_playlistsOnly) {
- $sql = "SELECT * FROM ".$CC_CONFIG["scheduleTable"]
+ /**
+ * Returns array indexed numberically of:
+ * "playlistId"/"playlist_id" (aliases to the same thing)
+ * "start"/"starts" (aliases to the same thing) as YYYY-MM-DD HH:MM:SS.nnnnnn
+ * "end"/"ends" (aliases to the same thing) as YYYY-MM-DD HH:MM:SS.nnnnnn
+ * "group_id"/"id" (aliases to the same thing)
+ * "clip_length" (for playlists only, this is the length of the entire playlist)
+ * "name" (playlist only)
+ * "creator" (playlist only)
+ * "file_id" (audioclip only)
+ * "count" (number of items in the playlist, always 1 for audioclips.
+ * Note that playlists with one item will also have count = 1.
+ *
+ * @param string $p_fromDateTime
+ * In the format YYYY-MM-DD HH:MM:SS.nnnnnn
+ * @param string $p_toDateTime
+ * In the format YYYY-MM-DD HH:MM:SS.nnnnnn
+ * @param boolean $p_playlistsOnly
+ * Retreive playlists as a single item.
+ * @return array
+ * Returns empty array if nothing found
+ */
+ public static function GetItems($p_fromDateTime, $p_toDateTime, $p_playlistsOnly = true) {
+ global $CC_CONFIG, $CC_DBC;
+ $rows = array();
+ if (!$p_playlistsOnly) {
+ $sql = "SELECT * FROM ".$CC_CONFIG["scheduleTable"]
." WHERE (starts >= TIMESTAMP '$p_fromDateTime') "
." AND (ends <= TIMESTAMP '$p_toDateTime')";
- $rows = $CC_DBC->GetAll($sql);
- foreach ($rows as &$row) {
- $row["count"] = "1";
- $row["playlistId"] = $row["playlist_id"];
- $row["start"] = $row["starts"];
- $row["end"] = $row["ends"];
- $row["id"] = $row["group_id"];
- }
- } else {
- $sql = "SELECT MIN(name) AS name, MIN(creator) AS creator, group_id, "
- ." SUM(clip_length) AS clip_length,"
- ." MIN(file_id) AS file_id, COUNT(*) as count,"
- ." MIN(playlist_id) AS playlist_id, MIN(starts) AS starts, MAX(ends) AS ends"
- ." FROM ".$CC_CONFIG["scheduleTable"]
- ." LEFT JOIN ".$CC_CONFIG["playListTable"]." ON playlist_id = ".$CC_CONFIG["playListTable"].".id"
- ." WHERE (starts >= TIMESTAMP '$p_fromDateTime') AND (ends <= TIMESTAMP '$p_toDateTime')"
- ." GROUP BY group_id"
- ." ORDER BY starts";
- //var_dump($sql);
- $rows = $CC_DBC->GetAll($sql);
- if (!PEAR::isError($rows)) {
- foreach ($rows as &$row) {
- $row["playlistId"] = $row["playlist_id"];
- $row["start"] = $row["starts"];
- $row["end"] = $row["ends"];
- $row["id"] = $row["group_id"];
+ $rows = $CC_DBC->GetAll($sql);
+ foreach ($rows as &$row) {
+ $row["count"] = "1";
+ $row["playlistId"] = $row["playlist_id"];
+ $row["start"] = $row["starts"];
+ $row["end"] = $row["ends"];
+ $row["id"] = $row["group_id"];
+ }
+ } else {
+ $sql = "SELECT MIN(name) AS name, MIN(creator) AS creator, group_id, "
+ ." SUM(clip_length) AS clip_length,"
+ ." MIN(file_id) AS file_id, COUNT(*) as count,"
+ ." MIN(playlist_id) AS playlist_id, MIN(starts) AS starts, MAX(ends) AS ends"
+ ." FROM ".$CC_CONFIG["scheduleTable"]
+ ." LEFT JOIN ".$CC_CONFIG["playListTable"]." ON playlist_id = ".$CC_CONFIG["playListTable"].".id"
+ ." WHERE (starts >= TIMESTAMP '$p_fromDateTime') AND (ends <= TIMESTAMP '$p_toDateTime')"
+ ." GROUP BY group_id"
+ ." ORDER BY starts";
+ //var_dump($sql);
+ $rows = $CC_DBC->GetAll($sql);
+ if (!PEAR::isError($rows)) {
+ foreach ($rows as &$row) {
+ $row["playlistId"] = $row["playlist_id"];
+ $row["start"] = $row["starts"];
+ $row["end"] = $row["ends"];
+ $row["id"] = $row["group_id"];
+ }
+ }
}
- }
+ return $rows;
}
- return $rows;
- }
- public function getSchedulerTime() {
+ public function getSchedulerTime() {
- }
+ }
- public function getCurrentlyPlaying() {
+ public function getCurrentlyPlaying() {
- }
+ }
- public function getNextItem($nextCount = 1) {
+ public function getNextItem($nextCount = 1) {
- }
+ }
- public function getStatus() {
+ public function getStatus() {
- }
+ }
- private static function CcTimeToPypoTime($p_time) {
- $p_time = substr($p_time, 0, 19);
- $p_time = str_replace(" ", "-", $p_time);
- $p_time = str_replace(":", "-", $p_time);
- return $p_time;
- }
+ private static function CcTimeToPypoTime($p_time) {
+ $p_time = substr($p_time, 0, 19);
+ $p_time = str_replace(" ", "-", $p_time);
+ $p_time = str_replace(":", "-", $p_time);
+ return $p_time;
+ }
- private static function PypoTimeToCcTime($p_time) {
- $t = explode("-", $p_time);
- return $t[0]."-".$t[1]."-".$t[2]." ".$t[3].":".$t[4].":00";
- }
+ private static function PypoTimeToCcTime($p_time) {
+ $t = explode("-", $p_time);
+ return $t[0]."-".$t[1]."-".$t[2]." ".$t[3].":".$t[4].":00";
+ }
- /**
- * Export the schedule in json formatted for pypo (the liquidsoap scheduler)
- *
- * @param string $range
- * In the format "YYYY-MM-DD HH:mm:ss"
- * @param string $source
- * In the format "YYYY-MM-DD HH:mm:ss"
- */
- public static function ExportRangeAsJson($p_fromDateTime, $p_toDateTime)
- {
- global $CC_CONFIG, $CC_DBC;
- $range_start = Schedule::PypoTimeToCcTime($p_fromDateTime);
- $range_end = Schedule::PypoTimeToCcTime($p_toDateTime);
- $range_dt = array('start' => $range_start, 'end' => $range_end);
- //var_dump($range_dt);
+ /**
+ * Export the schedule in json formatted for pypo (the liquidsoap scheduler)
+ *
+ * @param string $range
+ * In the format "YYYY-MM-DD HH:mm:ss"
+ * @param string $source
+ * In the format "YYYY-MM-DD HH:mm:ss"
+ */
+ public static function ExportRangeAsJson($p_fromDateTime, $p_toDateTime)
+ {
+ global $CC_CONFIG, $CC_DBC;
+ $range_start = Schedule::PypoTimeToCcTime($p_fromDateTime);
+ $range_end = Schedule::PypoTimeToCcTime($p_toDateTime);
+ $range_dt = array('start' => $range_start, 'end' => $range_end);
+ //var_dump($range_dt);
- // Scheduler wants everything in a playlist
- $data = Schedule::GetItems($range_start, $range_end, true);
- //echo "";var_dump($data);
- $playlists = array();
+ // Scheduler wants everything in a playlist
+ $data = Schedule::GetItems($range_start, $range_end, true);
+ //echo "";var_dump($data);
+ $playlists = array();
- if (is_array($data) && count($data) > 0)
- {
- foreach ($data as $dx)
- {
- // Is this the first item in the playlist?
- $start = $dx['start'];
- // chop off subseconds
- $start = substr($start, 0, 19);
+ if (is_array($data) && count($data) > 0)
+ {
+ foreach ($data as $dx)
+ {
+ // Is this the first item in the playlist?
+ $start = $dx['start'];
+ // chop off subseconds
+ $start = substr($start, 0, 19);
- // Start time is the array key, needs to be in the format "YYYY-MM-DD-HH-mm-ss"
- $pkey = Schedule::CcTimeToPypoTime($start);
- $timestamp = strtotime($start);
- $playlists[$pkey]['source'] = "PLAYLIST";
- $playlists[$pkey]['x_ident'] = $dx["playlist_id"];
- $playlists[$pkey]['subtype'] = '1'; // Just needs to be between 1 and 4 inclusive
- $playlists[$pkey]['timestamp'] = $timestamp;
- $playlists[$pkey]['duration'] = $dx['clip_length'];
- $playlists[$pkey]['played'] = '0';
- $playlists[$pkey]['schedule_id'] = $dx['group_id'];
- }
- }
+ // Start time is the array key, needs to be in the format "YYYY-MM-DD-HH-mm-ss"
+ $pkey = Schedule::CcTimeToPypoTime($start);
+ $timestamp = strtotime($start);
+ $playlists[$pkey]['source'] = "PLAYLIST";
+ $playlists[$pkey]['x_ident'] = $dx["playlist_id"];
+ $playlists[$pkey]['subtype'] = '1'; // Just needs to be between 1 and 4 inclusive
+ $playlists[$pkey]['timestamp'] = $timestamp;
+ $playlists[$pkey]['duration'] = $dx['clip_length'];
+ $playlists[$pkey]['played'] = '0';
+ $playlists[$pkey]['schedule_id'] = $dx['group_id'];
+ }
+ }
- foreach ($playlists as &$playlist)
- {
- $scheduleGroup = new ScheduleGroup($playlist["schedule_id"]);
- $items = $scheduleGroup->getItems();
- $medias = array();
- $playlist['subtype'] = '1';
- foreach ($items as $item)
- {
- $storedFile = StoredFile::Recall($item["file_id"]);
- $uri = $storedFile->getFileUrl();
- $medias[] = array(
+ foreach ($playlists as &$playlist)
+ {
+ $scheduleGroup = new ScheduleGroup($playlist["schedule_id"]);
+ $items = $scheduleGroup->getItems();
+ $medias = array();
+ $playlist['subtype'] = '1';
+ foreach ($items as $item)
+ {
+ $storedFile = StoredFile::Recall($item["file_id"]);
+ $uri = $storedFile->getFileUrl();
+ $medias[] = array(
'id' => $storedFile->getGunid(), //$item["file_id"],
'uri' => $uri,
'fade_in' => $item["fade_in"],
@@ -407,18 +412,18 @@ class Schedule {
'fade_cross' => 0,
'cue_in' => $item["cue_in"],
'cue_out' => $item["cue_out"],
- );
- }
- $playlist['medias'] = $medias;
- }
+ );
+ }
+ $playlist['medias'] = $medias;
+ }
- $result = array();
- $result['status'] = array('range' => $range_dt, 'version' => 0.2);
- $result['playlists'] = $playlists;
- $result['check'] = 1;
+ $result = array();
+ $result['status'] = array('range' => $range_dt, 'version' => 0.2);
+ $result['playlists'] = $playlists;
+ $result['check'] = 1;
- print json_encode($result);
- }
+ print json_encode($result);
+ }
}
diff --git a/backend/SmilPlaylist.php b/backend/SmilPlaylist.php
index dc4ca7f78..739667dc8 100644
--- a/backend/SmilPlaylist.php
+++ b/backend/SmilPlaylist.php
@@ -58,24 +58,24 @@ class SmilPlaylist {
}
$lspl = SmilPlaylist::convert2lspl($gb, $path, $gunids, $parr);
if (PEAR::isError($lspl)) {
- return $lspl;
+ return $lspl;
}
require_once("Playlist.php");
$pl =& Playlist::create($gb, $plid, "imported_SMIL");
if (PEAR::isError($pl)) {
- return $pl;
+ return $pl;
}
$r = $pl->lock($gb, $subjid);
if (PEAR::isError($r)) {
- return $r;
+ return $r;
}
$r = $pl->setMetadata($lspl, 'string', 'playlist');
if (PEAR::isError($r)) {
- return $r;
+ return $r;
}
$r = $pl->unlock($gb);
if (PEAR::isError($r)) {
- return $r;
+ return $r;
}
return $pl;
}
@@ -99,7 +99,7 @@ class SmilPlaylist {
extract($parr);
$tree = SmilPlaylist::parse($data);
if (PEAR::isError($tree)) {
- return $tree;
+ return $tree;
}
if ($tree->name != 'smil') {
return PEAR::raiseError("SmilPlaylist::parse: smil tag expected");
@@ -107,11 +107,11 @@ class SmilPlaylist {
if (isset($tree->children[1])) {
return PEAR::raiseError(sprintf(
"SmilPlaylist::parse: unexpected tag %s in tag smil",
- $tree->children[1]->name
+ $tree->children[1]->name
));
}
$res = SmilPlaylistBodyElement::convert2lspl(
- $gb, $tree->children[0], &$gunids, $parr);
+ $gb, $tree->children[0], &$gunids, $parr);
return $res;
}
@@ -136,13 +136,13 @@ class SmilPlaylistBodyElement {
if (isset($tree->children[1])) {
return PEAR::raiseError(sprintf(
"SmilPlaylist::parse: unexpected tag %s in tag body",
- $tree->children[1]->name
+ $tree->children[1]->name
));
}
$res = SmilPlaylistParElement::convert2lspl(
- $gb, $tree->children[0], &$gunids, $parr, $ind2);
+ $gb, $tree->children[0], &$gunids, $parr, $ind2);
if (PEAR::isError($res)) {
- return $res;
+ return $res;
}
$title = basename($rPath);
$playlength = '0';
@@ -165,7 +165,7 @@ class SmilPlaylistBodyElement {
*/
class SmilPlaylistParElement {
- public static function convert2lspl(&$gb, &$tree, &$gunids, $parr, $ind='')
+ public static function convert2lspl(&$gb, &$tree, &$gunids, $parr, $ind='')
{
extract($parr);
if ($tree->name != 'par') {
@@ -176,7 +176,7 @@ class SmilPlaylistParElement {
$ch =& $tree->children[$i];
$r = SmilPlaylistAudioElement::convert2lspl($gb, $ch, &$gunids, $parr, $ind.INDCH);
if (PEAR::isError($r)) {
- return $r;
+ return $r;
}
$res .= $r;
}
@@ -204,7 +204,7 @@ class SmilPlaylistAudioElement {
if (isset($tree->children[2])) {
return PEAR::raiseError(sprintf(
"SmilPlaylist::parse: unexpected tag %s in tag audio",
- $tree->children[2]->name
+ $tree->children[2]->name
));
}
$res = ''; $fadeIn = 0; $fadeOut = 0;
@@ -212,7 +212,7 @@ class SmilPlaylistAudioElement {
$ch =& $tree->children[$i];
$r = SmilPlaylistAnimateElement::convert2lspl($gb, $ch, &$gunids, $parr, $ind2);
if (PEAR::isError($r)) {
- return $r;
+ return $r;
}
switch ($r['type']) {
case "fadeIn": $fadeIn = $r['val']; break;
@@ -225,7 +225,7 @@ class SmilPlaylistAudioElement {
$fadeOut = Playlist::secondsToPlaylistTime($fadeOut);
$fInfo = "$ind2\n";
} else {
- $fInfo = '';
+ $fInfo = '';
}
$plElGunid = StoredFile::CreateGunid();
$acGunid = $gunid;
@@ -238,19 +238,19 @@ class SmilPlaylistAudioElement {
case "m3u":
$type = 'playlist';
$acId = $gb->bsImportPlaylistRaw($gunid,
- $aPath, $uri, $ext, $gunids, $subjid);
+ $aPath, $uri, $ext, $gunids, $subjid);
if (PEAR::isError($acId)) {
- return $r;
+ return $r;
}
- //break;
+ //break;
default:
$ac = StoredFile::RecallByGunid($gunid);
if (is_null($ac) || PEAR::isError($ac)) {
- return $ac;
+ return $ac;
}
$r = $ac->md->getMetadataElement('dcterms:extent');
if (PEAR::isError($r)) {
- return $r;
+ return $r;
}
$playlength = $r[0]['value'];
}
@@ -263,7 +263,7 @@ class SmilPlaylistAudioElement {
$clipLength = Playlist::secondsToPlaylistTime($tree->attrs['clipLength']->val);
$res = "$ind\n".
"$ind2<$type id=\"$acGunid\" playlength=\"$playlength\" title=\"$title\"/>\n".
- $fInfo.
+ $fInfo.
"$ind\n";
return $res;
}
@@ -278,35 +278,35 @@ class SmilPlaylistAudioElement {
*/
class SmilPlaylistAnimateElement {
- public static function convert2lspl(&$gb, &$tree, &$gunids, $parr, $ind='')
- {
+ public static function convert2lspl(&$gb, &$tree, &$gunids, $parr, $ind='')
+ {
extract($parr);
if ($tree->name != 'animate') {
return PEAR::raiseError("SmilPlaylist::parse: animate tag expected");
}
if ($tree->attrs['attributeName']->val == 'soundLevel' &&
- $tree->attrs['from']->val == '0%' &&
- $tree->attrs['to']->val == '100%' &&
- $tree->attrs['calcMode']->val == 'linear' &&
- $tree->attrs['fill']->val == 'freeze' &&
- $tree->attrs['begin']->val == '0s' &&
- preg_match("|^([0-9.]+)s$|", $tree->attrs['end']->val, $va)
+ $tree->attrs['from']->val == '0%' &&
+ $tree->attrs['to']->val == '100%' &&
+ $tree->attrs['calcMode']->val == 'linear' &&
+ $tree->attrs['fill']->val == 'freeze' &&
+ $tree->attrs['begin']->val == '0s' &&
+ preg_match("|^([0-9.]+)s$|", $tree->attrs['end']->val, $va)
) {
return array('type'=>'fadeIn', 'val'=>intval($va[1]));
}
if ($tree->attrs['attributeName']->val == 'soundLevel' &&
- $tree->attrs['from']->val == '100%' &&
- $tree->attrs['to']->val == '0%' &&
- $tree->attrs['calcMode']->val == 'linear' &&
- $tree->attrs['fill']->val == 'freeze' &&
- preg_match("|^([0-9.]+)s$|", $tree->attrs['begin']->val, $vaBegin) &&
- preg_match("|^([0-9.]+)s$|", $tree->attrs['end']->val, $vaEnd)
+ $tree->attrs['from']->val == '100%' &&
+ $tree->attrs['to']->val == '0%' &&
+ $tree->attrs['calcMode']->val == 'linear' &&
+ $tree->attrs['fill']->val == 'freeze' &&
+ preg_match("|^([0-9.]+)s$|", $tree->attrs['begin']->val, $vaBegin) &&
+ preg_match("|^([0-9.]+)s$|", $tree->attrs['end']->val, $vaEnd)
) {
return array('type'=>'fadeOut', 'val'=>($vaEnd[1] - $vaBegin[1]));
}
return PEAR::raiseError(
"SmilPlaylistAnimateElement::convert2lspl: animate parameters too general"
- );
+ );
}
} // class SmilPlaylistAnimateElement
diff --git a/backend/StoredFile.php b/backend/StoredFile.php
index a1c65dcd1..fdd18fc80 100644
--- a/backend/StoredFile.php
+++ b/backend/StoredFile.php
@@ -7,18 +7,18 @@ require_once("Schedule.php");
$g_metadata_xml_to_db_mapping = array(
"dc:format" => "format",
"ls:bitrate" => "bit_rate",
- "ls:samplerate" => "sample_rate",
+ "ls:samplerate" => "sample_rate",
"dcterms:extent" => "length",
- "dc:title" => "track_title",
- "dc:description" => "comments",
- "dc:type" => "genre",
- "dc:creator" => "artist_name",
+ "dc:title" => "track_title",
+ "dc:description" => "comments",
+ "dc:type" => "genre",
+ "dc:creator" => "artist_name",
"dc:source" => "album_title",
- "ls:channels" => "channels",
- "ls:filename" => "name",
- "ls:year" => "year",
- "ls:url" => "url",
- "ls:track_num" => "track_number",
+ "ls:channels" => "channels",
+ "ls:filename" => "name",
+ "ls:year" => "year",
+ "ls:url" => "url",
+ "ls:track_num" => "track_number",
"ls:mood" => "mood",
"ls:bpm" => "bpm",
"ls:disc_num" => "disc_number",
@@ -146,118 +146,118 @@ function camp_get_audio_metadata($p_filename, $p_testonly = false)
$getID3 = new getID3();
$infoFromFile = $getID3->analyze($p_filename);
if (PEAR::isError($infoFromFile)) {
- return $infoFromFile;
+ return $infoFromFile;
}
if (isset($infoFromFile['error'])) {
- return new PEAR_Error(array_pop($infoFromFile['error']));
+ return new PEAR_Error(array_pop($infoFromFile['error']));
}
if (!$infoFromFile['bitrate']) {
- return new PEAR_Error("File given is not an audio file.");
+ return new PEAR_Error("File given is not an audio file.");
}
if ($p_testonly) {
- print_r($infoFromFile);
+ print_r($infoFromFile);
}
- $titleKey = 'dc:title';
- $flds = array(
- 'dc:format' => array(
- array('path'=>"['mime_type']", 'ignoreEnc'=>TRUE),
- ),
- 'ls:bitrate' => array(
- array('path'=>"['bitrate']", 'ignoreEnc'=>TRUE),
- array('path'=>"['audio']['bitrate']", 'ignoreEnc'=>TRUE),
- ),
- 'ls:samplerate' => array(
- array('path'=>"['audio']['sample_rate']", 'ignoreEnc'=>TRUE),
- ),
- 'ls:encoder' => array(
- array('path'=>"['audio']['codec']", 'ignoreEnc'=>TRUE),
- ),
- 'dcterms:extent'=> array(
- array('path'=>"['playtime_seconds']", 'ignoreEnc'=>TRUE),
- ),
- 'ls:composer'=> array(
- array('path'=>"['id3v2']['comments']['composer']", 'dataPath'=>"[0]", 'ignoreEnc'=>TRUE),
- array('path'=>"['id3v2']['TCOM'][0]", 'dataPath'=>"['data']", 'encPath'=>"['encoding']"),
- array('path'=>"['tags']['id3v2']['composer']", 'dataPath'=>"[0]", 'ignoreEnc'=>TRUE),
- array('path'=>"['ogg']['comments']['composer']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
- array('path'=>"['tags']['vorbiscomment']['composer']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
- ),
- 'dc:description'=> array(
- array('path'=>"['id3v1']['comments']['comment']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
- array('path'=>"['id3v2']['comments']['comments']", 'dataPath'=>"[0]", 'ignoreEnc'=>TRUE),
- array('path'=>"['id3v2']['COMM'][0]", 'dataPath'=>"['data']", 'encPath'=>"['encoding']"),
- array('path'=>"['tags']['id3v2']['comments']", 'dataPath'=>"[0]", 'ignoreEnc'=>TRUE),
- array('path'=>"['ogg']['comments']['comment']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
- array('path'=>"['tags']['vorbiscomment']['comment']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
- ),
- 'dc:type'=> array(
- array('path'=>"['id3v1']", 'dataPath'=>"['genre']", 'encPath'=>"['encoding']"),
- array('path'=>"['id3v2']['comments']['content_type']", 'dataPath'=>"[0]", 'ignoreEnc'=>TRUE),
- array('path'=>"['id3v2']['TCON'][0]", 'dataPath'=>"['data']", 'encPath'=>"['encoding']"),
- array('path'=>"['ogg']['comments']['genre']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
- array('path'=>"['tags']['vorbiscomment']['genre']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
- ),
- 'dc:title' => array(
- array('path'=>"['id3v2']['comments']['title']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
- array('path'=>"['id3v2']['TIT2'][0]", 'dataPath'=>"['data']", 'encPath'=>"['encoding']"),
- array('path'=>"['id3v2']['TT2'][0]", 'dataPath'=>"['data']", 'encPath'=>"['encoding']"),
- array('path'=>"['id3v1']", 'dataPath'=>"['title']", 'encPath'=>"['encoding']"),
- array('path'=>"['ogg']['comments']['title']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
- array('path'=>"['tags']['vorbiscomment']['title']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
- ),
- 'dc:creator' => array(
- array('path'=>"['id3v2']['comments']['artist']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
- array('path'=>"['id3v2']['TPE1'][0]", 'dataPath'=>"['data']", 'encPath'=>"['encoding']"),
- array('path'=>"['id3v2']['TP1'][0]", 'dataPath'=>"['data']", 'encPath'=>"['encoding']"),
- array('path'=>"['id3v1']", 'dataPath'=>"['artist']", 'encPath'=>"['encoding']"),
- array('path'=>"['ogg']['comments']['artist']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
- array('path'=>"['tags']['vorbiscomment']['artist']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
- ),
- 'dc:source' => array(
- array('path'=>"['id3v2']['comments']['album']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
- array('path'=>"['id3v2']['TALB'][0]", 'dataPath'=>"['data']", 'encPath'=>"['encoding']"),
- array('path'=>"['id3v2']['TAL'][0]", 'dataPath'=>"['data']", 'encPath'=>"['encoding']"),
- array('path'=>"['ogg']['comments']['album']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
- array('path'=>"['tags']['vorbiscomment']['album']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
- ),
- 'ls:encoded_by' => array(
- array('path'=>"['id3v2']['TENC'][0]", 'dataPath'=>"['data']", 'encPath'=>"['encoding']"),
- array('path'=>"['id3v2']['TEN'][0]", 'dataPath'=>"['data']", 'encPath'=>"['encoding']"),
- array('path'=>"['ogg']['comments']['encoded-by']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
- array('path'=>"['tags']['vorbiscomment']['encoded-by']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
- ),
- 'ls:track_num' => array(
- array('path'=>"['id3v2']['TRCK'][0]", 'dataPath'=>"['data']", 'encPath'=>"['encoding']"),
- array('path'=>"['id3v2']['TRK'][0]", 'dataPath'=>"['data']", 'encPath'=>"['encoding']"),
- array('path'=>"['ogg']['comments']['tracknumber']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
- array('path'=>"['tags']['vorbiscomment']['tracknumber']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
- ),
-// 'ls:genre' => array(
-// array('path'=>"['id3v1']", 'dataPath'=>"['genre']", 'encPath'=>"['encoding']"),
-// array('path'=>"['id3v2']['TCON'][0]", 'dataPath'=>"['data']", 'encPath'=>"['encoding']"),
-// array('path'=>"['id3v2']['comments']['content_type']", 'dataPath'=>"[0]", 'ignoreEnc'=>TRUE),
-// array('path'=>"['ogg']['comments']['genre']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
-// array('path'=>"['tags']['vorbiscomment']['genre']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
-// ),
- 'ls:channels' => array(
- array('path'=>"['audio']['channels']", 'ignoreEnc'=>TRUE),
- ),
- 'ls:year' => array(
- array('path'=>"['comments']['date']"),
- array('path'=>"['ogg']['comments']['date']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
- array('path'=>"['tags']['vorbiscomment']['date']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
- ),
- 'ls:filename' => array(
- array('path'=>"['filename']"),
- ),
- );
+ $titleKey = 'dc:title';
+ $flds = array(
+ 'dc:format' => array(
+ array('path'=>"['mime_type']", 'ignoreEnc'=>TRUE),
+ ),
+ 'ls:bitrate' => array(
+ array('path'=>"['bitrate']", 'ignoreEnc'=>TRUE),
+ array('path'=>"['audio']['bitrate']", 'ignoreEnc'=>TRUE),
+ ),
+ 'ls:samplerate' => array(
+ array('path'=>"['audio']['sample_rate']", 'ignoreEnc'=>TRUE),
+ ),
+ 'ls:encoder' => array(
+ array('path'=>"['audio']['codec']", 'ignoreEnc'=>TRUE),
+ ),
+ 'dcterms:extent'=> array(
+ array('path'=>"['playtime_seconds']", 'ignoreEnc'=>TRUE),
+ ),
+ 'ls:composer'=> array(
+ array('path'=>"['id3v2']['comments']['composer']", 'dataPath'=>"[0]", 'ignoreEnc'=>TRUE),
+ array('path'=>"['id3v2']['TCOM'][0]", 'dataPath'=>"['data']", 'encPath'=>"['encoding']"),
+ array('path'=>"['tags']['id3v2']['composer']", 'dataPath'=>"[0]", 'ignoreEnc'=>TRUE),
+ array('path'=>"['ogg']['comments']['composer']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
+ array('path'=>"['tags']['vorbiscomment']['composer']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
+ ),
+ 'dc:description'=> array(
+ array('path'=>"['id3v1']['comments']['comment']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
+ array('path'=>"['id3v2']['comments']['comments']", 'dataPath'=>"[0]", 'ignoreEnc'=>TRUE),
+ array('path'=>"['id3v2']['COMM'][0]", 'dataPath'=>"['data']", 'encPath'=>"['encoding']"),
+ array('path'=>"['tags']['id3v2']['comments']", 'dataPath'=>"[0]", 'ignoreEnc'=>TRUE),
+ array('path'=>"['ogg']['comments']['comment']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
+ array('path'=>"['tags']['vorbiscomment']['comment']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
+ ),
+ 'dc:type'=> array(
+ array('path'=>"['id3v1']", 'dataPath'=>"['genre']", 'encPath'=>"['encoding']"),
+ array('path'=>"['id3v2']['comments']['content_type']", 'dataPath'=>"[0]", 'ignoreEnc'=>TRUE),
+ array('path'=>"['id3v2']['TCON'][0]", 'dataPath'=>"['data']", 'encPath'=>"['encoding']"),
+ array('path'=>"['ogg']['comments']['genre']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
+ array('path'=>"['tags']['vorbiscomment']['genre']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
+ ),
+ 'dc:title' => array(
+ array('path'=>"['id3v2']['comments']['title']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
+ array('path'=>"['id3v2']['TIT2'][0]", 'dataPath'=>"['data']", 'encPath'=>"['encoding']"),
+ array('path'=>"['id3v2']['TT2'][0]", 'dataPath'=>"['data']", 'encPath'=>"['encoding']"),
+ array('path'=>"['id3v1']", 'dataPath'=>"['title']", 'encPath'=>"['encoding']"),
+ array('path'=>"['ogg']['comments']['title']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
+ array('path'=>"['tags']['vorbiscomment']['title']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
+ ),
+ 'dc:creator' => array(
+ array('path'=>"['id3v2']['comments']['artist']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
+ array('path'=>"['id3v2']['TPE1'][0]", 'dataPath'=>"['data']", 'encPath'=>"['encoding']"),
+ array('path'=>"['id3v2']['TP1'][0]", 'dataPath'=>"['data']", 'encPath'=>"['encoding']"),
+ array('path'=>"['id3v1']", 'dataPath'=>"['artist']", 'encPath'=>"['encoding']"),
+ array('path'=>"['ogg']['comments']['artist']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
+ array('path'=>"['tags']['vorbiscomment']['artist']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
+ ),
+ 'dc:source' => array(
+ array('path'=>"['id3v2']['comments']['album']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
+ array('path'=>"['id3v2']['TALB'][0]", 'dataPath'=>"['data']", 'encPath'=>"['encoding']"),
+ array('path'=>"['id3v2']['TAL'][0]", 'dataPath'=>"['data']", 'encPath'=>"['encoding']"),
+ array('path'=>"['ogg']['comments']['album']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
+ array('path'=>"['tags']['vorbiscomment']['album']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
+ ),
+ 'ls:encoded_by' => array(
+ array('path'=>"['id3v2']['TENC'][0]", 'dataPath'=>"['data']", 'encPath'=>"['encoding']"),
+ array('path'=>"['id3v2']['TEN'][0]", 'dataPath'=>"['data']", 'encPath'=>"['encoding']"),
+ array('path'=>"['ogg']['comments']['encoded-by']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
+ array('path'=>"['tags']['vorbiscomment']['encoded-by']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
+ ),
+ 'ls:track_num' => array(
+ array('path'=>"['id3v2']['TRCK'][0]", 'dataPath'=>"['data']", 'encPath'=>"['encoding']"),
+ array('path'=>"['id3v2']['TRK'][0]", 'dataPath'=>"['data']", 'encPath'=>"['encoding']"),
+ array('path'=>"['ogg']['comments']['tracknumber']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
+ array('path'=>"['tags']['vorbiscomment']['tracknumber']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
+ ),
+ // 'ls:genre' => array(
+ // array('path'=>"['id3v1']", 'dataPath'=>"['genre']", 'encPath'=>"['encoding']"),
+ // array('path'=>"['id3v2']['TCON'][0]", 'dataPath'=>"['data']", 'encPath'=>"['encoding']"),
+ // array('path'=>"['id3v2']['comments']['content_type']", 'dataPath'=>"[0]", 'ignoreEnc'=>TRUE),
+ // array('path'=>"['ogg']['comments']['genre']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
+ // array('path'=>"['tags']['vorbiscomment']['genre']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
+ // ),
+ 'ls:channels' => array(
+ array('path'=>"['audio']['channels']", 'ignoreEnc'=>TRUE),
+ ),
+ 'ls:year' => array(
+ array('path'=>"['comments']['date']"),
+ array('path'=>"['ogg']['comments']['date']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
+ array('path'=>"['tags']['vorbiscomment']['date']", 'dataPath'=>"[0]", 'encPath'=>"['encoding']"),
+ ),
+ 'ls:filename' => array(
+ array('path'=>"['filename']"),
+ ),
+ );
$mdata = array();
if (isset($infoFromFile['audio'])) {
- $mdata['audio'] = $infoFromFile['audio'];
+ $mdata['audio'] = $infoFromFile['audio'];
}
if (isset($infoFromFile['playtime_seconds'])) {
- $mdata['playtime_seconds'] = $infoFromFile['playtime_seconds'];
+ $mdata['playtime_seconds'] = $infoFromFile['playtime_seconds'];
}
$titleHaveSet = FALSE;
@@ -265,7 +265,7 @@ function camp_get_audio_metadata($p_filename, $p_testonly = false)
foreach ($getid3keys as $getid3key) {
$path = $getid3key["path"];
$ignoreEnc = isset($getid3key["ignoreEnc"])?
- $getid3key["ignoreEnc"]:FALSE;
+ $getid3key["ignoreEnc"]:FALSE;
$dataPath = isset($getid3key["dataPath"])?$getid3key["dataPath"]:"";
$encPath = isset($getid3key["encPath"])?$getid3key["encPath"]:"";
$enc = "UTF-8";
@@ -281,7 +281,7 @@ function camp_get_audio_metadata($p_filename, $p_testonly = false)
$encodedElement = "\$infoFromFile$path$encPath";
eval("\$encodedElementExists = isset($encodedElement);");
if ($encodedElementExists) {
- eval("\$enc = $encodedElement;");
+ eval("\$enc = $encodedElement;");
}
}
@@ -290,19 +290,19 @@ function camp_get_audio_metadata($p_filename, $p_testonly = false)
$data = camp_parse_track_number($data);
}
camp_add_metadata($mdata, $key, $data, $enc);
- if ($key == $titleKey) {
- $titleHaveSet = TRUE;
- }
+ if ($key == $titleKey) {
+ $titleHaveSet = TRUE;
+ }
break;
}
}
}
if ($p_testonly) {
- var_dump($mdata);
+ var_dump($mdata);
}
if (!$titleHaveSet || trim($mdata[$titleKey]) == '') {
- camp_add_metadata($mdata, $titleKey, basename($p_filename));
+ camp_add_metadata($mdata, $titleKey, basename($p_filename));
}
return $mdata;
}
@@ -328,96 +328,96 @@ class StoredFile {
// *** Variables stored in the database ***
- /**
- * @var int
- */
- private $id;
+ /**
+ * @var int
+ */
+ private $id;
- /**
- * Unique ID for the file. This is stored in HEX format. It is
- * converted to a bigint whenever it is used in a database call.
- *
- * @var string
- */
- public $gunid;
+ /**
+ * Unique ID for the file. This is stored in HEX format. It is
+ * converted to a bigint whenever it is used in a database call.
+ *
+ * @var string
+ */
+ public $gunid;
- /**
- * The unique ID of the file as it is stored in the database.
- * This is for debugging purposes and may not always exist in this
- * class.
- *
- * @var string
- */
- //private $gunidBigint;
+ /**
+ * The unique ID of the file as it is stored in the database.
+ * This is for debugging purposes and may not always exist in this
+ * class.
+ *
+ * @var string
+ */
+ //private $gunidBigint;
- /**
- * @var string
- */
- private $name;
+ /**
+ * @var string
+ */
+ private $name;
- /**
- * @var string
- */
- private $mime;
+ /**
+ * @var string
+ */
+ private $mime;
- /**
- * Can be 'audioclip'...others might be coming, like webstream.
- *
- * @var string
- */
- private $ftype;
+ /**
+ * Can be 'audioclip'...others might be coming, like webstream.
+ *
+ * @var string
+ */
+ private $ftype;
- /**
- * Can be 'ready', 'edited', 'incomplete'.
- *
- * @var string
- */
- private $state;
+ /**
+ * Can be 'ready', 'edited', 'incomplete'.
+ *
+ * @var string
+ */
+ private $state;
- /**
- * @var int
- */
- private $currentlyaccessing;
+ /**
+ * @var int
+ */
+ private $currentlyaccessing;
- /**
- * @var int
- */
- private $editedby;
+ /**
+ * @var int
+ */
+ private $editedby;
- /**
- * @var timestamp
- */
- private $mtime;
+ /**
+ * @var timestamp
+ */
+ private $mtime;
- /**
- * @var string
- */
- private $md5;
+ /**
+ * @var string
+ */
+ private $md5;
- /**
- * @var string
- */
- private $filepath;
+ /**
+ * @var string
+ */
+ private $filepath;
- // *** Variables NOT stored in the database ***
+ // *** Variables NOT stored in the database ***
- /**
- * Directory where the file is located.
- *
- * @var string
- */
- private $resDir;
+ /**
+ * Directory where the file is located.
+ *
+ * @var string
+ */
+ private $resDir;
- /**
- * @var boolean
- */
- private $exists;
+ /**
+ * @var boolean
+ */
+ private $exists;
- /**
- * @var MetaData
- */
- public $md;
+ /**
+ * @var MetaData
+ */
+ public $md;
/* ========================================================== constructor */
/**
@@ -433,8 +433,8 @@ class StoredFile {
$this->gunid = StoredFile::generateGunid();
}
else {
- $this->loadMetadata();
- $this->exists = is_file($this->filepath) && is_readable($this->filepath);
+ $this->loadMetadata();
+ $this->exists = is_file($this->filepath) && is_readable($this->filepath);
}
}
@@ -442,7 +442,7 @@ class StoredFile {
* For testing only, do not use.
*/
public function __setGunid($p_guid) {
- $this->gunid = $p_guid;
+ $this->gunid = $p_guid;
}
/**
@@ -489,7 +489,7 @@ class StoredFile {
global $CC_CONFIG, $CC_DBC;
$escapedValue = pg_escape_string($this->gunid);
$sql = "SELECT * FROM ".$CC_CONFIG["filesTable"]
- ." WHERE gunid='$escapedValue'";
+ ." WHERE gunid='$escapedValue'";
//var_dump($sql);
$this->md = $CC_DBC->getRow($sql);
//var_dump($this->md);
@@ -528,8 +528,8 @@ class StoredFile {
$columnName = StoredFile::xmlCategoryToDbColumn($category);
if (!is_null($columnName)) {
$sql = "UPDATE ".$CC_CONFIG["filesTable"]
- ." SET $columnName='$escapedValue'"
- ." WHERE gunid = '".$this->gunid."'";
+ ." SET $columnName='$escapedValue'"
+ ." WHERE gunid = '".$this->gunid."'";
$CC_DBC->query($sql);
}
}
@@ -544,8 +544,8 @@ class StoredFile {
foreach ($metadataColumns as $columnName) {
if (!is_null($columnName)) {
$sql = "UPDATE ".$CC_CONFIG["filesTable"]
- ." SET $columnName=''"
- ." WHERE gunid = '".$this->gunid."'";
+ ." SET $columnName=''"
+ ." WHERE gunid = '".$this->gunid."'";
$CC_DBC->query($sql);
}
}
@@ -575,7 +575,7 @@ class StoredFile {
global $CC_CONFIG, $CC_DBC;
if (!isset($p_values["filepath"])) {
- return new PEAR_Error("StoredFile::Insert: filepath not set.");
+ return new PEAR_Error("StoredFile::Insert: filepath not set.");
}
if (!file_exists($p_values['filepath'])) {
return PEAR::raiseError("StoredFile::Insert: ".
@@ -589,16 +589,16 @@ class StoredFile {
// Get metadata
if (isset($p_values["metadata"])) {
- $metadata = $p_values['metadata'];
+ $metadata = $p_values['metadata'];
} else {
- $metadata = camp_get_audio_metadata($p_values["filepath"]);
+ $metadata = camp_get_audio_metadata($p_values["filepath"]);
}
$storedFile->name = isset($p_values['filename']) ? $p_values['filename'] : $p_values["filepath"];
- $storedFile->id = isset($p_values['id']) && is_integer($p_values['id'])?(int)$p_values['id']:null;
+ $storedFile->id = isset($p_values['id']) && is_integer($p_values['id'])?(int)$p_values['id']:null;
// NOTE: POSTGRES-SPECIFIC KEYWORD "DEFAULT" BEING USED, WOULD BE "NULL" IN MYSQL
- $sqlId = !is_null($storedFile->id)?"'".$storedFile->id."'":'DEFAULT';
- $storedFile->ftype = isset($p_values['filetype']) ? strtolower($p_values['filetype']) : "audioclip";
+ $sqlId = !is_null($storedFile->id)?"'".$storedFile->id."'":'DEFAULT';
+ $storedFile->ftype = isset($p_values['filetype']) ? strtolower($p_values['filetype']) : "audioclip";
$storedFile->mime = (isset($p_values["mime"]) ? $p_values["mime"] : NULL );
// $storedFile->filepath = $p_values['filepath'];
if (isset($p_values['md5'])) {
@@ -611,7 +611,7 @@ class StoredFile {
// Check for duplicates -- return duplicate
$duplicate = StoredFile::RecallByMd5($storedFile->md5);
if ($duplicate) {
- return $duplicate;
+ return $duplicate;
}
$storedFile->exists = FALSE;
@@ -620,11 +620,11 @@ class StoredFile {
$escapedName = pg_escape_string($storedFile->name);
$escapedFtype = pg_escape_string($storedFile->ftype);
$sql = "INSERT INTO ".$CC_CONFIG['filesTable']
- ."(id, name, gunid, mime, state, ftype, mtime, md5)"
- ."VALUES ({$sqlId}, '{$escapedName}', "
- ." '{$storedFile->gunid}',"
- ." '{$storedFile->mime}', 'incomplete', '$escapedFtype',"
- ." now(), '{$storedFile->md5}')";
+ ."(id, name, gunid, mime, state, ftype, mtime, md5)"
+ ."VALUES ({$sqlId}, '{$escapedName}', "
+ ." '{$storedFile->gunid}',"
+ ." '{$storedFile->mime}', 'incomplete', '$escapedFtype',"
+ ." now(), '{$storedFile->md5}')";
//$_SESSION["debug"] .= "sql: ".$sql."
";
//echo $sql."\n";
$res = $CC_DBC->query($sql);
@@ -634,9 +634,9 @@ class StoredFile {
}
if (!is_integer($storedFile->id)) {
- // NOTE: POSTGRES-SPECIFIC
- $sql = "SELECT currval('".$CC_CONFIG["filesSequence"]."_seq')";
- $storedFile->id = $CC_DBC->getOne($sql);
+ // NOTE: POSTGRES-SPECIFIC
+ $sql = "SELECT currval('".$CC_CONFIG["filesSequence"]."_seq')";
+ $storedFile->id = $CC_DBC->getOne($sql);
}
$storedFile->setMetadataBatch($metadata);
@@ -688,8 +688,8 @@ class StoredFile {
return null;
}
$sql = "SELECT *"
- ." FROM ".$CC_CONFIG['filesTable']
- ." WHERE $cond";
+ ." FROM ".$CC_CONFIG['filesTable']
+ ." WHERE $cond";
//echo $sql;
$row = $CC_DBC->getRow($sql);
if (PEAR::isError($row) || is_null($row)) {
@@ -751,8 +751,8 @@ class StoredFile {
{
global $CC_CONFIG, $CC_DBC;
$sql = "SELECT gunid"
- ." FROM ".$CC_CONFIG['accessTable']
- ." WHERE token=x'$p_token'::bigint";
+ ." FROM ".$CC_CONFIG['accessTable']
+ ." WHERE token=x'$p_token'::bigint";
$gunid = $CC_DBC->getOne($sql);
if (PEAR::isError($gunid)) {
return $gunid;
@@ -796,7 +796,7 @@ class StoredFile {
{
global $CC_CONFIG, $CC_DBC;
if ($this->exists) {
- return FALSE;
+ return FALSE;
}
// for files downloaded from remote instance:
if ($p_localFilePath == $this->filepath) {
@@ -823,8 +823,8 @@ class StoredFile {
$this->filepath = $dstFile;
$sqlPath = pg_escape_string($this->filepath);
$sql = "UPDATE ".$CC_CONFIG["filesTable"]
- ." SET filepath='{$sqlPath}'"
- ." WHERE id={$this->id}";
+ ." SET filepath='{$sqlPath}'"
+ ." WHERE id={$this->id}";
//echo $sql."\n";
$res = $CC_DBC->query($sql);
if (PEAR::isError($res)) {
@@ -851,9 +851,9 @@ class StoredFile {
}
if ($this->exists) {
- $r = $this->deleteFile();
+ $r = $this->deleteFile();
if (PEAR::isError($r)) {
- return $r;
+ return $r;
}
}
return $this->addFile($p_localFilePath);
@@ -883,19 +883,19 @@ class StoredFile {
{
global $CC_CONFIG;
if (!$this->exists) {
- return FALSE;
+ return FALSE;
}
if ($this->isAccessed()) {
- return PEAR::raiseError(
+ return PEAR::raiseError(
'Cannot delete a file that is currently accessed.'
- );
+ );
}
// Check if the file is scheduled to be played in the future
if (Schedule::IsFileScheduledInTheFuture($this->id)) {
- return PEAR::raiseError(
+ return PEAR::raiseError(
'Cannot delete a file that is scheduled in the future.'
- );
+ );
}
// Delete it from all playlists
@@ -911,12 +911,12 @@ class StoredFile {
} else {
return PEAR::raiseError(
"StoredFile::deleteFile: unlink failed ({$this->filepath})",
- GBERR_FILEIO
+ GBERR_FILEIO
);
}
} else {
- $this->exists = FALSE;
- return TRUE;
+ $this->exists = FALSE;
+ return TRUE;
}
}
@@ -932,7 +932,7 @@ class StoredFile {
public function analyzeFile()
{
if (!$this->exists) {
- return FALSE;
+ return FALSE;
}
$ia = camp_get_audio_metadata($this->filepath);
return $ia;
@@ -980,42 +980,42 @@ class StoredFile {
* 'file'|'string'
* @return TRUE|PEAR_Error
*/
-// public function replace($p_oid, $p_name, $p_localFilePath='', $p_metadata='',
-// $p_mdataLoc='file')
-// {
-// global $CC_CONFIG, $CC_DBC;
-// $CC_DBC->query("BEGIN");
-// $res = $this->setName($p_name);
-// if (PEAR::isError($res)) {
-// $CC_DBC->query("ROLLBACK");
-// return $res;
-// }
-// if ($p_localFilePath != '') {
-// $res = $this->setRawMediaData($p_localFilePath);
-// } else {
-// $res = $this->deleteFile();
-// }
-// if (PEAR::isError($res)) {
-// $CC_DBC->query("ROLLBACK");
-// return $res;
-// }
-// if ($p_metadata != '') {
-// $res = $this->setMetadata($p_metadata, $p_mdataLoc);
-// } else {
-//// $res = $this->md->delete();
-// $res = $this->clearMetadata();
-// }
-// if (PEAR::isError($res)) {
-// $CC_DBC->query("ROLLBACK");
-// return $res;
-// }
-// $res = $CC_DBC->query("COMMIT");
-// if (PEAR::isError($res)) {
-// $CC_DBC->query("ROLLBACK");
-// return $res;
-// }
-// return TRUE;
-// }
+ // public function replace($p_oid, $p_name, $p_localFilePath='', $p_metadata='',
+ // $p_mdataLoc='file')
+ // {
+ // global $CC_CONFIG, $CC_DBC;
+ // $CC_DBC->query("BEGIN");
+ // $res = $this->setName($p_name);
+ // if (PEAR::isError($res)) {
+ // $CC_DBC->query("ROLLBACK");
+ // return $res;
+ // }
+ // if ($p_localFilePath != '') {
+ // $res = $this->setRawMediaData($p_localFilePath);
+ // } else {
+ // $res = $this->deleteFile();
+ // }
+ // if (PEAR::isError($res)) {
+ // $CC_DBC->query("ROLLBACK");
+ // return $res;
+ // }
+ // if ($p_metadata != '') {
+ // $res = $this->setMetadata($p_metadata, $p_mdataLoc);
+ // } else {
+ //// $res = $this->md->delete();
+ // $res = $this->clearMetadata();
+ // }
+ // if (PEAR::isError($res)) {
+ // $CC_DBC->query("ROLLBACK");
+ // return $res;
+ // }
+ // $res = $CC_DBC->query("COMMIT");
+ // if (PEAR::isError($res)) {
+ // $CC_DBC->query("ROLLBACK");
+ // return $res;
+ // }
+ // return TRUE;
+ // }
/**
@@ -1035,7 +1035,7 @@ class StoredFile {
return $res;
}
$resultArray =
- array('url'=>"file://{$res['fname']}", 'token'=>$res['token']);
+ array('url'=>"file://{$res['fname']}", 'token'=>$res['token']);
return $resultArray;
}
@@ -1077,10 +1077,10 @@ class StoredFile {
return $res;
}
}
-// $r = $this->md->regenerateXmlFile();
-// if (PEAR::isError($r)) {
-// return $r;
-// }
+ // $r = $this->md->regenerateXmlFile();
+ // if (PEAR::isError($r)) {
+ // return $r;
+ // }
return TRUE;
}
@@ -1109,21 +1109,21 @@ class StoredFile {
* (NULL = no validation)
* @return boolean
*/
-// public function setMetadata($p_metadata, $p_mdataLoc='file', $p_format=NULL)
-// {
-// global $CC_CONFIG, $CC_DBC;
-// $CC_DBC->query("BEGIN");
-// $res = $this->md->replace($p_metadata, $p_mdataLoc, $p_format);
-// if (PEAR::isError($res)) {
-// $CC_DBC->query("ROLLBACK");
-// return $res;
-// }
-// $res = $CC_DBC->query("COMMIT");
-// if (PEAR::isError($res)) {
-// return $res;
-// }
-// return TRUE;
-// }
+ // public function setMetadata($p_metadata, $p_mdataLoc='file', $p_format=NULL)
+ // {
+ // global $CC_CONFIG, $CC_DBC;
+ // $CC_DBC->query("BEGIN");
+ // $res = $this->md->replace($p_metadata, $p_mdataLoc, $p_format);
+ // if (PEAR::isError($res)) {
+ // $CC_DBC->query("ROLLBACK");
+ // return $res;
+ // }
+ // $res = $CC_DBC->query("COMMIT");
+ // if (PEAR::isError($res)) {
+ // return $res;
+ // }
+ // return TRUE;
+ // }
/**
* Set metadata element value
@@ -1136,27 +1136,27 @@ class StoredFile {
*/
public function setMetadataValue($p_category, $p_value)
{
- global $CC_CONFIG, $CC_DBC;
- if (!is_string($p_category) || is_array($p_value)) {
- return FALSE;
- }
- if ($p_category == 'dcterms:extent') {
- $p_value = StoredFile::NormalizeExtent($p_value);
- }
- $columnName = StoredFile::xmlCategoryToDbColumn($p_category); // Get column name
-
- if (!is_null($columnName)) {
- $escapedValue = pg_escape_string($p_value);
- $sql = "UPDATE ".$CC_CONFIG["filesTable"]
- ." SET $columnName='$escapedValue'"
- ." WHERE id={$this->id}";
- //var_dump($sql);
- $res = $CC_DBC->query($sql);
- if (PEAR::isError($res)) {
- return $res;
+ global $CC_CONFIG, $CC_DBC;
+ if (!is_string($p_category) || is_array($p_value)) {
+ return FALSE;
}
- }
- return TRUE;
+ if ($p_category == 'dcterms:extent') {
+ $p_value = StoredFile::NormalizeExtent($p_value);
+ }
+ $columnName = StoredFile::xmlCategoryToDbColumn($p_category); // Get column name
+
+ if (!is_null($columnName)) {
+ $escapedValue = pg_escape_string($p_value);
+ $sql = "UPDATE ".$CC_CONFIG["filesTable"]
+ ." SET $columnName='$escapedValue'"
+ ." WHERE id={$this->id}";
+ //var_dump($sql);
+ $res = $CC_DBC->query($sql);
+ if (PEAR::isError($res)) {
+ return $res;
+ }
+ }
+ return TRUE;
}
@@ -1170,49 +1170,49 @@ class StoredFile {
*/
public function setMetadataBatch($values)
{
- global $CC_CONFIG, $CC_DBC;
- if (!is_array($values)) {
- $values = array($values);
- }
- if (count($values) == 0) {
- return true;
- }
- foreach ($values as $category => $oneValue) {
- $columnName = StoredFile::xmlCategoryToDbColumn($category);
- if (!is_null($columnName)) {
- if ($category == 'dcterms:extent') {
- $oneValue = StoredFile::NormalizeExtent($oneValue);
- }
- // Since track_number is an integer, you cannot set
- // it to be the empty string, so we NULL it instead.
- if ($columnName == 'track_number' && empty($oneValue)) {
- $sqlPart = "$columnName = NULL";
- } elseif (($columnName == 'length') && (strlen($oneValue) > 8)) {
- // Postgres doesnt like it if you try to store really large hour
- // values. TODO: We need to fix the underlying problem of getting the
- // right values.
- $parts = explode(':', $oneValue);
- $hour = intval($parts[0]);
- if ($hour > 24) {
- continue;
- } else {
- $sqlPart = "$columnName = '$oneValue'";
- }
- } else {
- $escapedValue = pg_escape_string($oneValue);
- $sqlPart = "$columnName = '$escapedValue'";
- }
- $sqlValues[] = $sqlPart;
+ global $CC_CONFIG, $CC_DBC;
+ if (!is_array($values)) {
+ $values = array($values);
}
- }
- if (count($sqlValues)==0) {
+ if (count($values) == 0) {
+ return true;
+ }
+ foreach ($values as $category => $oneValue) {
+ $columnName = StoredFile::xmlCategoryToDbColumn($category);
+ if (!is_null($columnName)) {
+ if ($category == 'dcterms:extent') {
+ $oneValue = StoredFile::NormalizeExtent($oneValue);
+ }
+ // Since track_number is an integer, you cannot set
+ // it to be the empty string, so we NULL it instead.
+ if ($columnName == 'track_number' && empty($oneValue)) {
+ $sqlPart = "$columnName = NULL";
+ } elseif (($columnName == 'length') && (strlen($oneValue) > 8)) {
+ // Postgres doesnt like it if you try to store really large hour
+ // values. TODO: We need to fix the underlying problem of getting the
+ // right values.
+ $parts = explode(':', $oneValue);
+ $hour = intval($parts[0]);
+ if ($hour > 24) {
+ continue;
+ } else {
+ $sqlPart = "$columnName = '$oneValue'";
+ }
+ } else {
+ $escapedValue = pg_escape_string($oneValue);
+ $sqlPart = "$columnName = '$escapedValue'";
+ }
+ $sqlValues[] = $sqlPart;
+ }
+ }
+ if (count($sqlValues)==0) {
+ return TRUE;
+ }
+ $sql = "UPDATE ".$CC_CONFIG["filesTable"]
+ ." SET ".join(",", $sqlValues)
+ ." WHERE id={$this->id}";
+ $CC_DBC->query($sql);
return TRUE;
- }
- $sql = "UPDATE ".$CC_CONFIG["filesTable"]
- ." SET ".join(",", $sqlValues)
- ." WHERE id={$this->id}";
- $CC_DBC->query($sql);
- return TRUE;
}
@@ -1234,11 +1234,11 @@ class StoredFile {
*/
public function getMetadataValue($p_name)
{
- if (isset($this->md[$p_name])){
- return $this->md[$p_name];
- } else {
- return "";
- }
+ if (isset($this->md[$p_name])){
+ return $this->md[$p_name];
+ } else {
+ return "";
+ }
}
/**
@@ -1252,8 +1252,8 @@ class StoredFile {
global $CC_CONFIG, $CC_DBC;
$escapedName = pg_escape_string($p_newname);
$sql = "UPDATE ".$CC_CONFIG['filesTable']
- ." SET name='$escapedName', mtime=now()"
- ." WHERE gunid='{$this->gunid}'";
+ ." SET name='$escapedName', mtime=now()"
+ ." WHERE gunid='{$this->gunid}'";
$res = $CC_DBC->query($sql);
if (PEAR::isError($res)) {
return $res;
@@ -1278,8 +1278,8 @@ class StoredFile {
$escapedState = pg_escape_string($p_state);
$eb = (!is_null($p_editedby) ? ", editedBy=$p_editedby" : '');
$sql = "UPDATE ".$CC_CONFIG['filesTable']
- ." SET state='$escapedState'$eb, mtime=now()"
- ." WHERE gunid='{$this->gunid}'";
+ ." SET state='$escapedState'$eb, mtime=now()"
+ ." WHERE gunid='{$this->gunid}'";
$res = $CC_DBC->query($sql);
if (PEAR::isError($res)) {
return $res;
@@ -1304,8 +1304,8 @@ class StoredFile {
}
$escapedMime = pg_escape_string($p_mime);
$sql = "UPDATE ".$CC_CONFIG['filesTable']
- ." SET mime='$escapedMime', mtime=now()"
- ." WHERE gunid='{$this->gunid}'";
+ ." SET mime='$escapedMime', mtime=now()"
+ ." WHERE gunid='{$this->gunid}'";
$res = $CC_DBC->query($sql);
if (PEAR::isError($res)) {
return $res;
@@ -1326,8 +1326,8 @@ class StoredFile {
global $CC_CONFIG, $CC_DBC;
$escapedMd5 = pg_escape_string($p_md5sum);
$sql = "UPDATE ".$CC_CONFIG['filesTable']
- ." SET md5='$escapedMd5', mtime=now()"
- ." WHERE gunid='{$this->gunid}'";
+ ." SET md5='$escapedMd5', mtime=now()"
+ ." WHERE gunid='{$this->gunid}'";
$res = $CC_DBC->query($sql);
if (PEAR::isError($res)) {
return $res;
@@ -1354,8 +1354,8 @@ class StoredFile {
}
}
$sql = "SELECT to_hex(token)as token, ext "
- ." FROM ".$CC_CONFIG['accessTable']
- ." WHERE gunid='{$this->gunid}'";
+ ." FROM ".$CC_CONFIG['accessTable']
+ ." WHERE gunid='{$this->gunid}'";
$tokens = $CC_DBC->getAll($sql);
if (is_array($tokens)) {
foreach ($tokens as $i => $item) {
@@ -1366,13 +1366,13 @@ class StoredFile {
}
}
$sql = "DELETE FROM ".$CC_CONFIG['accessTable']
- ." WHERE gunid='{$this->gunid}'";
+ ." WHERE gunid='{$this->gunid}'";
$res = $CC_DBC->query($sql);
if (PEAR::isError($res)) {
return $res;
}
$sql = "DELETE FROM ".$CC_CONFIG['filesTable']
- ." WHERE gunid='{$this->gunid}'";
+ ." WHERE gunid='{$this->gunid}'";
$res = $CC_DBC->query($sql);
if (PEAR::isError($res)) {
return $res;
@@ -1388,14 +1388,14 @@ class StoredFile {
public function getPlaylists() {
global $CC_CONFIG, $CC_DBC;
$sql = "SELECT playlist_id "
- ." FROM ".$CC_CONFIG['playistTable']
- ." WHERE file_id='{$this->id}'";
+ ." FROM ".$CC_CONFIG['playistTable']
+ ." WHERE file_id='{$this->id}'";
$ids = $CC_DBC->getAll($sql);
$playlists = array();
if (is_array($ids) && count($ids) > 0) {
- foreach ($ids as $id) {
- $playlists[] = Playlist::Recall($id);
- }
+ foreach ($ids as $id) {
+ $playlists[] = Playlist::Recall($id);
+ }
}
return $playlists;
}
@@ -1416,12 +1416,12 @@ class StoredFile {
return ($this->currentlyaccessing > 0);
}
$sql = "SELECT currentlyAccessing FROM ".$CC_CONFIG['filesTable']
- ." WHERE gunid='$p_gunid'";
+ ." WHERE gunid='$p_gunid'";
$ca = $CC_DBC->getOne($sql);
if (is_null($ca)) {
return PEAR::raiseError(
"StoredFile::isAccessed: invalid gunid ($p_gunid)",
- GBERR_FOBJNEX
+ GBERR_FOBJNEX
);
}
return ($ca > 0);
@@ -1463,7 +1463,7 @@ class StoredFile {
$p_playlistId = $this->gunid;
}
$sql = "SELECT editedBy FROM ".$CC_CONFIG['filesTable']
- ." WHERE gunid='$p_playlistId'";
+ ." WHERE gunid='$p_playlistId'";
$ca = $CC_DBC->getOne($sql);
if (PEAR::isError($ca)) {
return $ca;
@@ -1505,8 +1505,8 @@ class StoredFile {
{
global $CC_CONFIG, $CC_DBC;
$sql = "SELECT gunid "
- ." FROM ".$CC_CONFIG['filesTable']
- ." WHERE gunid='{$this->gunid}'";
+ ." FROM ".$CC_CONFIG['filesTable']
+ ." WHERE gunid='{$this->gunid}'";
$indb = $CC_DBC->getRow($sql);
if (PEAR::isError($indb)) {
return $indb;
@@ -1527,15 +1527,15 @@ class StoredFile {
*/
public static function generateGunid()
{
- return md5(uniqid("", true));
+ return md5(uniqid("", true));
-// $ip = (isset($_SERVER['SERVER_ADDR']) ? $_SERVER['SERVER_ADDR'] : '');
-// $initString = microtime().$ip.rand();
-// $hash = md5($initString);
-// // non-negative int8
-// $hsd = substr($hash, 0, 1);
-// $res = dechex(hexdec($hsd)>>1).substr($hash, 1, 15);
-// return StoredFile::NormalizeGunid($res);
+ // $ip = (isset($_SERVER['SERVER_ADDR']) ? $_SERVER['SERVER_ADDR'] : '');
+ // $initString = microtime().$ip.rand();
+ // $hash = md5($initString);
+ // // non-negative int8
+ // $hsd = substr($hash, 0, 1);
+ // $res = dechex(hexdec($hsd)>>1).substr($hash, 1, 15);
+ // return StoredFile::NormalizeGunid($res);
}
@@ -1544,10 +1544,10 @@ class StoredFile {
*
* @return string
*/
-// public static function NormalizeGunid($p_gunid)
-// {
-// return str_pad($p_gunid, 16, "0", STR_PAD_LEFT);
-// }
+ // public static function NormalizeGunid($p_gunid)
+ // {
+ // return str_pad($p_gunid, 16, "0", STR_PAD_LEFT);
+ // }
/**
@@ -1598,10 +1598,10 @@ class StoredFile {
{
$a = $this->analyzeFile();
if (PEAR::isError($a)) {
- return $a;
+ return $a;
}
if (isset($a['dc:format'])) {
- return $a['dc:format'];
+ return $a['dc:format'];
}
return '';
}
@@ -1613,12 +1613,12 @@ class StoredFile {
*/
public function getTitle()
{
- return $this->md["title"];
+ return $this->md["title"];
}
public function getType()
{
- return $this->ftype;
+ return $this->ftype;
}
/**
@@ -1636,7 +1636,7 @@ class StoredFile {
return $this->state;
}
$sql = "SELECT state FROM ".$CC_CONFIG['filesTable']
- ." WHERE gunid='$p_gunid'";
+ ." WHERE gunid='$p_gunid'";
return $CC_DBC->getOne($sql);
}
@@ -1655,7 +1655,7 @@ class StoredFile {
return $this->name;
}
$sql = "SELECT name FROM ".$CC_CONFIG['filesTable']
- ." WHERE gunid='$p_gunid'";
+ ." WHERE gunid='$p_gunid'";
return $CC_DBC->getOne($sql);
}
@@ -1666,64 +1666,64 @@ class StoredFile {
*
* @return string
*/
-// private function _getResDir()
-// {
-// global $CC_CONFIG, $CC_DBC;
-// $resDir = $CC_CONFIG['storageDir']."/".substr($this->gunid, 0, 3);
-// //$this->gb->debugLog("$resDir");
-// // see Transport::_getResDir too for resDir name create code
-// if (!is_dir($resDir)) {
-// mkdir($resDir, 02775);
-// chmod($resDir, 02775);
-// }
-// return $resDir;
-// }
+ // private function _getResDir()
+ // {
+ // global $CC_CONFIG, $CC_DBC;
+ // $resDir = $CC_CONFIG['storageDir']."/".substr($this->gunid, 0, 3);
+ // //$this->gb->debugLog("$resDir");
+ // // see Transport::_getResDir too for resDir name create code
+ // if (!is_dir($resDir)) {
+ // mkdir($resDir, 02775);
+ // chmod($resDir, 02775);
+ // }
+ // return $resDir;
+ // }
- /**
- * Get real filename of raw media data
- *
- * @return string
- */
- public function getRealFileName()
- {
- return $this->filepath;
- }
+ /**
+ * Get real filename of raw media data
+ *
+ * @return string
+ */
+ public function getRealFileName()
+ {
+ return $this->filepath;
+ }
- /**
- * Get the URL to access this file.
- */
- public function getFileUrl()
- {
- global $CC_CONFIG;
- return "http://".$CC_CONFIG["storageUrlHost"]
- ."api/get_media.php?file_id={$this->gunid}";
- }
+ /**
+ * Get the URL to access this file.
+ */
+ public function getFileUrl()
+ {
+ global $CC_CONFIG;
+ return "http://".$CC_CONFIG["storageUrlHost"]
+ ."api/get_media.php?file_id={$this->gunid}";
+ }
- /**
- * Get real filename of metadata file
- *
- * @return string
- * @see MetaData
- */
- public function getRealMetadataFileName()
- {
- //return $this->md->getFileName();
- return $this->md["name"];
- }
+ /**
+ * Get real filename of metadata file
+ *
+ * @return string
+ * @see MetaData
+ */
+ public function getRealMetadataFileName()
+ {
+ //return $this->md->getFileName();
+ return $this->md["name"];
+ }
- /**
- * Create and return name for temporary symlink.
- *
- * @todo Should be more unique
- * @return string
- */
- private function _getAccessFileName($p_token, $p_ext='EXT')
- {
- global $CC_CONFIG;
- return $CC_CONFIG['accessDir']."/$p_token.$p_ext";
- }
+ /**
+ * Create and return name for temporary symlink.
+ *
+ * @todo Should be more unique
+ * @return string
+ */
+ private function _getAccessFileName($p_token, $p_ext='EXT')
+ {
+ global $CC_CONFIG;
+ return $CC_CONFIG['accessDir']."/$p_token.$p_ext";
+ }
-} // class StoredFile
-?>
\ No newline at end of file
+ } // class StoredFile
+ ?>
\ No newline at end of file
diff --git a/backend/Transport.php b/backend/Transport.php
index 0c33877c8..31405e26f 100644
--- a/backend/Transport.php
+++ b/backend/Transport.php
@@ -50,11 +50,11 @@ class Transport
*/
public $gb;
- /**
- * File name
- * @var string
- */
- private $cronJobScript;
+ /**
+ * File name
+ * @var string
+ */
+ private $cronJobScript;
/**
* wget --read-timeout parameter [s]
@@ -72,7 +72,7 @@ class Transport
* wget --limit-rate parameter
*/
private $downLimitRate = NULL;
-# private $downLimitRate = 500;
+ # private $downLimitRate = 500;
/**
* wget -t parameter
@@ -109,7 +109,7 @@ class Transport
* @var int
*/
private $upLimitRate = NULL;
-# private $upLimitRate = 500;
+ # private $upLimitRate = 500;
/**
@@ -122,9 +122,9 @@ class Transport
{
$this->gb =& $gb;
$this->cronJobScript = realpath(
- dirname(__FILE__).
+ dirname(__FILE__).
'/../../storageServer/var/cron/transportCronJob.php'
- );
+ );
}
@@ -154,27 +154,27 @@ class Transport
{
$trec = TransportRecord::recall($this, $trtok);
if (PEAR::isError($trec)) {
- return $trec;
+ return $trec;
}
$res = array();
foreach (array(
'trtype', 'state', 'direction', 'expectedsize', 'realsize',
'expectedsum', 'realsum', 'title', 'errmsg'
- ) as $k) {
- $res[$k] = ( isset($trec->row[$k]) ? $trec->row[$k] : NULL );
- }
- if ( ($trec->row['direction'] == 'down') && file_exists($trec->row['localfile']) ){
- $res['realsize'] = filesize($trec->row['localfile']);
- $res['realsum'] = $this->_chsum($trec->row['localfile']);
- }
- if ( ($trec->row['direction'] == 'up') ){
- $check = $this->uploadCheck($trec->row['pdtoken']);
- if (!PEAR::isError($check)) {
- $res['realsize'] = $check['size'];
- $res['realsum'] = $check['realsum'];
+ ) as $k) {
+ $res[$k] = ( isset($trec->row[$k]) ? $trec->row[$k] : NULL );
}
- }
- return $res;
+ if ( ($trec->row['direction'] == 'down') && file_exists($trec->row['localfile']) ){
+ $res['realsize'] = filesize($trec->row['localfile']);
+ $res['realsum'] = $this->_chsum($trec->row['localfile']);
+ }
+ if ( ($trec->row['direction'] == 'up') ){
+ $check = $this->uploadCheck($trec->row['pdtoken']);
+ if (!PEAR::isError($check)) {
+ $res['realsize'] = $check['size'];
+ $res['realsum'] = $check['realsum'];
+ }
+ }
+ return $res;
}
@@ -198,18 +198,18 @@ class Transport
$res = $pr->loadGroupPref($group, $key);
if (PEAR::isError($res)) {
if ($res->getCode() !== GBERR_PREF) {
- return $res;
+ return $res;
} else {
- $res = FALSE; // default
+ $res = FALSE; // default
}
}
$state = !$res;
if (is_null($onOff)) {
- return $state;
+ return $state;
}
$res = $pr->saveGroupPref($sessid, $group, $key, !$onOff);
if (PEAR::isError($res)) {
- return $res;
+ return $res;
}
return $state;
}
@@ -229,7 +229,7 @@ class Transport
{
$trec = TransportRecord::recall($this, $trtok);
if (PEAR::isError($trec)) {
- return $trec;
+ return $trec;
}
if ($trec->getState() == 'closed') {
return PEAR::raiseError(
@@ -239,14 +239,14 @@ class Transport
}
switch ($action) {
case 'pause';
- $newState = 'paused';
- break;
+ $newState = 'paused';
+ break;
case 'resume';
- $newState = 'waiting';
- break;
+ $newState = 'waiting';
+ break;
case 'cancel';
- $newState = 'closed';
- break;
+ $newState = 'closed';
+ break;
default:
return PEAR::raiseError(
"Transport::doTransportAction:".
@@ -257,7 +257,7 @@ class Transport
switch ($action) {
case 'pause';
case 'cancel';
- $trec->killJob();
+ $trec->killJob();
}
return $res;
}
@@ -286,35 +286,35 @@ class Transport
case "webstream":
$storedFile = StoredFile::RecallByGunid($gunid);
if (is_null($storedFile) || PEAR::isError($storedFile)) {
- return $storedFile;
+ return $storedFile;
}
// handle metadata:
$mdfpath = $storedFile->getRealMetadataFileName();
if (PEAR::isError($mdfpath)) {
- return $mdfpath;
+ return $mdfpath;
}
$mdtrec = $this->_uploadGeneralFileToHub($mdfpath, 'metadata',
- array_merge(array('gunid'=>$gunid, 'fname'=>'metadata',), $pars)
+ array_merge(array('gunid'=>$gunid, 'fname'=>'metadata',), $pars)
);
if (PEAR::isError($mdtrec)) {
- return $mdtrec;
+ return $mdtrec;
}
// handle raw media file:
$fpath = $storedFile->getRealFileName();
if (PEAR::isError($fpath)) {
- return $fpath;
+ return $fpath;
}
$fname = $storedFile->getName();
if (PEAR::isError($fname)) {
- return $fname;
+ return $fname;
}
$trec = $this->_uploadGeneralFileToHub($fpath, 'audioclip',
- array_merge(array(
+ array_merge(array(
'gunid'=>$gunid, 'fname'=>$fname, 'mdtrtok'=>$mdtrec->trtok,
- ), $pars)
+ ), $pars)
);
if (PEAR::isError($trec)) {
- return $trec;
+ return $trec;
}
$this->startCronJobProcess($mdtrec->trtok);
break;
@@ -324,18 +324,18 @@ class Transport
require_once("Playlist.php");
$pl = StoredFile::RecallByGunid($plid);
if (is_null($pl) || PEAR::isError($pl)) {
- return $pl;
+ return $pl;
}
$fname = $pl->getName();
if (PEAR::isError($fname)) {
- return $fname;
+ return $fname;
}
if ($withContent) {
$this->trLog("upload2Hub exportPlaylistOpen BEGIN: ".strftime("%H:%M:%S"));
$res = $this->gb->bsExportPlaylistOpen($plid);
$this->trLog("upload2Hub exportPlaylistOpen END: ".strftime("%H:%M:%S"));
if (PEAR::isError($res)) {
- return $res;
+ return $res;
}
$tmpn = tempnam($CC_CONFIG['transDir'], 'plExport_');
$plfpath = "$tmpn.lspl";
@@ -344,21 +344,21 @@ class Transport
$this->trLog("upload2Hub end copy: ".strftime("%H:%M:%S"));
$res = $this->gb->bsExportPlaylistClose($res['token']);
if (PEAR::isError($res)) {
- return $res;
+ return $res;
}
$fname = $fname.".lspl";
$trtype = 'playlistPkg';
} else {
$plfpath = $pl->getRealMetadataFileName();
if (PEAR::isError($plfpath)) {
- return $plfpath;
+ return $plfpath;
}
$trtype = 'playlist';
}
$trec = $this->_uploadGeneralFileToHub($plfpath, $trtype,
- array_merge(array('gunid'=>$plid,'fname'=>$fname,), $pars));
+ array_merge(array('gunid'=>$plid,'fname'=>$fname,), $pars));
if (PEAR::isError($trec)) {
- return $trec;
+ return $trec;
}
break;
default:
@@ -390,9 +390,9 @@ class Transport
{
$trtype = ($withContent ? 'playlistPkg' : 'unknown' );
$trec = TransportRecord::create($this, $trtype, 'down',
- array_merge(array('gunid'=>$gunid, 'uid'=>$uid), $pars));
+ array_merge(array('gunid'=>$gunid, 'uid'=>$uid), $pars));
if (PEAR::isError($trec)) {
- return $trec;
+ return $trec;
}
$this->startCronJobProcess($trec->trtok);
return $trec->trtok;
@@ -447,33 +447,33 @@ class Transport
* @return string
* transport token
*/
-// function globalSearch($criteria, $resultMode='php', $pars=array())
-// {
-// global $CC_CONFIG, $CC_DBC;
-// // testing of hub availability and hub account configuration.
-// // it makes searchjob not async - should be removed for real async
-// $r = $this->loginToArchive();
-// if (PEAR::isError($r)) {
-// switch(intval($r->getCode())) {
-// case 802:
-// return PEAR::raiseError("Can't login to Hub ({$r->getMessage()})", TRERR_XR_FAIL);
-// case TRERR_XR_FAIL:
-// return PEAR::raiseError("Can't connect to Hub ({$r->getMessage()})", TRERR_XR_FAIL);
-// }
-// return $r;
-// }
-// $this->logoutFromArchive($r);
-// $criteria['resultMode'] = $resultMode;
-// $localfile = tempnam($CC_CONFIG['transDir'], 'searchjob_');
-// @chmod($localfile, 0660);
-// $len = file_put_contents($localfile, serialize($criteria));
-// $trec = $this->_uploadGeneralFileToHub($localfile, 'searchjob', $pars);
-// if (PEAR::isError($trec)) {
-// return $trec;
-// }
-// $this->startCronJobProcess($trec->trtok);
-// return $trec->trtok;
-// }
+ // function globalSearch($criteria, $resultMode='php', $pars=array())
+ // {
+ // global $CC_CONFIG, $CC_DBC;
+ // // testing of hub availability and hub account configuration.
+ // // it makes searchjob not async - should be removed for real async
+ // $r = $this->loginToArchive();
+ // if (PEAR::isError($r)) {
+ // switch(intval($r->getCode())) {
+ // case 802:
+ // return PEAR::raiseError("Can't login to Hub ({$r->getMessage()})", TRERR_XR_FAIL);
+ // case TRERR_XR_FAIL:
+ // return PEAR::raiseError("Can't connect to Hub ({$r->getMessage()})", TRERR_XR_FAIL);
+ // }
+ // return $r;
+ // }
+ // $this->logoutFromArchive($r);
+ // $criteria['resultMode'] = $resultMode;
+ // $localfile = tempnam($CC_CONFIG['transDir'], 'searchjob_');
+ // @chmod($localfile, 0660);
+ // $len = file_put_contents($localfile, serialize($criteria));
+ // $trec = $this->_uploadGeneralFileToHub($localfile, 'searchjob', $pars);
+ // if (PEAR::isError($trec)) {
+ // return $trec;
+ // }
+ // $this->startCronJobProcess($trec->trtok);
+ // return $trec->trtok;
+ // }
/**
@@ -486,60 +486,60 @@ class Transport
* @return array
* LS search result format (see localSearch)
*/
-// function getSearchResults($trtok, $andClose=TRUE)
-// {
-// $trec = TransportRecord::recall($this, $trtok);
-// if (PEAR::isError($trec)) {
-// return $trec;
-// }
-// $row = $trec->row;
-// switch ($st = $trec->getState()) {
-// case "failed":
-// return PEAR::raiseError(
-// "Transport::getSearchResults:".
-// " global search or results transport failed".
-// " ({$trec->row['errmsg']})"
-// );
-// case "closed":
-///*
-// $res = file_get_contents($row['localfile']);
-// $results = unserialize($res);
-// return $results;
-//*/
-// return PEAR::raiseError(
-// "Transport::getSearchResults:".
-// " closed transport token ($trtok)", TRERR_TOK
-// );
-// case "finished":
-// if ($row['direction'] == 'down') {
-// // really finished
-// $res = file_get_contents($row['localfile']);
-// $results = unserialize($res);
-// if ($andClose) {
-// $ret = $this->xmlrpcCall('archive.downloadClose',
-// array(
-// 'token' => $row['pdtoken'] ,
-// 'trtype' => $row['trtype'] ,
-// ));
-// if (PEAR::isError($ret)) {
-// return $ret;
-// }
-// @unlink($row['localfile']);
-// $r = $trec->close();
-// if (PEAR::isError($r)) {
-// return $r;
-// }
-// }
-// return $results;
-// }
-// // otherwise not really finished - only request upload finished
-// default:
-// return PEAR::raiseError(
-// "Transport::getSearchResults: not finished ($st)",
-// TRERR_NOTFIN
-// );
-// }
-// }
+ // function getSearchResults($trtok, $andClose=TRUE)
+ // {
+ // $trec = TransportRecord::recall($this, $trtok);
+ // if (PEAR::isError($trec)) {
+ // return $trec;
+ // }
+ // $row = $trec->row;
+ // switch ($st = $trec->getState()) {
+ // case "failed":
+ // return PEAR::raiseError(
+ // "Transport::getSearchResults:".
+ // " global search or results transport failed".
+ // " ({$trec->row['errmsg']})"
+ // );
+ // case "closed":
+ ///*
+ // $res = file_get_contents($row['localfile']);
+ // $results = unserialize($res);
+ // return $results;
+ //*/
+ // return PEAR::raiseError(
+ // "Transport::getSearchResults:".
+ // " closed transport token ($trtok)", TRERR_TOK
+ // );
+ // case "finished":
+ // if ($row['direction'] == 'down') {
+ // // really finished
+ // $res = file_get_contents($row['localfile']);
+ // $results = unserialize($res);
+ // if ($andClose) {
+ // $ret = $this->xmlrpcCall('archive.downloadClose',
+ // array(
+ // 'token' => $row['pdtoken'] ,
+ // 'trtype' => $row['trtype'] ,
+ // ));
+ // if (PEAR::isError($ret)) {
+ // return $ret;
+ // }
+ // @unlink($row['localfile']);
+ // $r = $trec->close();
+ // if (PEAR::isError($r)) {
+ // return $r;
+ // }
+ // }
+ // return $results;
+ // }
+ // // otherwise not really finished - only request upload finished
+ // default:
+ // return PEAR::raiseError(
+ // "Transport::getSearchResults: not finished ($st)",
+ // TRERR_NOTFIN
+ // );
+ // }
+ // }
/* ------------------------ methods for ls-archive-format file transports */
@@ -563,7 +563,7 @@ class Transport
}
$trec = $this->_uploadGeneralFileToHub($filePath, 'file', $pars);
if (PEAR::isError($trec)) {
- return $trec;
+ return $trec;
}
$this->startCronJobProcess($trec->trtok);
return $trec->trtok;
@@ -591,15 +591,15 @@ class Transport
global $CC_CONFIG, $CC_DBC;
$tmpn = tempnam($CC_CONFIG['transDir'], 'HITrans_');
$trec = TransportRecord::create($this, 'file', 'down',
- array_merge(array(
+ array_merge(array(
'url' => $url,
'localfile' => $tmpn,
'expectedsum' => $chsum,
'expectedsize' => $size,
- ), $pars)
+ ), $pars)
);
if (PEAR::isError($trec)) {
- return $trec;
+ return $trec;
}
$this->startCronJobProcess($trec->trtok);
return array('trtok'=>$trec->trtok, 'localfile'=>$tmpn);
@@ -616,9 +616,9 @@ class Transport
function getHubInitiatedTransfers()
{
$ret = $this->xmlrpcCall('archive.listHubInitiatedTransfers',
- array('target' => HOSTNAME));
+ array('target' => HOSTNAME));
if (PEAR::isError($ret)) {
- return $ret;
+ return $ret;
}
$res = array();
foreach ($ret as $it) {
@@ -642,87 +642,87 @@ class Transport
function startHubInitiatedTransfer($uid, $rtrtok)
{
$ret = $this->xmlrpcCall('archive.listHubInitiatedTransfers',
- array(
+ array(
'target' => HOSTNAME,
'trtok' => $rtrtok,
- ));
+ ));
if (PEAR::isError($ret)) {
- return $ret;
+ return $ret;
}
if (count($ret) != 1) {
return PEAR::raiseError(
"Transport::startHubInitiatedTransfer:".
" wrong number of transports (".count($ret).")"
- );
+ );
}
$ta = $ret[0];
// direction invertation to locstor point of view:
$direction = ( $ta['direction']=='up' ? 'down' : 'up' );
$gunid = $ta['gunid'];
switch ($direction) {
- case "up":
- switch ($ta['trtype']) {
- case "audioclip":
- case "playlist":
- case "playlistPkg":
- $trtok = $this->upload2Hub($gunid, TRUE,
- array('rtrtok'=>$rtrtok));
- if (PEAR::isError($trtok)) {
- return $trtok;
- }
- break;
- //case "searchjob": break; // not supported yet
- //case "file": break; // probably unusable
- default:
- return PEAR::raiseError(
- "Transport::startHubInitiatedTransfer:".
- " wrong direction / transport type combination".
- " ({$ta['direction']}/{$ta['trtype']})"
- );
- }
- break;
- case "down":
- switch ($ta['trtype']) {
- case "audioclip":
- case "playlist":
- case "playlistPkg":
- $trtok = $this->downloadFromHub($uid, $gunid, TRUE,
- array('rtrtok'=>$rtrtok));
- if (PEAR::isError($trtok)) {
- return $trtok;
- }
- break;
- //case "searchjob": break; // probably unusable
- case "file":
- $r = $this->downloadFileFromHub(
- $ta['url'], $ta['expectedsum'], $ta['expectedsize'],
+ case "up":
+ switch ($ta['trtype']) {
+ case "audioclip":
+ case "playlist":
+ case "playlistPkg":
+ $trtok = $this->upload2Hub($gunid, TRUE,
array('rtrtok'=>$rtrtok));
- if (PEAR::isError($r)) {
- return $r;
- }
- extract($r); // trtok, localfile
- break;
- default:
- return PEAR::raiseError(
+ if (PEAR::isError($trtok)) {
+ return $trtok;
+ }
+ break;
+ //case "searchjob": break; // not supported yet
+ //case "file": break; // probably unusable
+ default:
+ return PEAR::raiseError(
"Transport::startHubInitiatedTransfer:".
" wrong direction / transport type combination".
" ({$ta['direction']}/{$ta['trtype']})"
- );
- }
- break;
- default:
- return PEAR::raiseError(
+ );
+ }
+ break;
+ case "down":
+ switch ($ta['trtype']) {
+ case "audioclip":
+ case "playlist":
+ case "playlistPkg":
+ $trtok = $this->downloadFromHub($uid, $gunid, TRUE,
+ array('rtrtok'=>$rtrtok));
+ if (PEAR::isError($trtok)) {
+ return $trtok;
+ }
+ break;
+ //case "searchjob": break; // probably unusable
+ case "file":
+ $r = $this->downloadFileFromHub(
+ $ta['url'], $ta['expectedsum'], $ta['expectedsize'],
+ array('rtrtok'=>$rtrtok));
+ if (PEAR::isError($r)) {
+ return $r;
+ }
+ extract($r); // trtok, localfile
+ break;
+ default:
+ return PEAR::raiseError(
+ "Transport::startHubInitiatedTransfer:".
+ " wrong direction / transport type combination".
+ " ({$ta['direction']}/{$ta['trtype']})"
+ );
+ }
+ break;
+ default:
+ return PEAR::raiseError(
"Transport::startHubInitiatedTransfer: ???"
- );
+ );
}
$ret = $this->xmlrpcCall('archive.setHubInitiatedTransfer',
- array(
+ array(
'target' => HOSTNAME,
'trtok' => $rtrtok,
'state' => 'waiting',
- ));
+ ));
if (PEAR::isError($ret)) {
- return $ret;
+ return $ret;
}
$this->startCronJobProcess($trtok);
return $trtok;
@@ -742,10 +742,10 @@ class Transport
{
global $CC_CONFIG;
$res = $this->xmlrpcCall('locstor.login',
- array(
+ array(
'login' => $CC_CONFIG['archiveAccountLogin'],
'pass' => $CC_CONFIG['archiveAccountPass']
- ));
+ ));
if (PEAR::isError($res)) {
return $res;
}
@@ -764,7 +764,7 @@ class Transport
function logoutFromArchive($sessid)
{
$res = $this->xmlrpcCall('locstor.logout',
- array('sessid'=>$sessid));
+ array('sessid'=>$sessid));
return $res;
}
@@ -785,19 +785,19 @@ class Transport
if (is_null($direction)) {
$r = $this->cronMain('up');
if (PEAR::isError($r)) {
- return $r;
+ return $r;
}
$r = $this->cronMain('down');
if (PEAR::isError($r)) {
- return $r;
+ return $r;
}
return TRUE;
}
// fetch all opened transports
$transports = $this->getTransports($direction);
if (PEAR::isError($transports)) {
- $this->trLog("cronMain: DB error");
- return FALSE;
+ $this->trLog("cronMain: DB error");
+ return FALSE;
}
if (count($transports) == 0) {
if (TR_LOG_LEVEL > 1) {
@@ -828,9 +828,9 @@ class Transport
{
global $CC_CONFIG, $CC_DBC;
if (TR_LOG_LEVEL > 2) {
- $redirect = $CC_CONFIG['transDir']."/debug.log";
+ $redirect = $CC_CONFIG['transDir']."/debug.log";
} else {
- $redirect = "/dev/null";
+ $redirect = "/dev/null";
}
$redirect_escaped = escapeshellcmd($redirect);
$command = "{$this->cronJobScript} {$trtok}";
@@ -860,7 +860,7 @@ class Transport
global $CC_CONFIG;
$trec = TransportRecord::recall($this, $trtok);
if (PEAR::isError($trec)) {
- return $trec;
+ return $trec;
}
$row = $trec->row;
$state = $row['state'];
@@ -903,9 +903,9 @@ class Transport
$res = $pr->loadGroupPref($group, $key);
if (PEAR::isError($res)) {
if ($res->getCode() !== GBERR_PREF) {
- return $res;
+ return $res;
} else {
- $res = FALSE; // default
+ $res = FALSE; // default
}
}
// transfers turned off
@@ -913,7 +913,7 @@ class Transport
if ($res) {
return PEAR::raiseError(
"Transport::cronCallMethod: transfers turned off"
- );
+ );
}
// NO break here!
default:
@@ -922,7 +922,7 @@ class Transport
$pid = getmypid();
$r = $trec->setLock(TRUE, $pid);
if (PEAR::isError($r)) {
- return $r;
+ return $r;
}
$trec = TransportRecord::recall($this, $trtok);
if (PEAR::isError($trec)) {
@@ -954,7 +954,7 @@ class Transport
// unlock the job:
$r = $trec->setLock(FALSE);
if (PEAR::isError($r)) {
- return $r;
+ return $r;
}
// logout:
$r = $this->logoutFromArchive($asessid);
@@ -986,20 +986,20 @@ class Transport
$trtok = $row['trtok'];
$trec = TransportRecord::recall($this, $trtok);
if (PEAR::isError($trec)) {
- return $trec;
+ return $trec;
}
$ret = $this->xmlrpcCall('archive.uploadOpen',
- array(
+ array(
'sessid' => $asessid ,
'chsum' => $row['expectedsum'],
- ));
+ ));
if (PEAR::isError($ret)) {
- return $ret;
+ return $ret;
}
$r = $trec->setState('waiting',
- array('url'=>$ret['url'], 'pdtoken'=>$ret['token']));
+ array('url'=>$ret['url'], 'pdtoken'=>$ret['token']));
if (PEAR::isError($r)) {
- return $r;
+ return $r;
}
return TRUE;
}
@@ -1021,57 +1021,57 @@ class Transport
$trtok = $row['trtok'];
$trec = TransportRecord::recall($this, $trtok);
if (PEAR::isError($trec)) {
- return $trec;
+ return $trec;
}
$ret = $this->xmlrpcCall('archive.downloadOpen',
- array(
+ array(
'sessid'=> $asessid,
'trtype'=> $row['trtype'],
'pars'=>array(
'gunid' => $row['gunid'],
'token' => $row['pdtoken'],
- ),
- ));
+ ),
+ ));
if (PEAR::isError($ret)) {
- return $ret;
+ return $ret;
}
$trtype = $ret['trtype'];
$title = $ret['title'];
$pars = array();
switch ($trtype) {
-// case "searchjob":
-// $r = $trec->setState('waiting', $pars);
-// break;
- case "file":
- $r = $trec->setState('waiting',array_merge($pars, array(
+ // case "searchjob":
+ // $r = $trec->setState('waiting', $pars);
+ // break;
+ case "file":
+ $r = $trec->setState('waiting',array_merge($pars, array(
'trtype'=>$trtype,
'url'=>$ret['url'], 'pdtoken'=>$ret['token'],
'expectedsum'=>$ret['chsum'], 'expectedsize'=>$ret['size'],
'fname'=>$ret['filename'],
'localfile'=>$CC_CONFIG['transDir']."/$trtok",
- )));
- break;
- case "audioclip":
- $mdtrec = TransportRecord::create($this, 'metadata', 'down',
- array('gunid'=>$row['gunid'], 'uid'=>$row['uid'], )
- );
- if (PEAR::isError($mdtrec)) {
- return $mdtrec;
- }
- $this->startCronJobProcess($mdtrec->trtok);
- $pars = array('mdtrtok'=>$mdtrec->trtok);
- // NO break here !
- default:
- $r = $trec->setState('waiting',array_merge($pars, array(
+ )));
+ break;
+ case "audioclip":
+ $mdtrec = TransportRecord::create($this, 'metadata', 'down',
+ array('gunid'=>$row['gunid'], 'uid'=>$row['uid'], )
+ );
+ if (PEAR::isError($mdtrec)) {
+ return $mdtrec;
+ }
+ $this->startCronJobProcess($mdtrec->trtok);
+ $pars = array('mdtrtok'=>$mdtrec->trtok);
+ // NO break here !
+ default:
+ $r = $trec->setState('waiting',array_merge($pars, array(
'trtype'=>$trtype,
'url'=>$ret['url'], 'pdtoken'=>$ret['token'],
'expectedsum'=>$ret['chsum'], 'expectedsize'=>$ret['size'],
'fname'=>$ret['filename'], 'title'=>$title,
'localfile'=>$CC_CONFIG['transDir']."/$trtok",
- )));
+ )));
}
if (PEAR::isError($r)) {
- return $r;
+ return $r;
}
return TRUE;
}
@@ -1092,7 +1092,7 @@ class Transport
$trtok = $row['trtok'];
$check = $this->uploadCheck($row['pdtoken']);
if (PEAR::isError($check)) {
- return $check;
+ return $check;
}
// test filesize
if (!file_exists($row['localfile'])) {
@@ -1102,7 +1102,7 @@ class Transport
}
$trec = TransportRecord::recall($this, $trtok);
if (PEAR::isError($trec)) {
- return $trec;
+ return $trec;
}
$size = escapeshellarg($check['size']);
$localfile = escapeshellarg($row['localfile']);
@@ -1112,22 +1112,22 @@ class Transport
" --speed-time {$this->upTrSpeedTime}".
" --speed-limit {$this->upTrSpeedLimit}".
" --connect-timeout {$this->upTrConnectTimeout}".
- (!is_null($this->upLimitRate)?
+ (!is_null($this->upLimitRate)?
" --limit-rate {$this->upLimitRate}" : "").
" -T $localfile $url";
$r = $trec->setState('pending', array(), 'waiting');
if (PEAR::isError($r)) {
- return $r;
+ return $r;
}
if ($r === FALSE) {
- return TRUE;
+ return TRUE;
}
$res = system($command, $status);
// leave paused and closed transports
$trec2 = TransportRecord::recall($this, $trtok);
if (PEAR::isError($trec)) {
- return $trec;
+ return $trec;
}
$state2 = $trec2->row['state'];
if ($state2 == 'paused' || $state2 == 'closed' ) {
@@ -1144,22 +1144,22 @@ class Transport
if ($status == 0 || $status == 18 || $status == 28 || $status == 6 || $status == 7 || $status == 56) {
$check = $this->uploadCheck($row['pdtoken']);
if (PEAR::isError($check)) {
- return $check;
+ return $check;
}
// test checksum
if ($check['status'] == TRUE) {
// finished
$r = $trec->setState('finished',
- array('realsum'=>$check['realsum'], 'realsize'=>$check['size']));
+ array('realsum'=>$check['realsum'], 'realsize'=>$check['size']));
if (PEAR::isError($r)) {
- return $r;
+ return $r;
}
} else {
if (intval($check['size']) < $row['expectedsize']) {
$r = $trec->setState('waiting',
- array('realsum'=>$check['realsum'], 'realsize'=>$check['size']));
+ array('realsum'=>$check['realsum'], 'realsize'=>$check['size']));
if (PEAR::isError($r)) {
- return $r;
+ return $r;
}
} else {
// wrong md5 at finish - TODO: start again
@@ -1197,7 +1197,7 @@ class Transport
// wget the file
$trec = TransportRecord::recall($this, $trtok);
if (PEAR::isError($trec)) {
- return $trec;
+ return $trec;
}
$localfile = escapeshellarg($row['localfile']);
$url = escapeshellarg($row['url']);
@@ -1206,23 +1206,23 @@ class Transport
" --read-timeout={$this->downTimeout}".
" --waitretry={$this->downWaitretry}".
" -t {$this->downRetries}".
- (!is_null($this->downLimitRate)?
+ (!is_null($this->downLimitRate)?
" --limit-rate={$this->downLimitRate}" : "").
" -O $localfile $url"
;
$r = $trec->setState('pending', array(), 'waiting');
if (PEAR::isError($r)) {
- return $r;
+ return $r;
}
if ($r === FALSE) {
- return TRUE;
+ return TRUE;
}
$res = system($command, $status);
// leave paused and closed transports
$trec2 = TransportRecord::recall($this, $trtok);
if (PEAR::isError($trec)) {
- return $trec;
+ return $trec;
}
$state2 = $trec2->row['state'];
if ($state2 == 'paused' || $state2 == 'closed' ) {
@@ -1242,7 +1242,7 @@ class Transport
if ($chsum == $row['expectedsum']) {
// mark download as finished
$r = $trec->setState('finished',
- array('realsum'=>$chsum, 'realsize'=>$size));
+ array('realsum'=>$chsum, 'realsize'=>$size));
if (PEAR::isError($r)) {
return $r;
}
@@ -1250,7 +1250,7 @@ class Transport
// bad checksum, retry from the scratch
@unlink($row['localfile']);
$r = $trec->setState('waiting',
- array('realsum'=>$chsum, 'realsize'=>$size));
+ array('realsum'=>$chsum, 'realsize'=>$size));
if (PEAR::isError($r)) {
return $r;
}
@@ -1276,17 +1276,17 @@ class Transport
$trtok = $row['trtok'];
$trec = TransportRecord::recall($this, $trtok);
if (PEAR::isError($trec)) {
- return $trec;
+ return $trec;
}
// don't close metadata transport - audioclip will close it
if ($row['trtype'] == 'metadata') {
- return TRUE;
+ return TRUE;
}
// handle metadata transport on audioclip trtype:
if ($row['trtype'] == 'audioclip') {
$mdtrec = TransportRecord::recall($this, $trec->row['mdtrtok']);
if (PEAR::isError($mdtrec)) {
- return $mdtrec;
+ return $mdtrec;
}
switch ($mdtrec->row['state']) {
case 'failed':
@@ -1296,7 +1296,7 @@ class Transport
" ({$this->trtok})"
);
break;
- // don't close transport with nonfinished metadata transport:
+ // don't close transport with nonfinished metadata transport:
case 'init':
case 'waiting':
case 'pending':
@@ -1306,18 +1306,18 @@ class Transport
$mdpdtoken = $mdtrec->row['pdtoken'];
}
} else {
- $mdpdtoken = NULL;
+ $mdpdtoken = NULL;
}
$ret = $this->xmlrpcCall('archive.uploadClose',
- array(
+ array(
'token' => $row['pdtoken'] ,
'trtype' => $row['trtype'],
'pars' => array(
'gunid' => $row['gunid'],
'name' => $row['fname'],
'mdpdtoken' => $mdpdtoken,
- ),
- ));
+ ),
+ ));
if (PEAR::isError($ret)) {
if ($row['trtype'] == 'audioclip') {
$r2 = $mdtrec->close();
@@ -1325,29 +1325,29 @@ class Transport
return $ret;
}
-// if ($row['trtype'] == 'searchjob') {
-// @unlink($row['localfile']);
-// $r = $trec->setState('init', array(
-// 'direction' => 'down',
-// 'pdtoken' => $ret['token'],
-// 'expectedsum' => $ret['chsum'],
-// 'expectedsize' => $ret['size'],
-// 'url' => $ret['url'],
-// 'realsize' => 0,
-// ));
-// $this->startCronJobProcess($trec->trtok);
-// } else {
- $r = $trec->close();
-// }
+ // if ($row['trtype'] == 'searchjob') {
+ // @unlink($row['localfile']);
+ // $r = $trec->setState('init', array(
+ // 'direction' => 'down',
+ // 'pdtoken' => $ret['token'],
+ // 'expectedsum' => $ret['chsum'],
+ // 'expectedsize' => $ret['size'],
+ // 'url' => $ret['url'],
+ // 'realsize' => 0,
+ // ));
+ // $this->startCronJobProcess($trec->trtok);
+ // } else {
+ $r = $trec->close();
+ // }
if (PEAR::isError($r)) {
- return $r;
+ return $r;
}
switch ($row['trtype']) {
case 'audioclip':
// close metadata transport:
$r = $mdtrec->close();
if (PEAR::isError($r)) {
- return $r;
+ return $r;
}
break;
case 'playlistPkg':
@@ -1357,7 +1357,7 @@ class Transport
if (preg_match("|/(plExport_[^\.]+)\.lspl$|", $ep, $va)) {
list(,$tmpn) = $va; $tmpn = $CC_CONFIG['transDir']."/$tmpn";
if (file_exists($tmpn)) {
- @unlink($tmpn);
+ @unlink($tmpn);
}
}
@@ -1366,238 +1366,238 @@ class Transport
}
return TRUE;
- }
-
-
- /**
- * Finish the download
- *
- * @param array $row
- * row from getTransport results
- * @param string $asessid
- * session id (from network hub)
- * @return mixed
- * boolean TRUE or error object
- */
- function cronDownloadFinished($row, $asessid)
- {
- $trtok = $row['trtok'];
- $trec = TransportRecord::recall($this, $trtok);
- if (PEAR::isError($trec)) {
- return $trec;
}
- switch ($row['trtype']) {
- case "audioclip":
- $mdtrtok = $trec->row['mdtrtok'];
- $mdtrec = TransportRecord::recall($this, $mdtrtok);
- if (PEAR::isError($mdtrec)) {
- return $mdtrec;
- }
- $pid = getmypid();
- $r = $mdtrec->setLock(TRUE, $pid);
- if (PEAR::isError($r)) {
- return $r;
- }
- switch ($mdtrec->row['state']) {
- // don't close transport with nonfinished metadata transport:
- case 'init':
- case 'waiting':
- case 'pending':
- case 'paused':
- $r = $mdtrec->setLock(FALSE);
- if (PEAR::isError($r)) {
- return $r;
- }
- return TRUE;
- case 'finished': // metadata finished, close main transport
- $values = array(
+
+
+ /**
+ * Finish the download
+ *
+ * @param array $row
+ * row from getTransport results
+ * @param string $asessid
+ * session id (from network hub)
+ * @return mixed
+ * boolean TRUE or error object
+ */
+ function cronDownloadFinished($row, $asessid)
+ {
+ $trtok = $row['trtok'];
+ $trec = TransportRecord::recall($this, $trtok);
+ if (PEAR::isError($trec)) {
+ return $trec;
+ }
+ switch ($row['trtype']) {
+ case "audioclip":
+ $mdtrtok = $trec->row['mdtrtok'];
+ $mdtrec = TransportRecord::recall($this, $mdtrtok);
+ if (PEAR::isError($mdtrec)) {
+ return $mdtrec;
+ }
+ $pid = getmypid();
+ $r = $mdtrec->setLock(TRUE, $pid);
+ if (PEAR::isError($r)) {
+ return $r;
+ }
+ switch ($mdtrec->row['state']) {
+ // don't close transport with nonfinished metadata transport:
+ case 'init':
+ case 'waiting':
+ case 'pending':
+ case 'paused':
+ $r = $mdtrec->setLock(FALSE);
+ if (PEAR::isError($r)) {
+ return $r;
+ }
+ return TRUE;
+ case 'finished': // metadata finished, close main transport
+ $values = array(
"filename" => $row['fname'],
"filepath" => $trec->row['localfile'],
"metadata" => $mdtrec->row['localfile'],
"gunid" => $row['gunid'],
"filetype" => "audioclip"
- );
- $storedFile = StoredFile::Insert($values);
- if (PEAR::isError($storedFile)) {
- $mdtrec->setLock(FALSE);
- return $storedFile;
- }
- $res = $storedFile->getId();
- $ret = $this->xmlrpcCall('archive.downloadClose',
+ );
+ $storedFile = StoredFile::Insert($values);
+ if (PEAR::isError($storedFile)) {
+ $mdtrec->setLock(FALSE);
+ return $storedFile;
+ }
+ $res = $storedFile->getId();
+ $ret = $this->xmlrpcCall('archive.downloadClose',
array(
'token' => $mdtrec->row['pdtoken'] ,
'trtype' => 'metadata' ,
));
- if (PEAR::isError($ret)) {
- $mdtrec->setLock(FALSE);
- return $ret;
- }
- $r = $mdtrec->close();
- if (PEAR::isError($r)) {
- $r2 = $mdtrec->setLock(FALSE);
- return $r;
- }
- @unlink($trec->row['localfile']);
- @unlink($mdtrec->row['localfile']);
- break;
- default:
- $r = $mdtrec->setLock(FALSE);
- return PEAR::raiseError("Transport::cronDownloadFinished:".
+ if (PEAR::isError($ret)) {
+ $mdtrec->setLock(FALSE);
+ return $ret;
+ }
+ $r = $mdtrec->close();
+ if (PEAR::isError($r)) {
+ $r2 = $mdtrec->setLock(FALSE);
+ return $r;
+ }
+ @unlink($trec->row['localfile']);
+ @unlink($mdtrec->row['localfile']);
+ break;
+ default:
+ $r = $mdtrec->setLock(FALSE);
+ return PEAR::raiseError("Transport::cronDownloadFinished:".
" metadata transport in wrong state: {$mdtrec->row['state']}".
" ({$this->trtok})"
- );
- }
- $r = $mdtrec->setLock(FALSE);
- if (PEAR::isError($r)) {
- return $r;
- }
- break;
- case "metadata":
-// case "searchjob":
- return TRUE; // don't close - getSearchResults should close it
- break;
- }
- $ret = $this->xmlrpcCall('archive.downloadClose',
+ );
+ }
+ $r = $mdtrec->setLock(FALSE);
+ if (PEAR::isError($r)) {
+ return $r;
+ }
+ break;
+ case "metadata":
+ // case "searchjob":
+ return TRUE; // don't close - getSearchResults should close it
+ break;
+ }
+ $ret = $this->xmlrpcCall('archive.downloadClose',
array(
'token' => $row['pdtoken'] ,
'trtype' => $row['trtype'] ,
));
- if (PEAR::isError($ret)) {
- return $ret;
- }
- switch ($row['trtype']) {
- case "playlist":
- $values = array(
+ if (PEAR::isError($ret)) {
+ return $ret;
+ }
+ switch ($row['trtype']) {
+ case "playlist":
+ $values = array(
"filename" => $row['fname'],
"metadata" => $trec->row['localfile'],
"gunid" => $row['gunid'],
"filetype" => "playlist"
- );
- $storedFile = StoredFile::Insert($values);
- if (PEAR::isError($storedFile)) {
- return $storedFile;
- }
- $res = $storedFile->getId();
- @unlink($row['localfile']);
- break;
- case "playlistPkg":
- $subjid = $trec->row['uid'];
- $fname = $trec->row['localfile'];
- $res = $this->gb->bsImportPlaylist($fname, $subjid);
- if (PEAR::isError($res)) {
- return $res;
- }
- @unlink($fname);
- break;
- case "audioclip":
- case "metadata":
-// case "searchjob":
- case "file":
- break;
- default:
- return PEAR::raiseError("DEBUG: NotImpl ".var_export($row,TRUE));
- }
- if (!is_null($rtrtok = $trec->row['rtrtok'])) {
- $ret = $this->xmlrpcCall('archive.setHubInitiatedTransfer',
+ );
+ $storedFile = StoredFile::Insert($values);
+ if (PEAR::isError($storedFile)) {
+ return $storedFile;
+ }
+ $res = $storedFile->getId();
+ @unlink($row['localfile']);
+ break;
+ case "playlistPkg":
+ $subjid = $trec->row['uid'];
+ $fname = $trec->row['localfile'];
+ $res = $this->gb->bsImportPlaylist($fname, $subjid);
+ if (PEAR::isError($res)) {
+ return $res;
+ }
+ @unlink($fname);
+ break;
+ case "audioclip":
+ case "metadata":
+ // case "searchjob":
+ case "file":
+ break;
+ default:
+ return PEAR::raiseError("DEBUG: NotImpl ".var_export($row,TRUE));
+ }
+ if (!is_null($rtrtok = $trec->row['rtrtok'])) {
+ $ret = $this->xmlrpcCall('archive.setHubInitiatedTransfer',
array(
'target' => HOSTNAME,
'trtok' => $rtrtok,
'state' => 'closed',
));
- if (PEAR::isError($ret)) {
- return $ret;
+ if (PEAR::isError($ret)) {
+ return $ret;
+ }
}
+ $r = $trec->close();
+ if (PEAR::isError($r)) {
+ return $r;
+ }
+ return TRUE;
}
- $r = $trec->close();
- if (PEAR::isError($r)) {
- return $r;
- }
- return TRUE;
- }
- /* ==================================================== auxiliary methods */
- /**
- * Prepare upload for general file
- *
- * @param string $fpath
- * local filepath of uploaded file
- * @param string $trtype
- * transport type
- * @param array $pars
- * default parameters (optional, internal use)
- * @return object - transportRecord instance
- */
- function _uploadGeneralFileToHub($fpath, $trtype, $pars=array())
- {
- $chsum = $this->_chsum($fpath);
- $size = filesize($fpath);
- $trec = TransportRecord::create($this, $trtype, 'up',
+ /* ==================================================== auxiliary methods */
+ /**
+ * Prepare upload for general file
+ *
+ * @param string $fpath
+ * local filepath of uploaded file
+ * @param string $trtype
+ * transport type
+ * @param array $pars
+ * default parameters (optional, internal use)
+ * @return object - transportRecord instance
+ */
+ function _uploadGeneralFileToHub($fpath, $trtype, $pars=array())
+ {
+ $chsum = $this->_chsum($fpath);
+ $size = filesize($fpath);
+ $trec = TransportRecord::create($this, $trtype, 'up',
array_merge(array(
'localfile'=>$fpath, 'fname'=>basename($fpath),
'expectedsum'=>$chsum, 'expectedsize'=>$size
), $pars)
- );
- if (PEAR::isError($trec)) {
- return $trec;
+ );
+ if (PEAR::isError($trec)) {
+ return $trec;
+ }
+ return $trec;
}
- return $trec;
- }
- /**
- * Create new transport token
- *
- * @return string
- * transport token
- */
- function _createTransportToken()
- {
- $ip = (isset($_SERVER['SERVER_ADDR']) ? $_SERVER['SERVER_ADDR'] : '');
- $initString = microtime().$ip.rand()."org.mdlf.campcaster";
- $hash = md5($initString);
- $res = substr($hash, 0, 16);
- return $res;
- }
+ /**
+ * Create new transport token
+ *
+ * @return string
+ * transport token
+ */
+ function _createTransportToken()
+ {
+ $ip = (isset($_SERVER['SERVER_ADDR']) ? $_SERVER['SERVER_ADDR'] : '');
+ $initString = microtime().$ip.rand()."org.mdlf.campcaster";
+ $hash = md5($initString);
+ $res = substr($hash, 0, 16);
+ return $res;
+ }
- /**
- * Get all relevant transport records
- *
- * @param string $direction
- * 'up' | 'down'
- * @param string $target
- * target hostname
- * @param string $trtok
- * transport token for specific query
- * @return array
- * array of transportRecords (as hasharrays)
- */
- function getTransports($direction=NULL, $target=NULL, $trtok=NULL)
- {
- global $CC_CONFIG, $CC_DBC;
- switch ($direction) {
- case 'up':
- $dirCond = "direction='up' AND";
- break;
- case 'down':
- $dirCond = "direction='down' AND";
- break;
- default:
- $dirCond = '';
- break;
- }
- if (is_null($target)) {
- $targetCond = "";
- } else {
- $targetCond = "target='$target' AND";
- }
- if (is_null($trtok)) {
- $trtokCond = "";
- } else {
- $trtokCond = "trtok='$trtok' AND";
- }
- $rows = $CC_DBC->getAll("
+ /**
+ * Get all relevant transport records
+ *
+ * @param string $direction
+ * 'up' | 'down'
+ * @param string $target
+ * target hostname
+ * @param string $trtok
+ * transport token for specific query
+ * @return array
+ * array of transportRecords (as hasharrays)
+ */
+ function getTransports($direction=NULL, $target=NULL, $trtok=NULL)
+ {
+ global $CC_CONFIG, $CC_DBC;
+ switch ($direction) {
+ case 'up':
+ $dirCond = "direction='up' AND";
+ break;
+ case 'down':
+ $dirCond = "direction='down' AND";
+ break;
+ default:
+ $dirCond = '';
+ break;
+ }
+ if (is_null($target)) {
+ $targetCond = "";
+ } else {
+ $targetCond = "target='$target' AND";
+ }
+ if (is_null($trtok)) {
+ $trtokCond = "";
+ } else {
+ $trtokCond = "trtok='$trtok' AND";
+ }
+ $rows = $CC_DBC->getAll("
SELECT
id, trtok, state, trtype, direction,
to_hex(gunid)as gunid, to_hex(pdtoken)as pdtoken,
@@ -1608,225 +1608,225 @@ class Transport
state not in ('closed', 'failed', 'paused')
ORDER BY start DESC
");
- if (PEAR::isError($rows)) {
- return $rows;
+ if (PEAR::isError($rows)) {
+ return $rows;
+ }
+ foreach ($rows as $i => $row) {
+ $rows[$i]['pdtoken'] = StoredFile::NormalizeGunid($row['pdtoken']);
+ $rows[$i]['gunid'] = StoredFile::NormalizeGunid($row['gunid']);
+ }
+ return $rows;
}
- foreach ($rows as $i => $row) {
- $rows[$i]['pdtoken'] = StoredFile::NormalizeGunid($row['pdtoken']);
- $rows[$i]['gunid'] = StoredFile::NormalizeGunid($row['gunid']);
- }
- return $rows;
- }
- /**
- * Check remote state of uploaded file
- *
- * @param string $pdtoken
- * put/download token (from network hub)
- * @return array
- * hash: chsum, size, url
- */
- function uploadCheck($pdtoken)
- {
- $ret = $this->xmlrpcCall('archive.uploadCheck',
+ /**
+ * Check remote state of uploaded file
+ *
+ * @param string $pdtoken
+ * put/download token (from network hub)
+ * @return array
+ * hash: chsum, size, url
+ */
+ function uploadCheck($pdtoken)
+ {
+ $ret = $this->xmlrpcCall('archive.uploadCheck',
array('token'=>$pdtoken));
- return $ret;
- }
+ return $ret;
+ }
- /**
- * Ping to remote Campcaster server
- *
- * @return string
- * network hub response or error object
- */
- function ping()
- {
- $res = $this->xmlrpcCall('ping',
+ /**
+ * Ping to remote Campcaster server
+ *
+ * @return string
+ * network hub response or error object
+ */
+ function ping()
+ {
+ $res = $this->xmlrpcCall('ping',
array('par'=>'ping_'.date('H:i:s')));
- return $res;
- }
+ return $res;
+ }
- /**
- * XMLRPC call to network hub.
- *
- * @param string $method
- * method name
- * @param array $pars
- * call parameters
- * @return mixed
- * response
- */
- function xmlrpcCall($method, $pars=array())
- {
- global $CC_CONFIG;
- $xrp = XML_RPC_encode($pars);
+ /**
+ * XMLRPC call to network hub.
+ *
+ * @param string $method
+ * method name
+ * @param array $pars
+ * call parameters
+ * @return mixed
+ * response
+ */
+ function xmlrpcCall($method, $pars=array())
+ {
+ global $CC_CONFIG;
+ $xrp = XML_RPC_encode($pars);
- $pr = new Prefs($this->gb);
- $group = $CC_CONFIG["StationPrefsGr"];
- $key = 'archiveServerLocation';
- $archiveUrl = $pr->loadGroupPref($group, $key, false);
+ $pr = new Prefs($this->gb);
+ $group = $CC_CONFIG["StationPrefsGr"];
+ $key = 'archiveServerLocation';
+ $archiveUrl = $pr->loadGroupPref($group, $key, false);
- if ($archiveUrl) {
- $archiveUrlInfo = parse_url($archiveUrl);
- if ($archiveUrlInfo['port']) {
- $port = $archiveUrlInfo['port'];
+ if ($archiveUrl) {
+ $archiveUrlInfo = parse_url($archiveUrl);
+ if ($archiveUrlInfo['port']) {
+ $port = $archiveUrlInfo['port'];
+ }
+ else {
+ $port = 80;
+ }
+
+ $c = new XML_RPC_Client($archiveUrlInfo['path'], $archiveUrlInfo['host'], $port);
}
else {
- $port = 80;
- }
-
- $c = new XML_RPC_Client($archiveUrlInfo['path'], $archiveUrlInfo['host'], $port);
- }
- else {
- $c = new XML_RPC_Client(
+ $c = new XML_RPC_Client(
$CC_CONFIG['archiveUrlPath']."/".$CC_CONFIG['archiveXMLRPC'],
$CC_CONFIG['archiveUrlHost'], $CC_CONFIG['archiveUrlPort']
- );
- }
+ );
+ }
- $f = new XML_RPC_Message($method, array($xrp));
- $r = $c->send($f);
- if (!$r) {
- return PEAR::raiseError("XML-RPC request failed", TRERR_XR_FAIL);
- } elseif ($r->faultCode() > 0) {
- return PEAR::raiseError($r->faultString(), $r->faultCode());
- // return PEAR::raiseError($r->faultString().
- // " (code ".$r->faultCode().")", TRERR_XR_FAIL);
- } else {
- $v = $r->value();
- return XML_RPC_decode($v);
- }
- }
-
-
- /**
- * Checksum of local file
- *
- * @param string $fpath
- * local filepath
- * @return string
- * checksum
- */
- function _chsum($fpath)
- {
- return md5_file($fpath);
- }
-
-
- /**
- * Check exception and eventually mark transport as failed
- *
- * @param mixed $res
- * result object to be checked
- * @param unknown $trec
- * transport record object
- * @return unknown
- */
- function _failFatal($res, $trec)
- {
- if (PEAR::isError($res)) {
- switch ($res->getCode()) {
- // non fatal:
- case TRERR_XR_FAIL:
- break;
- // fatal:
- default:
- $trec->fail('', $res);
+ $f = new XML_RPC_Message($method, array($xrp));
+ $r = $c->send($f);
+ if (!$r) {
+ return PEAR::raiseError("XML-RPC request failed", TRERR_XR_FAIL);
+ } elseif ($r->faultCode() > 0) {
+ return PEAR::raiseError($r->faultString(), $r->faultCode());
+ // return PEAR::raiseError($r->faultString().
+ // " (code ".$r->faultCode().")", TRERR_XR_FAIL);
+ } else {
+ $v = $r->value();
+ return XML_RPC_decode($v);
}
}
- return $res;
- }
- /**
- * Clean up transport jobs
- *
- * @param string $interval
- * psql time interval - older closed jobs will be deleted
- * @param boolean $forced
- * if true, delete non-closed jobs too
- * @return boolean true or error
- */
- function _cleanUp($interval='1 minute'/*'1 hour'*/, $forced=FALSE)
- {
- global $CC_CONFIG, $CC_DBC;
- $cond = ($forced ? '' : " AND state='closed' AND lock = 'N'");
- $r = $CC_DBC->query("
+ /**
+ * Checksum of local file
+ *
+ * @param string $fpath
+ * local filepath
+ * @return string
+ * checksum
+ */
+ function _chsum($fpath)
+ {
+ return md5_file($fpath);
+ }
+
+
+ /**
+ * Check exception and eventually mark transport as failed
+ *
+ * @param mixed $res
+ * result object to be checked
+ * @param unknown $trec
+ * transport record object
+ * @return unknown
+ */
+ function _failFatal($res, $trec)
+ {
+ if (PEAR::isError($res)) {
+ switch ($res->getCode()) {
+ // non fatal:
+ case TRERR_XR_FAIL:
+ break;
+ // fatal:
+ default:
+ $trec->fail('', $res);
+ }
+ }
+ return $res;
+ }
+
+
+ /**
+ * Clean up transport jobs
+ *
+ * @param string $interval
+ * psql time interval - older closed jobs will be deleted
+ * @param boolean $forced
+ * if true, delete non-closed jobs too
+ * @return boolean true or error
+ */
+ function _cleanUp($interval='1 minute'/*'1 hour'*/, $forced=FALSE)
+ {
+ global $CC_CONFIG, $CC_DBC;
+ $cond = ($forced ? '' : " AND state='closed' AND lock = 'N'");
+ $r = $CC_DBC->query("
DELETE FROM ".$CC_CONFIG['transTable']."
WHERE ts < now() - interval '$interval'".$cond
- );
- if (PEAR::isError($r)) {
- return $r;
- }
- return TRUE;
- }
-
-
- /**
- * Logging wrapper for PEAR error object
- *
- * @param string $txt
- * log message
- * @param PEAR_Error $eo
- * @param array $row
- * array returned from getRow
- * @return mixed
- * void or error object
- */
- function trLogPear($txt, $eo, $row=NULL)
- {
- $msg = $txt.$eo->getMessage()." ".$eo->getUserInfo().
- " [".$eo->getCode()."]";
- if (!is_null($row)) {
- $trec = TransportRecord::recall($this, $row['trtok']);
- if (!PEAR::isError($trec)) {
- $trec->setState('failed', array('errmsg'=>$msg));
- }
- $msg .= "\n ".serialize($row);
- }
- $this->trLog($msg);
- }
-
-
- /**
- * Logging for debug transports
- *
- * @param string $msg
- * log message
- * @return mixed
- * void or error object
- */
- function trLog($msg)
- {
- global $CC_CONFIG;
- $logfile = $CC_CONFIG['transDir']."/activity.log";
- if (FALSE === ($fp = fopen($logfile, "a"))) {
- return PEAR::raiseError(
- "Transport::trLog: Can't write to log ($logfile)"
);
+ if (PEAR::isError($r)) {
+ return $r;
+ }
+ return TRUE;
}
- flock($fp,LOCK_SH);
- fputs($fp, "---".date("H:i:s")."---\n $msg\n");
- flock($fp,LOCK_UN);
- fclose($fp);
- }
- /* ====================================================== install methods */
- /**
- * Delete all transports
- *
- * @return mixed
- * void or error object
- */
- function resetData()
- {
- global $CC_CONFIG, $CC_DBC;
- return $CC_DBC->query("DELETE FROM ".$CC_CONFIG['transTable']);
- }
+ /**
+ * Logging wrapper for PEAR error object
+ *
+ * @param string $txt
+ * log message
+ * @param PEAR_Error $eo
+ * @param array $row
+ * array returned from getRow
+ * @return mixed
+ * void or error object
+ */
+ function trLogPear($txt, $eo, $row=NULL)
+ {
+ $msg = $txt.$eo->getMessage()." ".$eo->getUserInfo().
+ " [".$eo->getCode()."]";
+ if (!is_null($row)) {
+ $trec = TransportRecord::recall($this, $row['trtok']);
+ if (!PEAR::isError($trec)) {
+ $trec->setState('failed', array('errmsg'=>$msg));
+ }
+ $msg .= "\n ".serialize($row);
+ }
+ $this->trLog($msg);
+ }
+
+
+ /**
+ * Logging for debug transports
+ *
+ * @param string $msg
+ * log message
+ * @return mixed
+ * void or error object
+ */
+ function trLog($msg)
+ {
+ global $CC_CONFIG;
+ $logfile = $CC_CONFIG['transDir']."/activity.log";
+ if (FALSE === ($fp = fopen($logfile, "a"))) {
+ return PEAR::raiseError(
+ "Transport::trLog: Can't write to log ($logfile)"
+ );
+ }
+ flock($fp,LOCK_SH);
+ fputs($fp, "---".date("H:i:s")."---\n $msg\n");
+ flock($fp,LOCK_UN);
+ fclose($fp);
+ }
+
+
+ /* ====================================================== install methods */
+ /**
+ * Delete all transports
+ *
+ * @return mixed
+ * void or error object
+ */
+ function resetData()
+ {
+ global $CC_CONFIG, $CC_DBC;
+ return $CC_DBC->query("DELETE FROM ".$CC_CONFIG['transTable']);
+ }
}
diff --git a/backend/TransportRecord.php b/backend/TransportRecord.php
index 9a491e7eb..6c804279c 100644
--- a/backend/TransportRecord.php
+++ b/backend/TransportRecord.php
@@ -12,9 +12,9 @@ define('TR_LEAVE_CLOSED', TRUE);
*/
class TransportRecord
{
- /**
- * @var DB
- */
+ /**
+ * @var DB
+ */
//public $dbc;
/**
@@ -72,12 +72,12 @@ class TransportRecord
$trec = new TransportRecord($tr);
$trec->trtok = $trtok = $tr->_createTransportToken();
$trec->row = array_merge($defaults,
- array('trtype'=>$trtype, 'direction'=>$direction));
+ array('trtype'=>$trtype, 'direction'=>$direction));
$trec->recalled = TRUE;
if (!isset($defaults['title'])) {
$defaults['title'] = $trec->getTitle();
if (PEAR::isError($defaults['title'])) {
- return $defaults['title'];
+ return $defaults['title'];
}
}
$id = $CC_DBC->nextId($CC_CONFIG['transSequence']);
@@ -96,7 +96,7 @@ class TransportRecord
";
$res = $CC_DBC->query($query);
if (PEAR::isError($res)) {
- return $res;
+ return $res;
}
return $trec;
}
@@ -126,7 +126,7 @@ class TransportRecord
WHERE trtok='$trtok'
");
if (PEAR::isError($row)) {
- return $row;
+ return $row;
}
if (is_null($row)) {
return PEAR::raiseError("TransportRecord::recall:".
@@ -170,16 +170,16 @@ class TransportRecord
UPDATE ".$CC_CONFIG['transTable']."
SET $set
WHERE trtok='{$this->trtok}'".
- (is_null($oldState) ? '' : " AND state='$oldState'").
- (is_null($lock) ? '' : " AND lock = '$slock'")
+ (is_null($oldState) ? '' : " AND state='$oldState'").
+ (is_null($lock) ? '' : " AND lock = '$slock'")
);
if (PEAR::isError($r)) {
- return $r;
+ return $r;
}
// return TRUE;
$affRows = $CC_DBC->affectedRows();
if (PEAR::isError($affRows)) {
- return $affRows;
+ return $affRows;
}
return ($affRows == 1);
}
@@ -217,7 +217,7 @@ class TransportRecord
global $CC_CONFIG, $CC_DBC;
$pidsql = (is_null($pid) ? "NULL" : "$pid" );
if ($this->dropped) {
- return TRUE;
+ return TRUE;
}
$slock = ($lock ? 'Y' : 'N');
$nlock = (!$lock);
@@ -228,11 +228,11 @@ class TransportRecord
WHERE trtok='{$this->trtok}' AND lock = '$snlock'"
);
if (PEAR::isError($r)) {
- return $r;
+ return $r;
}
$affRows = $CC_DBC->affectedRows();
if (PEAR::isError($affRows)) {
- return $affRows;
+ return $affRows;
}
if ($affRows === 0) {
$ltxt = ($lock ? 'lock' : 'unlock' );
@@ -303,7 +303,7 @@ class TransportRecord
}
$r = $this->setState('failed', array('errmsg'=>$msg));
if (PEAR::isError($r)) {
- return $r;
+ return $r;
}
return TRUE;
}
@@ -326,7 +326,7 @@ class TransportRecord
if (TR_LEAVE_CLOSED) {
$r = $this->setState('closed');
if (PEAR::isError($r)) {
- return $r;
+ return $r;
}
} else {
$r = $CC_DBC->query("
@@ -334,7 +334,7 @@ class TransportRecord
WHERE trtok='{$this->trtok}'
");
if (PEAR::isError($r)) {
- return $r;
+ return $r;
}
$this->recalled = FALSE;
$this->dropped = TRUE;
@@ -383,7 +383,7 @@ class TransportRecord
$defStr = 'unknown';
$trtype = $this->getTransportType(); //contains recall check
if (PEAR::isError($trtype)) {
- return $trtype;
+ return $trtype;
}
switch ($trtype) {
case "audioclip":
@@ -396,9 +396,9 @@ class TransportRecord
}
if (PEAR::isError($title)) {
if ($title->getCode() == GBERR_FOBJNEX) {
- $title = $defStr;
+ $title = $defStr;
} else {
- return $title;
+ return $title;
}
}
break;
@@ -407,10 +407,10 @@ class TransportRecord
break;
case "file":
$title = ( isset($this->row['localfile']) ?
- basename($this->row['localfile']) : 'regular file');
+ basename($this->row['localfile']) : 'regular file');
break;
default:
- $title = $defStr;
+ $title = $defStr;
}
return $title;
}
diff --git a/backend/Validator.php b/backend/Validator.php
index a53b9fdf4..d730aee10 100644
--- a/backend/Validator.php
+++ b/backend/Validator.php
@@ -67,12 +67,12 @@ class Validator {
'webstream' => "webstreamFormat",
);
if (!isset($formats[$format])) {
- return $this->_err(VAL_FORMAT);
+ return $this->_err(VAL_FORMAT);
}
$formatName = $formats[$format];
$formatFile = dirname(__FILE__)."/$formatName.php";
if (!file_exists($formatFile)) {
- return $this->_err(VAL_FORMAT);
+ return $this->_err(VAL_FORMAT);
}
require($formatFile);
$this->formTree = $$formatName;
@@ -151,15 +151,15 @@ class Validator {
$dname = (($node->ns? $node->ns.":" : '').$node->name);
$formTree =& $this->formTree;
if (DEBUG) {
- echo"\nVAL::validateNode: 1 $dname/$fname\n";
+ echo"\nVAL::validateNode: 1 $dname/$fname\n";
}
// check root node name:
if ($dname != $fname) {
- return $this->_err(VAL_ROOT, $fname);
+ return $this->_err(VAL_ROOT, $fname);
}
// check if this element is defined in format:
if (!isset($formTree[$fname])) {
- return $this->_err(VAL_NOTDEF, $fname);
+ return $this->_err(VAL_NOTDEF, $fname);
}
// check element content
if (isset($formTree[$fname]['regexp'])) {
@@ -171,12 +171,12 @@ class Validator {
// validate attributes:
$ra = $this->validateAttributes($node, $fname);
if (PEAR::isError($ra)) {
- return $ra;
+ return $ra;
}
// validate children:
$r = $this->validateChildren($node, $fname);
if (PEAR::isError($r)) {
- return $r;
+ return $r;
}
return TRUE;
}
@@ -251,7 +251,7 @@ class Validator {
// call children recursive:
$r = $this->validateNode($node->children[$i], $chname);
if (PEAR::isError($r)) {
- return $r;
+ return $r;
}
$childs[$chname] = TRUE;
}
@@ -269,13 +269,13 @@ class Validator {
foreach ($fchilds['oneof'] as $i => $ch) {
if (isset($childs[$ch])) {
if ($one) {
- return $this->_err(VAL_UNEXPONEOF, "$ch in $fname");
+ return $this->_err(VAL_UNEXPONEOF, "$ch in $fname");
}
$one = TRUE;
}
}
if (!$one) {
- return $this->_err(VAL_NOONEOF);
+ return $this->_err(VAL_NOONEOF);
}
}
}
@@ -340,9 +340,9 @@ class Validator {
{
$formTree =& $this->formTree;
$listed = (
- isset($formTree[$fname][$nType][$reqType]) ?
- array_search($chname, $formTree[$fname][$nType][$reqType]) :
- FALSE
+ isset($formTree[$fname][$nType][$reqType]) ?
+ array_search($chname, $formTree[$fname][$nType][$reqType]) :
+ FALSE
);
return $listed;
}
@@ -360,22 +360,22 @@ class Validator {
function _err($errno, $par='')
{
$msg = array(
- VAL_ROOT => 'Wrong root element',
- VAL_NOREQE => 'Required element missing',
- VAL_NOONEOF => 'One-of element missing',
- VAL_UNKNOWNE => 'Unknown element',
- VAL_UNKNOWNA => 'Unknown attribute',
- VAL_NOTDEF => 'Not defined',
- VAL_UNEXPONEOF => 'Unexpected second object from one-of set',
- VAL_FORMAT => 'Unknown format',
- VAL_CONTENT => 'Invalid content',
- VAL_NOREQA => 'Required attribute missing',
- VAL_ATTRIB => 'Invalid attribute format',
- VAL_PREDXML => 'Invalid predicate type',
+ VAL_ROOT => 'Wrong root element',
+ VAL_NOREQE => 'Required element missing',
+ VAL_NOONEOF => 'One-of element missing',
+ VAL_UNKNOWNE => 'Unknown element',
+ VAL_UNKNOWNA => 'Unknown attribute',
+ VAL_NOTDEF => 'Not defined',
+ VAL_UNEXPONEOF => 'Unexpected second object from one-of set',
+ VAL_FORMAT => 'Unknown format',
+ VAL_CONTENT => 'Invalid content',
+ VAL_NOREQA => 'Required attribute missing',
+ VAL_ATTRIB => 'Invalid attribute format',
+ VAL_PREDXML => 'Invalid predicate type',
);
return PEAR::raiseError(
"Validator: {$msg[$errno]} #$errno ($par, gunid={$this->gunid})",
- $errno
+ $errno
);
}
diff --git a/backend/XmlParser.php b/backend/XmlParser.php
index 89d59e123..7d440460b 100644
--- a/backend/XmlParser.php
+++ b/backend/XmlParser.php
@@ -164,12 +164,12 @@ class XmlParser {
$res = xml_parse($xml_parser, $data, TRUE);
if (!$res) {
$this->err = array(TRUE,
- sprintf("XML error: %s at line %d\n",
- xml_error_string(xml_get_error_code($xml_parser)),
- xml_get_current_line_number($xml_parser)
- )
+ sprintf("XML error: %s at line %d\n",
+ xml_error_string(xml_get_error_code($xml_parser)),
+ xml_get_current_line_number($xml_parser)
+ )
);
-// var_dump($data);
+ // var_dump($data);
}
xml_parser_free($xml_parser);
}
@@ -188,31 +188,31 @@ class XmlParser {
function &parse($data='', $loc='file')
{
switch ($loc) {
- case "file":
- if (!is_file($data)) {
- return PEAR::raiseError(
+ case "file":
+ if (!is_file($data)) {
+ return PEAR::raiseError(
"XmlParser::parse: file not found ($data)"
- );
- }
- if (!is_readable($data)) {
- return PEAR::raiseError(
+ );
+ }
+ if (!is_readable($data)) {
+ return PEAR::raiseError(
"XmlParser::parse: can't read file ($data)"
- );
- }
- $data = file_get_contents($data);
- case "string":
- $parser = new XmlParser($data);
- if ($parser->isError()) {
- return PEAR::raiseError(
+ );
+ }
+ $data = file_get_contents($data);
+ case "string":
+ $parser = new XmlParser($data);
+ if ($parser->isError()) {
+ return PEAR::raiseError(
"XmlParser::parse: ".$parser->getError()
- );
- }
- $tree = $parser->getTree();
- break;
- default:
- return PEAR::raiseError(
+ );
+ }
+ $tree = $parser->getTree();
+ break;
+ default:
+ return PEAR::raiseError(
"XmlParser::parse: unsupported source location ($loc)"
- );
+ );
}
return $tree;
}
@@ -237,7 +237,7 @@ class XmlParser {
$atnm = $a['localPart'];
unset($attrs[$atn]);
if ($atns == 'xmlns') {
- $nSpaces[$atnm] = $atv;
+ $nSpaces[$atnm] = $atv;
} else if ($atns == NULL && $atnm == 'xmlns') {
$nSpaces[''] = $atv;
} else {
@@ -280,7 +280,7 @@ class XmlParser {
function characterData($parser, $data) {
$cnt = count($this->stack);
if (trim($data)!='') {
- $this->stack[$cnt-1]->content .= $data;
+ $this->stack[$cnt-1]->content .= $data;
}
}
@@ -299,7 +299,7 @@ class XmlParser {
//if(substr($data, 0, 1) == "&" && substr($data, -1, 1) == ";"){
// $this->stack[$cnt-1]->content .= trim($data);
//}else{
- $this->stack[$cnt-1]->content .= "*** $data ***";
+ $this->stack[$cnt-1]->content .= "*** $data ***";
//}
}
@@ -376,7 +376,7 @@ class XmlParser {
}
$res .= XML_Util::replaceEntities("{$el->content}");
if ($haveCh) {
- $res .= "\n{$ind}";
+ $res .= "\n{$ind}";
}
$res .= "";
return $res;
diff --git a/backend/propel-db/build/classes/campcaster/CcPlaylistcontents.php b/backend/propel-db/build/classes/campcaster/CcPlaylistcontents.php
index 53b54fde1..9a7c3764a 100644
--- a/backend/propel-db/build/classes/campcaster/CcPlaylistcontents.php
+++ b/backend/propel-db/build/classes/campcaster/CcPlaylistcontents.php
@@ -5,7 +5,7 @@ require_once('Common.php');
/**
* Skeleton subclass for representing a row from the 'cc_playlistcontents' table.
*
- *
+ *
*
* You should add additional methods to this class to meet the
* application requirements. This class will only be generated as
@@ -15,55 +15,55 @@ require_once('Common.php');
*/
class CcPlaylistcontents extends BaseCcPlaylistcontents {
- public function getDbFadein()
- {
- return $this->fadein;
- }
-
- public function setDbFadein($time)
+ public function getDbFadein()
{
- $this->fadein = $time;
- //$this->modifiedColumns[] = CcPlaylistcontentsPeer::FADEIN;
+ return $this->fadein;
+ }
+
+ public function setDbFadein($time)
+ {
+ $this->fadein = $time;
+ //$this->modifiedColumns[] = CcPlaylistcontentsPeer::FADEIN;
return Common::setTimeInSub($this, 'FADEIN', $time);
}
- public function getDbFadeout()
+ public function getDbFadeout()
{
return $this->fadeout;
}
- public function setDbFadeout($time)
+ public function setDbFadeout($time)
{
- $this->fadeout = $time;
- //$this->modifiedColumns[] = CcPlaylistcontentsPeer::FADEOUT;
+ $this->fadeout = $time;
+ //$this->modifiedColumns[] = CcPlaylistcontentsPeer::FADEOUT;
return Common::setTimeInSub($this, 'FADEOUT', $time);
}
- public function getDbCuein()
+ public function getDbCuein()
{
return $this->cuein;
}
- public function setDbCuein($time)
+ public function setDbCuein($time)
{
- $this->cuein = $time;
- //$this->modifiedColumns[] = CcPlaylistcontentsPeer::CUEIN;
+ $this->cuein = $time;
+ //$this->modifiedColumns[] = CcPlaylistcontentsPeer::CUEIN;
return Common::setTimeInSub($this, 'CUEIN', $time);
}
- public function getDbCueout()
+ public function getDbCueout()
{
return $this->cueout;
}
public function setDbCueout($time)
{
- $this->cueout = $time;
- //$this->modifiedColumns[] = CcPlaylistcontentsPeer::CUEOUT;
+ $this->cueout = $time;
+ //$this->modifiedColumns[] = CcPlaylistcontentsPeer::CUEOUT;
return Common::setTimeInSub($this, 'CUEOUT', $time);
}
- public function getDbCliplength()
+ public function getDbCliplength()
{
return $this->cliplength;
}
@@ -71,11 +71,8 @@ class CcPlaylistcontents extends BaseCcPlaylistcontents {
public function setDbCliplength($time)
{
$this->cliplength = $time;
- //$this->modifiedColumns[] = CcPlaylistcontentsPeer::CLIPLENGTH;
+ //$this->modifiedColumns[] = CcPlaylistcontentsPeer::CLIPLENGTH;
return Common::setTimeInSub($this, 'CLIPLENGTH', $time);
}
-
-
-
} // CcPlaylistcontents
diff --git a/backend/propel-db/build/classes/campcaster/Common.php b/backend/propel-db/build/classes/campcaster/Common.php
index 18b93ffcd..960bff34a 100644
--- a/backend/propel-db/build/classes/campcaster/Common.php
+++ b/backend/propel-db/build/classes/campcaster/Common.php
@@ -1,19 +1,19 @@
prepare($sql);
- $stmt->bindValue(':f1', $time);
- $stmt->bindValue(':p1', $row->getDbId());
- $stmt->execute();
- }
+ public static function setTimeInSub($row, $col, $time)
+ {
+ $class = get_class($row).'Peer';
+
+ $con = Propel::getConnection($class::DATABASE_NAME);
+
+ $sql = 'UPDATE '.$class::TABLE_NAME
+ . ' SET '.$col.' = :f1'
+ . ' WHERE ' .$class::ID. ' = :p1';
+ $stmt = $con->prepare($sql);
+ $stmt->bindValue(':f1', $time);
+ $stmt->bindValue(':p1', $row->getDbId());
+ $stmt->execute();
+ }
}
diff --git a/backend/xmlrpc/xrLocStor.php b/backend/xmlrpc/xrLocStor.php
index fb9acf702..5408a389e 100644
--- a/backend/xmlrpc/xrLocStor.php
+++ b/backend/xmlrpc/xrLocStor.php
@@ -40,7 +40,7 @@ function errHndl($errno, $errmsg, $filename, $linenum, $vars)
break;
default:
$xr = new XML_RPC_Response(0, 805,
- htmlspecialchars("ERROR:xrLocStor: $errno $errmsg ($filename:$linenum)"));
+ htmlspecialchars("ERROR:xrLocStor: $errno $errmsg ($filename:$linenum)"));
header("Content-type: text/xml");
echo $xr->serialize();
exit($errno);
@@ -159,10 +159,10 @@ $defs = array();
foreach ($methods as $method => $description) {
$defs["locstor.$method"] = array(
"function" => array(&$locStor, "xr_$method"),
- // NOTE: the way this signature is set up, every function must take at least one parameter!
+ // NOTE: the way this signature is set up, every function must take at least one parameter!
"signature" => array(
- array($GLOBALS['XML_RPC_Struct'], $GLOBALS['XML_RPC_Struct'])
- ),
+ array($GLOBALS['XML_RPC_Struct'], $GLOBALS['XML_RPC_Struct'])
+ ),
"docstring" => $description
);
}
diff --git a/htmlUI/Input.php b/htmlUI/Input.php
index a1b3ceab7..c80934b07 100644
--- a/htmlUI/Input.php
+++ b/htmlUI/Input.php
@@ -14,71 +14,71 @@ $g_inputErrors = array();
* @package Campsite
*/
class Input {
- /**
- * Please see: {@link http://ca.php.net/manual/en/function.get-magic-quotes-gpc.php
- * this PHP.net page specifically the user note by php at kaiundina dot de},
- * for why this is so complicated.
- *
- * @param array $p_array
- * @return array
- */
- function CleanMagicQuotes($p_array)
- {
- $gpcList = array();
+ /**
+ * Please see: {@link http://ca.php.net/manual/en/function.get-magic-quotes-gpc.php
+ * this PHP.net page specifically the user note by php at kaiundina dot de},
+ * for why this is so complicated.
+ *
+ * @param array $p_array
+ * @return array
+ */
+ function CleanMagicQuotes($p_array)
+ {
+ $gpcList = array();
- foreach ($p_array as $key => $value) {
- $decodedKey = stripslashes($key);
- if (is_array($value)) {
- $decodedValue = Input::CleanMagicQuotes($value);
- } else {
- $decodedValue = stripslashes($value);
- }
- $gpcList[$decodedKey] = $decodedValue;
- }
- return $gpcList;
- } // fn CleanMagicQuotes
+ foreach ($p_array as $key => $value) {
+ $decodedKey = stripslashes($key);
+ if (is_array($value)) {
+ $decodedValue = Input::CleanMagicQuotes($value);
+ } else {
+ $decodedValue = stripslashes($value);
+ }
+ $gpcList[$decodedKey] = $decodedValue;
+ }
+ return $gpcList;
+ } // fn CleanMagicQuotes
- /**
- * Get an input value from the $_REQUEST array and check its type.
- * The default value is returned if the value is not defined in the
- * $_REQUEST array, or if the value does not match the required type.
- *
- * The type 'checkbox' is special - you cannot specify a default
- * value for this. The return value will be TRUE or FALSE, but
- * you can change this by specifying 'numeric' as the 3rd parameter
- * in which case it will return '1' or '0'.
- *
- * Use Input::IsValid() to check if any errors were generated.
- *
- * @param string $p_varName
- * The index into the $_REQUEST array.
- *
- * @param string $p_type
- * The type of data expected; can be:
- * "int"
- * "string"
- * "array"
- * "checkbox"
- * "boolean"
- *
- * Default is 'string'.
- *
- * @param mixed $p_defaultValue
- * The default value to return if the value is not defined in
- * the $_REQUEST array, or if the value does not match
- * the required type.
- *
- * @param boolean $p_errorsOk
- * Set to true to ignore any errors for this variable (i.e.
- * Input::IsValid() will still return true even if there
- * are errors for this varaible).
- *
- * @return mixed
- */
- function Get($p_varName, $p_type = 'string', $p_defaultValue = null, $p_errorsOk = false)
- {
- global $g_inputErrors;
+ /**
+ * Get an input value from the $_REQUEST array and check its type.
+ * The default value is returned if the value is not defined in the
+ * $_REQUEST array, or if the value does not match the required type.
+ *
+ * The type 'checkbox' is special - you cannot specify a default
+ * value for this. The return value will be TRUE or FALSE, but
+ * you can change this by specifying 'numeric' as the 3rd parameter
+ * in which case it will return '1' or '0'.
+ *
+ * Use Input::IsValid() to check if any errors were generated.
+ *
+ * @param string $p_varName
+ * The index into the $_REQUEST array.
+ *
+ * @param string $p_type
+ * The type of data expected; can be:
+ * "int"
+ * "string"
+ * "array"
+ * "checkbox"
+ * "boolean"
+ *
+ * Default is 'string'.
+ *
+ * @param mixed $p_defaultValue
+ * The default value to return if the value is not defined in
+ * the $_REQUEST array, or if the value does not match
+ * the required type.
+ *
+ * @param boolean $p_errorsOk
+ * Set to true to ignore any errors for this variable (i.e.
+ * Input::IsValid() will still return true even if there
+ * are errors for this varaible).
+ *
+ * @return mixed
+ */
+ function Get($p_varName, $p_type = 'string', $p_defaultValue = null, $p_errorsOk = false)
+ {
+ global $g_inputErrors;
$p_type = strtolower($p_type);
if ($p_type == 'checkbox') {
@@ -88,99 +88,99 @@ class Input {
return isset($_REQUEST[$p_varName]) ? '1' : '0';
}
}
- if (!isset($_REQUEST[$p_varName])) {
- if (!$p_errorsOk) {
- $g_inputErrors[$p_varName] = 'not set';
- }
- return $p_defaultValue;
- }
- // Clean the slashes
- if (get_magic_quotes_gpc()) {
- if (is_array($_REQUEST[$p_varName])) {
- $_REQUEST[$p_varName] = Input::CleanMagicQuotes($_REQUEST[$p_varName]);
- } else {
- $_REQUEST[$p_varName] = stripslashes($_REQUEST[$p_varName]);
- }
- }
- switch ($p_type) {
- case 'boolean':
- $value = strtolower($_REQUEST[$p_varName]);
- if ( ($value == "true") || (is_numeric($value) && ($value > 0)) ) {
- return true;
- } else {
- return false;
- }
- break;
- case 'int':
- if (!is_numeric($_REQUEST[$p_varName])) {
- if (!$p_errorsOk) {
- $g_inputErrors[$p_varName] = 'Incorrect type. Expected type '.$p_type
- .', but received type '.gettype($_REQUEST[$p_varName]).'.'
- .' Value is "'.$_REQUEST[$p_varName].'".';
- }
- return $p_defaultValue;
- }
- break;
- case 'string':
- if (!is_string($_REQUEST[$p_varName])) {
- if (!$p_errorsOk) {
- $g_inputErrors[$p_varName] = 'Incorrect type. Expected type '.$p_type
- .', but received type '.gettype($_REQUEST[$p_varName]).'.'
- .' Value is "'.$_REQUEST[$p_varName].'".';
- }
- return $p_defaultValue;
- }
- break;
- case 'array':
- if (!is_array($_REQUEST[$p_varName])) {
- // Create an array if it isnt one already.
- // Arrays are used with checkboxes and radio buttons.
- // The problem with them is that if there is only one
- // checkbox, the given value will not be an array. So
- // we make it easy for the programmer by always returning
- // an array.
- $newArray = array();
- $newArray[] = $_REQUEST[$p_varName];
- return $newArray;
-// if (!$p_errorsOk) {
-// $g_inputErrors[$p_varName] = 'Incorrect type. Expected type '.$p_type
-// .', but received type '.gettype($_REQUEST[$p_varName]).'.'
-// .' Value is "'.$_REQUEST[$p_varName].'".';
-// }
-// return $p_defaultValue;
- }
- }
- return $_REQUEST[$p_varName];
- } // fn get
+ if (!isset($_REQUEST[$p_varName])) {
+ if (!$p_errorsOk) {
+ $g_inputErrors[$p_varName] = 'not set';
+ }
+ return $p_defaultValue;
+ }
+ // Clean the slashes
+ if (get_magic_quotes_gpc()) {
+ if (is_array($_REQUEST[$p_varName])) {
+ $_REQUEST[$p_varName] = Input::CleanMagicQuotes($_REQUEST[$p_varName]);
+ } else {
+ $_REQUEST[$p_varName] = stripslashes($_REQUEST[$p_varName]);
+ }
+ }
+ switch ($p_type) {
+ case 'boolean':
+ $value = strtolower($_REQUEST[$p_varName]);
+ if ( ($value == "true") || (is_numeric($value) && ($value > 0)) ) {
+ return true;
+ } else {
+ return false;
+ }
+ break;
+ case 'int':
+ if (!is_numeric($_REQUEST[$p_varName])) {
+ if (!$p_errorsOk) {
+ $g_inputErrors[$p_varName] = 'Incorrect type. Expected type '.$p_type
+ .', but received type '.gettype($_REQUEST[$p_varName]).'.'
+ .' Value is "'.$_REQUEST[$p_varName].'".';
+ }
+ return $p_defaultValue;
+ }
+ break;
+ case 'string':
+ if (!is_string($_REQUEST[$p_varName])) {
+ if (!$p_errorsOk) {
+ $g_inputErrors[$p_varName] = 'Incorrect type. Expected type '.$p_type
+ .', but received type '.gettype($_REQUEST[$p_varName]).'.'
+ .' Value is "'.$_REQUEST[$p_varName].'".';
+ }
+ return $p_defaultValue;
+ }
+ break;
+ case 'array':
+ if (!is_array($_REQUEST[$p_varName])) {
+ // Create an array if it isnt one already.
+ // Arrays are used with checkboxes and radio buttons.
+ // The problem with them is that if there is only one
+ // checkbox, the given value will not be an array. So
+ // we make it easy for the programmer by always returning
+ // an array.
+ $newArray = array();
+ $newArray[] = $_REQUEST[$p_varName];
+ return $newArray;
+ // if (!$p_errorsOk) {
+ // $g_inputErrors[$p_varName] = 'Incorrect type. Expected type '.$p_type
+ // .', but received type '.gettype($_REQUEST[$p_varName]).'.'
+ // .' Value is "'.$_REQUEST[$p_varName].'".';
+ // }
+ // return $p_defaultValue;
+ }
+ }
+ return $_REQUEST[$p_varName];
+ } // fn get
- /**
- * Return FALSE if any calls to Input::Get() resulted in an error.
- * @return boolean
- */
- function IsValid()
- {
- global $g_inputErrors;
- if (count($g_inputErrors) > 0) {
- return false;
- } else {
- return true;
- }
- } // fn isValid
+ /**
+ * Return FALSE if any calls to Input::Get() resulted in an error.
+ * @return boolean
+ */
+ function IsValid()
+ {
+ global $g_inputErrors;
+ if (count($g_inputErrors) > 0) {
+ return false;
+ } else {
+ return true;
+ }
+ } // fn isValid
- /**
- * Return a default error string.
- * @return string
- */
- function GetErrorString()
- {
- global $g_inputErrors;
- ob_start();
- print_r($g_inputErrors);
- $str = ob_get_clean();
- return $str;
- } // fn GetErrorString
+ /**
+ * Return a default error string.
+ * @return string
+ */
+ function GetErrorString()
+ {
+ global $g_inputErrors;
+ ob_start();
+ print_r($g_inputErrors);
+ $str = ob_get_clean();
+ return $str;
+ } // fn GetErrorString
} // class Input
diff --git a/htmlUI/twitter.class.php b/htmlUI/twitter.class.php
index 092c57967..b4d9588a0 100644
--- a/htmlUI/twitter.class.php
+++ b/htmlUI/twitter.class.php
@@ -47,7 +47,7 @@ class twitter{
var $username='';
var $password='';
var $user_agent='';
-
+
///////////////
//
// I don't know if these headers have become standards yet
@@ -59,16 +59,16 @@ class twitter{
var $headers=array('X-Twitter-Client: ',
'X-Twitter-Client-Version: ',
'X-Twitter-Client-URL: ');
-
+
var $responseInfo=array();
-
-
+
+
function twitter(){}
-
-
-
-
-
+
+
+
+
+
/////////////////////////////////////////
//
// Twitter API calls
@@ -91,9 +91,9 @@ class twitter{
//
//
/////////////////////////////////////////
-
-
- // Updates the authenticating user's status.
+
+
+ // Updates the authenticating user's status.
// Requires the status parameter specified below.
//
// status. (string) Required. The text of your status update. Must not be
@@ -105,7 +105,7 @@ class twitter{
$postargs = 'status='.urlencode($status);
return $this->process($request,$postargs);
}
-
+
// Returns the 20 most recent statuses from non-protected users who have
// set a custom user icon. Does not require authentication.
//
@@ -114,12 +114,13 @@ class twitter{
//
function publicTimeline($sinceid=false){
$qs='';
- if($sinceid!==false)
+ if($sinceid!==false) {
$qs='?since_id='.intval($sinceid);
+ }
$request = 'http://twitter.com/statuses/public_timeline.xml'.$qs;
return $this->process($request);
}
-
+
// Returns the 20 most recent statuses posted in the last 24 hours from the
// authenticating user and that user's friends. It's also possible to request
// another user's friends_timeline via the id parameter below.
@@ -128,21 +129,22 @@ class twitter{
// to return the friends_timeline. (set to false if you
// want to use authenticated user).
// since. (HTTP-formatted date) Optional. Narrows the returned results to just those
- // statuses created after the specified date.
+ // statuses created after the specified date.
//
function friendsTimeline($id=false,$since=false){
$qs='';
- if($since!==false)
+ if($since!==false) {
$qs='?since='.urlencode($since);
-
- if($id===false)
+ }
+
+ if($id===false) {
$request = 'http://twitter.com/statuses/friends_timeline.xml'.$qs;
- else
+ } else {
$request = 'http://twitter.com/statuses/friends_timeline/'.urlencode($id).'.xml'.$qs;
-
+ }
return $this->process($request);
}
-
+
// Returns the 20 most recent statuses posted in the last 24 hours from the
// authenticating user. It's also possible to request another user's timeline
// via the id parameter below.
@@ -157,16 +159,17 @@ class twitter{
function userTimeline($id=false,$count=20,$since=false){
$qs='?count='.intval($count);
if($since!==false)
- $qs .= '&since='.urlencode($since);
-
- if($id===false)
+ $qs .= '&since='.urlencode($since);
+
+ if($id===false) {
$request = 'http://twitter.com/statuses/user_timeline.xml'.$qs;
- else
+ } else {
$request = 'http://twitter.com/statuses/user_timeline/'.urlencode($id).'.xml'.$qs;
-
+ }
+
return $this->process($request);
}
-
+
// Returns a single status, specified by the id parameter below. The status's author
// will be returned inline.
//
@@ -184,25 +187,25 @@ class twitter{
//
function friends($id=false){
if($id===false)
- $request = 'http://twitter.com/statuses/friends.xml';
+ $request = 'http://twitter.com/statuses/friends.xml';
else
- $request = 'http://twitter.com/statuses/friends/'.urlencode($id).'.xml';
+ $request = 'http://twitter.com/statuses/friends/'.urlencode($id).'.xml';
return $this->process($request);
}
-
+
// Returns the authenticating user's followers, each with current status inline.
//
function followers(){
$request = 'http://twitter.com/statuses/followers.xml';
return $this->process($request);
}
-
+
// Returns a list of the users currently featured on the site with their current statuses inline.
function featured(){
$request = 'http://twitter.com/statuses/featured.xml';
return $this->process($request);
}
-
+
// Returns extended information of a given user, specified by ID or screen name as per the required
// id parameter below. This information includes design settings, so third party developers can theme
// their widgets according to a given user's preferences.
@@ -213,52 +216,54 @@ class twitter{
$request = 'http://twitter.com/users/show/'.urlencode($id).'.xml';
return $this->process($request);
}
-
+
// Returns a list of the direct messages sent to the authenticating user.
//
// since. (HTTP-formatted date) Optional. Narrows the resulting list of direct messages to just those
- // sent after the specified date.
+ // sent after the specified date.
//
function directMessages($since=false){
$qs='';
- if($since!==false)
+ if($since!==false) {
$qs='?since='.urlencode($since);
+ }
$request = 'http://twitter.com/direct_messages.xml'.$qs;
return $this->process($request);
}
-
+
// Sends a new direct message to the specified user from the authenticating user. Requires both the user
// and text parameters below.
//
// user. (string OR int) Required. The ID or screen name of the recipient user.
// text. (string) Required. The text of your direct message. Be sure to URL encode as necessary, and keep
- // it under 140 characters.
+ // it under 140 characters.
//
function sendDirectMessage($user,$text){
$request = 'http://twitter.com/direct_messages/new.xml';
$postargs = 'user='.urlencode($user).'&text='.urlencode($text);
return $this->process($request,$postargs);
}
-
-
-
-
-
+
+
+
+
+
// internal function where all the juicy curl fun takes place
// this should not be called by anything external unless you are
// doing something else completely then knock youself out.
function process($url,$postargs=false){
-
+
$ch = curl_init($url);
if($postargs !== false){
curl_setopt ($ch, CURLOPT_POST, true);
curl_setopt ($ch, CURLOPT_POSTFIELDS, $postargs);
}
-
- if($this->username !== false && $this->password !== false)
+
+ if($this->username !== false && $this->password !== false) {
curl_setopt($ch, CURLOPT_USERPWD, $this->username.':'.$this->password);
-
+ }
+
curl_setopt($ch, CURLOPT_VERBOSE, 0);
curl_setopt($ch, CURLOPT_NOBODY, 0);
curl_setopt($ch, CURLOPT_HEADER, 0);
@@ -268,17 +273,17 @@ class twitter{
curl_setopt($ch, CURLOPT_HTTPHEADER, $this->headers);
$response = curl_exec($ch);
-
+
$this->responseInfo=curl_getinfo($ch);
curl_close($ch);
-
-
+
+
if(intval($this->responseInfo['http_code'])==200){
if(class_exists('SimpleXMLElement')){
$xml = new SimpleXMLElement($response);
return $xml;
}else{
- return $response;
+ return $response;
}
}else{
return false;
diff --git a/htmlUI/ui_base.inc.php b/htmlUI/ui_base.inc.php
index b3335b484..eb8391f94 100644
--- a/htmlUI/ui_base.inc.php
+++ b/htmlUI/ui_base.inc.php
@@ -80,18 +80,18 @@ function _getDArr($format)
{
#$arr[''] = '00';
switch($format) {
- case 'h':
- for($n=0; $n<=23; $n++) {
- $arr[sprintf('%02d', $n)] = sprintf('%02d', $n);
- }
- break;
+ case 'h':
+ for($n=0; $n<=23; $n++) {
+ $arr[sprintf('%02d', $n)] = sprintf('%02d', $n);
+ }
+ break;
- case 'm':
- case 's':
- for($n=0; $n<=59; $n++) {
- $arr[sprintf('%02d', $n)] = sprintf('%02d', $n);
- }
- break;
+ case 'm':
+ case 's':
+ for($n=0; $n<=59; $n++) {
+ $arr[sprintf('%02d', $n)] = sprintf('%02d', $n);
+ }
+ break;
}
return $arr;
@@ -238,9 +238,9 @@ class uiBase
'EXCHANGE' => array('class' => 'uiexchange', 'file' => 'ui_exchange.class.php'),
'TRANSFERS' => array('class' => 'uitransfers', 'file' => 'ui_transfers.class.php'),
'CALENDAR' => array('class' => 'uicalendar', 'file' => 'ui_calendar.class.php'),
- array('class' => 'jscom', 'file' => 'ui_jscom.php'),
+ array('class' => 'jscom', 'file' => 'ui_jscom.php'),
'TWITTER' => array('class' => 'uitwitter', 'file' => 'ui_twitter.class.php'),
- array('class' => 'twitter', 'file' => 'twitter.class.php')
+ array('class' => 'twitter', 'file' => 'twitter.class.php')
);
@@ -253,8 +253,7 @@ class uiBase
global $CC_DBC, $CC_CONFIG;
$this->gb = new GreenBox();
$CC_CONFIG['accessRawAudioUrl'] = $CC_CONFIG['storageUrlPath'].'/xmlrpc/simpleGet.php';
- $this->sessid = isset($_REQUEST[$CC_CONFIG['authCookieName']]) ?
- $_REQUEST[$CC_CONFIG['authCookieName']] : null;
+ $this->sessid = isset($_REQUEST[$CC_CONFIG['authCookieName']]) ? $_REQUEST[$CC_CONFIG['authCookieName']] : null;
$this->userid = GreenBox::GetSessUserId($this->sessid);
$this->login = Alib::GetSessLogin($this->sessid);
if (PEAR::isError($this->login)) {
@@ -269,8 +268,8 @@ class uiBase
$this->id = $this->gb->storId;
}
if (!is_null($this->id)) {
- $f = StoredFile::Recall($this->id);
- $this->type = $f->getType();
+ $f = StoredFile::Recall($this->id);
+ $this->type = $f->getType();
}
}
@@ -314,10 +313,10 @@ class uiBase
{
global $CC_CONFIG;
if (!is_array($this->STATIONPREFS) || ($reload === TRUE) ) {
- $this->STATIONPREFS = array();
+ $this->STATIONPREFS = array();
foreach ($mask as $key => $val) {
if (isset($val['isPref']) && $val['isPref']) {
- $setting = $this->gb->loadGroupPref($CC_CONFIG['StationPrefsGr'], $val['element']);
+ $setting = $this->gb->loadGroupPref($CC_CONFIG['StationPrefsGr'], $val['element']);
if (is_string($setting)) {
$this->STATIONPREFS[$val['element']] = $setting;
} elseif ($val['required']) {
@@ -399,9 +398,9 @@ class uiBase
}
$elem[$v['element']] =& $form->createElement($type,
- $v['element'],
- $label,
- $attrs);
+ $v['element'],
+ $label,
+ $attrs);
if (!$groupit) {
$form->addElement($elem[$v['element']]);
}
@@ -458,21 +457,21 @@ class uiBase
* @param array $input
* array of form-elements
*/
-// function _dateArr2Str(&$input)
-// {
-// foreach ($input as $k => $v){
-// if (is_array($v)) {
-// if ( ( isset($v['d']) ) && ( isset($v['M']) || isset($v['m']) ) && ( isset($v['Y']) || isset($v['y']) ) ) {
-// $input[$k] = $v['Y'].$v['y'].'-'.sprintf('%02d', $v['M'].$v['m']).'-'.sprintf('%02d', $v['d']);
-// }
-// if ( ( isset($v['H']) ) || isset($v['h'] ) && ( isset($v['i']) ) && ( isset($v['s']) ) ) {
-// $input[$k] = sprintf('%02d', $v['H'].$v['h']).':'.sprintf('%02d', $v['i']).':'.sprintf('%02d', $v['s']);
-// }
-// }
-// }
-//
-// return $input;
-// } // fn _dateArr2Str
+ // function _dateArr2Str(&$input)
+ // {
+ // foreach ($input as $k => $v){
+ // if (is_array($v)) {
+ // if ( ( isset($v['d']) ) && ( isset($v['M']) || isset($v['m']) ) && ( isset($v['Y']) || isset($v['y']) ) ) {
+ // $input[$k] = $v['Y'].$v['y'].'-'.sprintf('%02d', $v['M'].$v['m']).'-'.sprintf('%02d', $v['d']);
+ // }
+ // if ( ( isset($v['H']) ) || isset($v['h'] ) && ( isset($v['i']) ) && ( isset($v['s']) ) ) {
+ // $input[$k] = sprintf('%02d', $v['H'].$v['h']).':'.sprintf('%02d', $v['i']).':'.sprintf('%02d', $v['s']);
+ // }
+ // }
+ // }
+ //
+ // return $input;
+ // } // fn _dateArr2Str
/**
@@ -482,35 +481,35 @@ class uiBase
* local ID of file
* @param string $format
*/
-// public function analyzeFile($id, $format)
-// {
-// $ia = $this->gb->analyzeFile($id, $this->sessid);
-// $s = $ia['playtime_seconds'];
-// $extent = date('H:i:s', floor($s)-date('Z')).substr(number_format($s, 6), strpos(number_format($s, 6), '.'));
-//
-// if ($format=='text') {
-// return "".var_export($ia, TRUE)."
".var_export($ia, TRUE)."
\n";
- echo " * The group perms need to be set to the web server user, in this case '{$CC_CONFIG['webServerUser']}'.
\n";
- echo " * Currently the group is set to be '{$groupOwner['name']}'.
\n";
- exit(1);
+ echo " * Error: Your directory permissions for {$filePath} are not set correctly.
\n";
+ echo " * The group perms need to be set to the web server user, in this case '{$CC_CONFIG['webServerUser']}'.
\n";
+ echo " * Currently the group is set to be '{$groupOwner['name']}'.
\n";
+ exit(1);
}
if (!($fileperms & 0x0400)) {
- echo " * Error: Sticky bit not set for {$filePath}.
\n";
- exit(1);
+ echo " * Error: Sticky bit not set for {$filePath}.
\n";
+ exit(1);
}
}
diff --git a/utils/CleanStor.php b/utils/CleanStor.php
index 7099944a8..ac9359aee 100644
--- a/utils/CleanStor.php
+++ b/utils/CleanStor.php
@@ -16,9 +16,9 @@ require_once('../backend/StoredFile.php');
function printUsage() {
- global $CC_CONFIG;
+ global $CC_CONFIG;
- echo "Usage:\n";
+ echo "Usage:\n";
echo " ./CleanStor [OPTION] \n";
echo "\n";
echo "Options:\n";
@@ -31,33 +31,33 @@ function printUsage() {
}
function camp_clean_files($p_path) {
- if (!empty($p_path) && (strlen($p_path) > 4)) {
+ if (!empty($p_path) && (strlen($p_path) > 4)) {
list($dirList,$fileList) = File_Find::maptree($p_path);
$array_mus;
foreach ($fileList as $filepath) {
- if (@substr($filepath, strlen($filepath) - 3) != "xml") {
- $array_mus[] = $filepath;
- }
+ if (@substr($filepath, strlen($filepath) - 3) != "xml") {
+ $array_mus[] = $filepath;
+ }
}
foreach ($array_mus as $audio_file) {
- if (@is_link($audio_file) && !@stat($audio_file)) {
+ if (@is_link($audio_file) && !@stat($audio_file)) {
- //filesystem clean up.
- @unlink($audio_file);
- echo "unlinked $audio_file\n";
- @unlink($audio_file . ".xml");
- echo "unlinked " . $audio_file . ".xml\n";
- @rmdir(@dirname($audio_file));
- echo "removed dir " . @dirname($audio_file) . "\n";
+ //filesystem clean up.
+ @unlink($audio_file);
+ echo "unlinked $audio_file\n";
+ @unlink($audio_file . ".xml");
+ echo "unlinked " . $audio_file . ".xml\n";
+ @rmdir(@dirname($audio_file));
+ echo "removed dir " . @dirname($audio_file) . "\n";
- //database clean up.
- $stored_audio_file = StoredFile::RecallByGunid(@basename($audio_file));
- $stored_audio_file->delete();
- }
+ //database clean up.
+ $stored_audio_file = StoredFile::RecallByGunid(@basename($audio_file));
+ $stored_audio_file->delete();
+ }
}
}
@@ -69,8 +69,8 @@ function camp_remove_files($p_path) {
list($dirList,$fileList) = File_Find::maptree($p_path);
foreach ($fileList as $filepath) {
- echo " * Removing $filepath\n";
- @unlink($filepath);
+ echo " * Removing $filepath\n";
+ @unlink($filepath);
echo "done.\n";
}
foreach ($dirList as $dirpath) {
@@ -82,18 +82,18 @@ function camp_remove_files($p_path) {
}
function camp_empty_db($db) {
- global $CC_CONFIG;
+ global $CC_CONFIG;
- if (!PEAR::isError($db)) {
- if (camp_db_table_exists($CC_CONFIG['filesTable'])) {
- echo " * Deleting from database table ".$CC_CONFIG['filesTable']."\n";
- $sql = "DELETE FROM ".$CC_CONFIG['filesTable'];
- camp_install_query($sql, false);
- }
- else {
- echo " * Skipping: database table ".$CC_CONFIG['filesTable']."\n";
- }
- }
+ if (!PEAR::isError($db)) {
+ if (camp_db_table_exists($CC_CONFIG['filesTable'])) {
+ echo " * Deleting from database table ".$CC_CONFIG['filesTable']."\n";
+ $sql = "DELETE FROM ".$CC_CONFIG['filesTable'];
+ camp_install_query($sql, false);
+ }
+ else {
+ echo " * Skipping: database table ".$CC_CONFIG['filesTable']."\n";
+ }
+ }
}
@@ -104,17 +104,17 @@ $CC_DBC->setFetchMode(DB_FETCHMODE_ASSOC);
switch($argv[1]){
- case '-e':
- case '--empty':
- camp_empty_db($CC_DBC);
- camp_remove_files($CC_CONFIG['storageDir']);
- break;
- case '-c':
- case '--clean':
- camp_clean_files($CC_CONFIG['storageDir']);
- break;
- default:
- printUsage();
+ case '-e':
+ case '--empty':
+ camp_empty_db($CC_DBC);
+ camp_remove_files($CC_CONFIG['storageDir']);
+ break;
+ case '-c':
+ case '--clean':
+ camp_clean_files($CC_CONFIG['storageDir']);
+ break;
+ default:
+ printUsage();
}
diff --git a/utils/campcaster-backup.php b/utils/campcaster-backup.php
index 9443f60c5..596d156b3 100644
--- a/utils/campcaster-backup.php
+++ b/utils/campcaster-backup.php
@@ -20,18 +20,18 @@ $stid = $bs->storId;
function admDumpFolder(&$bs, $fid, $ind='')
{
- // NOTE: need to fix this, removed due to tree removal
-// $name = M2tree::GetObjName($fid);
-// if (PEAR::isError($name)) {
-// echo $name->getMessage();
-// exit;
-// }
+ // NOTE: need to fix this, removed due to tree removal
+ // $name = M2tree::GetObjName($fid);
+ // if (PEAR::isError($name)) {
+ // echo $name->getMessage();
+ // exit;
+ // }
$media = StoredFile::Recall($fid);
$type = $media->getType();
$gunid = $media->getGunid();
$pars = array();
if ($gunid) {
- $pars['id']="$gunid";
+ $pars['id']="$gunid";
}
$pars['name'] = "$name";
switch ($type) {
@@ -65,13 +65,13 @@ function admDumpGroup(&$bs, $gid, $ind='')
{
$name = Subjects::GetSubjName($gid);
if (PEAR::isError($name)) {
- echo $name->getMessage();
- exit;
+ echo $name->getMessage();
+ exit;
}
$isGr = Subjects::IsGroup($gid);
if (PEAR::isError($isGr)) {
- echo $isGr->getMessage();
- exit;
+ echo $isGr->getMessage();
+ exit;
}
$pars = array('name'=>"$name");
$pars['id'] = $gid;
@@ -84,8 +84,8 @@ function admDumpGroup(&$bs, $gid, $ind='')
}
$garr = Subjects::ListGroup($gid);
if (PEAR::isError($garr)) {
- echo $garr->getMessage();
- exit;
+ echo $garr->getMessage();
+ exit;
}
$res = '';
foreach ($garr as $i => $member) {
@@ -99,98 +99,98 @@ function admDumpGroup(&$bs, $gid, $ind='')
);
$prefs = admDumpPrefs($bs, $gid);
if (!is_null($prefs)) {
- $res .= $prefs;
+ $res .= $prefs;
}
if ($res) {
- $tagarr['content'] = $res;
+ $tagarr['content'] = $res;
}
return XML_Util::createTagFromArray($tagarr, $res === '');
-// if (!$res) {
-// } else {
-// return XML_Util::createTagFromArray(array(
-// 'namespace' => NSPACE,
-// 'localPart' => 'group',
-// 'attributes'=> $pars,
-// 'content' => $res,
-// ), FALSE);
-// }
+ // if (!$res) {
+ // } else {
+ // return XML_Util::createTagFromArray(array(
+ // 'namespace' => NSPACE,
+ // 'localPart' => 'group',
+ // 'attributes'=> $pars,
+ // 'content' => $res,
+ // ), FALSE);
+ // }
-}
-function admDumpSubjects(&$bs, $ind='')
-{
- $res ='';
- $subjs = Subjects::GetSubjects('id, login, pass, type');
- foreach ($subjs as $i => $member) {
- switch ($member['type']) {
- case "U":
- $prefs = admDumpPrefs($bs, $member['id']);
- $pars = array('login'=>"{$member['login']}", 'pass'=>"{$member['pass']}");
- $pars['id'] = $member['id'];
- $tagarr = array(
+ }
+ function admDumpSubjects(&$bs, $ind='')
+ {
+ $res ='';
+ $subjs = Subjects::GetSubjects('id, login, pass, type');
+ foreach ($subjs as $i => $member) {
+ switch ($member['type']) {
+ case "U":
+ $prefs = admDumpPrefs($bs, $member['id']);
+ $pars = array('login'=>"{$member['login']}", 'pass'=>"{$member['pass']}");
+ $pars['id'] = $member['id'];
+ $tagarr = array(
'namespace' => NSPACE,
'localPart' => 'user',
'attributes'=> $pars,
- );
- if (!is_null($prefs)) {
- $tagarr['content'] = $prefs;
- }
- $res .= XML_Util::createTagFromArray($tagarr , FALSE);
- break;
- case "G":
- $res .= admDumpGroup($bs, $member['id'], "$ind ");
- break;
+ );
+ if (!is_null($prefs)) {
+ $tagarr['content'] = $prefs;
+ }
+ $res .= XML_Util::createTagFromArray($tagarr , FALSE);
+ break;
+ case "G":
+ $res .= admDumpGroup($bs, $member['id'], "$ind ");
+ break;
+ }
}
- }
-# return "$ind\n$res$ind\n";
- return XML_Util::createTagFromArray(array(
+ # return "$ind\n$res$ind\n";
+ return XML_Util::createTagFromArray(array(
'namespace' => NSPACE,
'localPart' => 'subjects',
'content'=> $res,
- ), FALSE);
-}
+ ), FALSE);
+ }
-function admDumpPrefs(&$bs, $subjid)
-{
- $res ='';
- $pr = new Prefs($bs);
- $prefkeys = $pr->readKeys($subjid);
-# var_dump($subjid); var_dump($prefkeys); #exit;
- foreach ($prefkeys as $i => $prefk) {
- $keystr = $prefk['keystr'];
- $prefval = $pr->readVal($subjid, $keystr);
- $pars = array('name'=>"$keystr", 'val'=>"$prefval");
- $res .= XML_Util::createTagFromArray(array(
+ function admDumpPrefs(&$bs, $subjid)
+ {
+ $res ='';
+ $pr = new Prefs($bs);
+ $prefkeys = $pr->readKeys($subjid);
+ # var_dump($subjid); var_dump($prefkeys); #exit;
+ foreach ($prefkeys as $i => $prefk) {
+ $keystr = $prefk['keystr'];
+ $prefval = $pr->readVal($subjid, $keystr);
+ $pars = array('name'=>"$keystr", 'val'=>"$prefval");
+ $res .= XML_Util::createTagFromArray(array(
'namespace' => NSPACE,
'localPart' => 'pref',
'attributes'=> $pars,
- ));
- }
- if (!$res) {
- return NULL;
- }
- return XML_Util::createTagFromArray(array(
+ ));
+ }
+ if (!$res) {
+ return NULL;
+ }
+ return XML_Util::createTagFromArray(array(
'namespace' => NSPACE,
'localPart' => 'preferences',
'content'=> $res,
- ), FALSE);
-}
+ ), FALSE);
+ }
-$subjects = admDumpSubjects($bs, ' ');
-$tree = admDumpFolder($bs, $stid, ' ');
+ $subjects = admDumpSubjects($bs, ' ');
+ $tree = admDumpFolder($bs, $stid, ' ');
-$res = XML_Util::getXMLDeclaration("1.0", "UTF-8")."\n";
-$node = XML_Util::createTagFromArray(array(
+ $res = XML_Util::getXMLDeclaration("1.0", "UTF-8")."\n";
+ $node = XML_Util::createTagFromArray(array(
'namespace' => NSPACE,
'localPart' => 'storageServer',
'content' => "$subjects$tree",
-), FALSE);
-$res .= $node;
+ ), FALSE);
+ $res .= $node;
-$fmt = new XML_Beautifier();
-$res = $fmt->formatString($res);
+ $fmt = new XML_Beautifier();
+ $res = $fmt->formatString($res);
-#var_export($res);
-#var_dump($res);
-echo "$res";
+ #var_export($res);
+ #var_dump($res);
+ echo "$res";
-?>
\ No newline at end of file
+ ?>
\ No newline at end of file
diff --git a/utils/campcaster-import.php b/utils/campcaster-import.php
index 05459acb1..77f2223b0 100644
--- a/utils/campcaster-import.php
+++ b/utils/campcaster-import.php
@@ -26,7 +26,7 @@ function camp_import_error_handler()
function printUsage()
{
- global $CC_CONFIG;
+ global $CC_CONFIG;
echo "There are two ways to import audio files into Campcaster: linking\n";
echo "or copying.\n";
echo "\n";
@@ -71,11 +71,11 @@ function import_err($p_pearErrorObj, $txt='')
{
global $g_errors;
if (PEAR::isError($p_pearErrorObj)) {
- $msg = $p_pearErrorObj->getMessage()." ".$p_pearErrorObj->getUserInfo();
+ $msg = $p_pearErrorObj->getMessage()." ".$p_pearErrorObj->getUserInfo();
}
echo "\nERROR: $msg\n";
if (!empty($txt)) {
- echo "ERROR: $txt\n";
+ echo "ERROR: $txt\n";
}
$g_errors++;
}
@@ -174,20 +174,20 @@ function camp_import_audio_file($p_filepath, $p_importMode = null, $p_testOnly =
global $g_errors;
$g_errors++;
echo "ERROR: $p_filepath\n"
- ." When importing with the '--link' option, files must be set\n"
- ." world-readable. The file permissions for the file cannot be\n"
- ." changed. Check that you are not trying to import from a FAT32\n"
- ." drive. Otherwise, this problem might be fixed by running this \n"
- ." script with 'sudo'.\n";
+ ." When importing with the '--link' option, files must be set\n"
+ ." world-readable. The file permissions for the file cannot be\n"
+ ." changed. Check that you are not trying to import from a FAT32\n"
+ ." drive. Otherwise, this problem might be fixed by running this \n"
+ ." script with 'sudo'.\n";
return;
}
}
}
-// $timeBegin = microtime(true);
+ // $timeBegin = microtime(true);
$md5sum = md5_file($p_filepath);
-// $timeEnd = microtime(true);
-// echo " * MD5 time: ".($timeEnd-$timeBegin)."\n";
+ // $timeEnd = microtime(true);
+ // echo " * MD5 time: ".($timeEnd-$timeBegin)."\n";
// Look up md5sum in database
$duplicate = StoredFile::RecallByMd5($md5sum);
@@ -211,9 +211,9 @@ function camp_import_audio_file($p_filepath, $p_importMode = null, $p_testOnly =
);
$storedFile = StoredFile::Insert($values, $doCopyFiles);
if (PEAR::isError($storedFile)) {
- import_err($storedFile, "Error in StoredFile::Insert()");
- echo var_export($metadata)."\n";
- return;
+ import_err($storedFile, "Error in StoredFile::Insert()");
+ echo var_export($metadata)."\n";
+ return;
}
} else {
echo "==========================================================================\n";
@@ -250,8 +250,8 @@ if ($DEBUG_IMPORT) {
PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, "camp_import_error_handler");
$CC_DBC = DB::connect($dsn, TRUE);
if (PEAR::isError($CC_DBC)) {
- echo "ERROR: ".$CC_DBC->getMessage()." ".$CC_DBC->getUserInfo()."\n";
- exit(1);
+ echo "ERROR: ".$CC_DBC->getMessage()." ".$CC_DBC->getUserInfo()."\n";
+ exit(1);
}
$CC_DBC->setFetchMode(DB_FETCHMODE_ASSOC);
@@ -308,8 +308,8 @@ if (is_null($importMode)) {
global $CC_CONFIG;
if (!is_writable($CC_CONFIG["storageDir"])) {
- echo "ERROR: You do not have write permissions to the directory you are trying to import to:\n " . $CC_CONFIG["storageDir"] . "\n\n";
- exit;
+ echo "ERROR: You do not have write permissions to the directory you are trying to import to:\n " . $CC_CONFIG["storageDir"] . "\n\n";
+ exit;
}
global $g_fileCount;
@@ -335,9 +335,9 @@ if (is_array($files)) {
$end = intval(date('U'));
$time = $end - $start;
if ($time > 0) {
- $speed = round(($g_fileCount+$g_duplicates)/$time, 1);
+ $speed = round(($g_fileCount+$g_duplicates)/$time, 1);
} else {
- $speed = ($g_fileCount+$g_duplicates);
+ $speed = ($g_fileCount+$g_duplicates);
}
echo "==========================================================================\n";