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

CC-1024 Update installation/build for webapp-only

Browse source 
Moved more installation stuff into PHP.  For some reason it's having trouble
creating the cc_playlistcontents table.  Removed old installer files that
are no longer used.
This commit is contained in:
paul.baranowski 2010-10-04 17:00:20 -04:00
parent 2eea85d502
commit 739801d180
11 changed files with 235 additions and 1525 deletions
Download patch file Download diff file Expand all files Collapse all files

5
backend/Restore.php
View file

@ -1,5 +1,4 @@
<?php
define('ACCESS_TYPE', 'restore');
/**
* @package Campcaster
@ -49,6 +48,8 @@ class Restore {
*/
private $gb;
private $ACCESS_TYPE = 'restore';
/**
* @param GreenBox $gb
* greenbox object reference
@ -58,7 +59,7 @@ class Restore {
global $CC_CONFIG;
$this->gb =& $gb;
$this->token = null;
$this->logFile = $CC_CONFIG['bufferDir'].'/'.ACCESS_TYPE.'.log';
$this->logFile = $CC_CONFIG['bufferDir'].'/'.$this->ACCESS_TYPE.'.log';
if ($this->loglevel == 'debug') {
$this->addLogItem("-I- ".date("Ymd-H:i:s")." construct\n");
}

5
backend/StoredFile.php
View file

@ -504,7 +504,8 @@ class StoredFile {
$storedFile->name = isset($p_values['filename']) ? $p_values['filename'] : $p_values["filepath"];
// NOTE: POSTGRES-SPECIFIC KEYWORD "DEFAULT" BEING USED, WOULD BE "NULL" IN MYSQL
$storedFile->id = isset($p_values['id']) && is_integer($p_values['id'])?"'".$p_values['id']."'":'DEFAULT';
$storedFile->id = isset($p_values['id']) && is_integer($p_values['id'])?(int)$p_values['id']:null;
$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'];
@ -529,7 +530,7 @@ class StoredFile {
$CC_DBC->query("BEGIN");
$sql = "INSERT INTO ".$CC_CONFIG['filesTable']
."(id, name, gunid, mime, state, ftype, mtime, md5)"
."VALUES ({$storedFile->id}, '{$escapedName}', "
."VALUES ({$sqlId}, '{$escapedName}', "
." x'{$storedFile->gunid}'::bigint,"
." '{$storedFile->mime}', 'incomplete', '$escapedFtype',"
." now(), '{$storedFile->md5}')";