Merge branch 'master' of dev.sourcefabric.org:campcaster
This commit is contained in:
commit
56f3c705fe
3 changed files with 11 additions and 3 deletions
|
@ -9,7 +9,7 @@
|
||||||
</td>
|
</td>
|
||||||
|
|
||||||
<td>
|
<td>
|
||||||
{assign var="_now value=$SCHEDULER->getSchedulerTime(true)}
|
{assign var="_now" value=$SCHEDULER->getSchedulerTime()}
|
||||||
{if !$_now}
|
{if !$_now}
|
||||||
{assign var="_now" value=$smarty.now}
|
{assign var="_now" value=$smarty.now}
|
||||||
{/if}
|
{/if}
|
||||||
|
|
|
@ -471,10 +471,18 @@ if (!camp_db_table_exists($CC_CONFIG['scheduleTable'])) {
|
||||||
." CONSTRAINT cc_schedule_pkey PRIMARY KEY (id),"
|
." CONSTRAINT cc_schedule_pkey PRIMARY KEY (id),"
|
||||||
." CONSTRAINT unique_id UNIQUE (id))";
|
." CONSTRAINT unique_id UNIQUE (id))";
|
||||||
camp_install_query($sql);
|
camp_install_query($sql);
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
echo " * Skipping: database table already exists: ".$CC_CONFIG['scheduleTable']."\n";
|
echo " * Skipping: database table already exists: ".$CC_CONFIG['scheduleTable']."\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!camp_db_sequence_exists("schedule_group_id_seq")) {
|
||||||
|
echo " * Creating sequence 'schedule_group_id_seq'...";
|
||||||
|
$sql = "CREATE SEQUENCE schedule_group_id_seq";
|
||||||
|
camp_install_query($sql);
|
||||||
|
} else {
|
||||||
|
echo " * Skipping: sequence already exists 'schedule_group_id_seq'.\n";
|
||||||
|
}
|
||||||
|
|
||||||
if (!camp_db_table_exists($CC_CONFIG['backupTable'])) {
|
if (!camp_db_table_exists($CC_CONFIG['backupTable'])) {
|
||||||
echo " * Creating database table ".$CC_CONFIG['backupTable']."...";
|
echo " * Creating database table ".$CC_CONFIG['backupTable']."...";
|
||||||
|
|
|
@ -12,10 +12,10 @@ set_time_limit(0);
|
||||||
error_reporting(E_ALL);
|
error_reporting(E_ALL);
|
||||||
set_error_handler("camp_import_error_handler", E_ALL & !E_NOTICE);
|
set_error_handler("camp_import_error_handler", E_ALL & !E_NOTICE);
|
||||||
|
|
||||||
require_once('DB.php');
|
|
||||||
require_once('Console/Getopt.php');
|
|
||||||
require_once(dirname(__FILE__)."/../conf.php");
|
require_once(dirname(__FILE__)."/../conf.php");
|
||||||
require_once(dirname(__FILE__)."/../backend/GreenBox.php");
|
require_once(dirname(__FILE__)."/../backend/GreenBox.php");
|
||||||
|
require_once('DB.php');
|
||||||
|
require_once('Console/Getopt.php');
|
||||||
|
|
||||||
function camp_import_error_handler()
|
function camp_import_error_handler()
|
||||||
{
|
{
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue