From 8fbe7dd6499e146616673d30256595705f26f602 Mon Sep 17 00:00:00 2001
From: Albert Santoni <albert.santoni@sourcefabric.org>
Date: Wed, 26 Nov 2014 17:50:59 -0500
Subject: [PATCH] Report an error and die if amazon.conf is missing

---
 airtime_mvc/application/configs/conf.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/airtime_mvc/application/configs/conf.php b/airtime_mvc/application/configs/conf.php
index fd66453dd..38492c11e 100644
--- a/airtime_mvc/application/configs/conf.php
+++ b/airtime_mvc/application/configs/conf.php
@@ -27,7 +27,13 @@ class Config {
         
         // Parse separate conf file for Amazon S3 values
         $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'];
         
         $values = parse_ini_file($filename, true);