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

Fixed database initialization script so that it still works when run multiple times. Previously the StorageRoot would be created again for each installation. Added more verbose output about the database initialization. Added checks for is_null() on the return value for StoredFile::Recall*() functions. Do not create the "public" virtual subfolder when creating a new user. Create the root user in the same way that normal users are created.

Browse source
This commit is contained in:
paul 2007-02-05 14:06:59 +00:00
parent 5c1a858287
commit 2da8161fb7
18 changed files with 266 additions and 221 deletions
Download patch file Download diff file Expand all files Collapse all files

8
campcaster/src/modules/storageServer/var/Transport.php
View file

@ -295,7 +295,7 @@ class Transport
case "audioclip":
case "webstream":
$storedFile = StoredFile::RecallByGunid($gunid);
if (PEAR::isError($storedFile)) {
if (is_null($storedFile) || PEAR::isError($storedFile)) {
return $storedFile;
}
// handle metadata:
@ -333,7 +333,7 @@ class Transport
$plid = $gunid;
require_once("Playlist.php");
$pl = StoredFile::RecallByGunid($plid);
if (PEAR::isError($pl)) {
if (is_null($pl) || PEAR::isError($pl)) {
return $pl;
}
$fname = $pl->getName();
@ -1107,7 +1107,7 @@ class Transport
if ($state2 == 'paused' || $state2 == 'closed' ) {
return TRUE;
}
// status 18 - Partial file. Only a part of the file was transported.
// status 28 - Timeout. Too long/slow upload, try to resume next time rather.
@ -1202,7 +1202,7 @@ class Transport
if ($state2 == 'paused' || $state2 == 'closed' ) {
return TRUE;
}
// check consistency
$size = filesize($row['localfile']);
if ($size < $row['expectedsize']) {