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

Merge branch 'cc-5709-airtime-analyzer-cloud-storage' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer-cloud-storage

This commit is contained in:
drigato 2014-11-27 15:45:26 -05:00
parent 6cb993cc80 670a63df87
commit 2f9382679a
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
airtime_mvc/application/Bootstrap.php
View File

@ -3,7 +3,10 @@ require_once __DIR__."/configs/conf.php";
$CC_CONFIG = Config::getConfig(); $CC_CONFIG = Config::getConfig();
require_once __DIR__."/configs/ACL.php"; require_once __DIR__."/configs/ACL.php";
require_once 'propel/propel1/runtime/lib/Propel.php'; if (!@include_once('propel/propel1/runtime/lib/Propel.php'))
{
die('Error: Propel not found. Did you install Airtime\'s third-party dependencies with composer? (Check the README.)');
}
Propel::init(__DIR__."/configs/airtime-conf-production.php"); Propel::init(__DIR__."/configs/airtime-conf-production.php");

8
airtime_mvc/application/configs/conf.php
View File

@ -27,7 +27,13 @@ class Config {
// Parse separate conf file for Amazon S3 values // Parse separate conf file for Amazon S3 values
$amazonFilename = isset($_SERVER['AMAZONS3_CONF']) ? $_SERVER['AMAZONS3_CONF'] : "/etc/airtime-saas/amazon.conf"; $amazonFilename = isset($_SERVER['AMAZONS3_CONF']) ? $_SERVER['AMAZONS3_CONF'] : "/etc/airtime-saas/amazon.conf";
$amazonValues = parse_ini_file($amazonFilename, true); try {
$amazonValues = parse_ini_file($amazonFilename, true);
} catch (ErrorException $e) {
//This file gets loaded before the Zend bootstrap even runs so our exception handlers aren't installed yet.
//Just die with an error here then instead or handling the error any other way.
die("Error: Invalid or missing $amazonFilename.");
}
$CC_CONFIG['cloud_storage'] = $amazonValues['cloud_storage']; $CC_CONFIG['cloud_storage'] = $amazonValues['cloud_storage'];
$values = parse_ini_file($filename, true); $values = parse_ini_file($filename, true);