- suspended) : ?>
+ suspended && $this->isTrial()) : ?>
+ partial('partialviews/suspendedtrial.phtml'); ?>
+ suspended && !$this->isTrial()) : ?>
partial('partialviews/suspended.phtml'); ?>
diff --git a/airtime_mvc/application/models/RabbitMq.php b/airtime_mvc/application/models/RabbitMq.php
index 87a89336d..9b399457a 100644
--- a/airtime_mvc/application/models/RabbitMq.php
+++ b/airtime_mvc/application/models/RabbitMq.php
@@ -141,7 +141,7 @@ class Application_Model_RabbitMq
$channel->exchange_declare($exchange, $exchangeType, false, true, $autoDeleteExchange);
$msg = new AMQPMessage($jsonData, array('content_type' => 'text/plain'));
-
+
$channel->basic_publish($msg, $exchange);
$channel->close();
$conn->close();
diff --git a/airtime_mvc/application/models/Scheduler.php b/airtime_mvc/application/models/Scheduler.php
index ec5195fde..de3b73ca1 100644
--- a/airtime_mvc/application/models/Scheduler.php
+++ b/airtime_mvc/application/models/Scheduler.php
@@ -385,6 +385,24 @@ class Application_Model_Scheduler
return $dt;
}
+ private function findTimeDifference2($p_startDT, $p_endDT) {
+ $startEpoch = $p_startDT->format("U.u");
+ $endEpoch = $p_endDT->format("U.u");
+
+ //add two float numbers to 6 subsecond precision
+ //DateTime::createFromFormat("U.u") will have a problem if there is no decimal in the resulting number.
+ $newEpoch = bcsub($endEpoch, (string)$startEpoch, 6);
+
+ $dt = DateTime::createFromFormat("U.u", $newEpoch, new DateTimeZone("UTC"));
+
+ if ($dt === false) {
+ //PHP 5.3.2 problem
+ $dt = DateTime::createFromFormat("U", intval($newEpoch), new DateTimeZone("UTC"));
+ }
+
+ return $dt;
+ }
+
/*
* @param DateTime startDT in UTC
* @param string duration
@@ -499,12 +517,70 @@ class Application_Model_Scheduler
$itemStartDT = $instance->getDbStarts(null);
foreach ($schedule as $item) {
+
+ $itemEndDT = $this->findEndTime($itemStartDT, $item->getDbClipLength());
+
+ $item->setDbStarts($itemStartDT)
+ ->setDbEnds($itemEndDT);
+
+ $itemStartDT = $itemEndDT;
+ }
+
+ $schedule->save($this->con);
+ }
+
+ /** Temporary hack to copy the track cue in, out, and length from the cc_files table to fix
+ * incorrect track lengths (RKTN-260)
+ */
+ public function removeGaps2($showInstance, $exclude = null) {
+
+ $instance = CcShowInstancesQuery::create()->findPK($showInstance, $this->con);
+ if (is_null($instance)) {
+ throw new OutDatedScheduleException(_("The schedule you're viewing is out of date!"));
+ }
+
+ $itemStartDT = $instance->getDbStarts(null);
+
+ $schedule = CcScheduleQuery::create()
+ ->filterByDbInstanceId($showInstance)
+ ->filterByDbId($exclude, Criteria::NOT_IN)
+ ->orderByDbStarts()
+ ->find($this->con);
+
+ foreach ($schedule as $item) {
+
+ //START OF TIME RECALC HACK
+
+ //TODO: Copy the cue in, cue out, and track length from the cc_files table
+ $file = $item->getCcFiles($this->con);
+ if (!$file) {
+ continue;
+ }
+ $item->setDbCueIn($file->getDbCueIn());
+ $item->setDbCueOut($file->getDbCueOut());
+
+ $cueOut = new DateTime($file->getDbCueOut());
+ $cueIn = new DateTime($file->getDbCueIn());
+ $clipLength = $this->findTimeDifference2($cueIn, $cueOut);
+
+ //The clip length is supposed to be cue out - cue in:
+ //FIXME: How do we correctly do time arithmetic in PHP without losing the millseconds?
+ $item->setDbClipLength($clipLength->format(DEFAULT_INTERVAL_FORMAT));
+ $item->save($this->con);
+ //Ensure we don't get cached results
+ CcSchedulePeer::clearInstancePool();
+ //END OF TIME RECALC HACK
+
$itemEndDT = $this->findEndTime($itemStartDT, $item->getDbClipLength());
$item->setDbStarts($itemStartDT)
->setDbEnds($itemEndDT)
->save($this->con);
$itemStartDT = $this->findTimeDifference($itemEndDT, $this->crossfadeDuration);
}
+
+ $instance->updateDbTimeFilled($this->con); //FIXME: TIME RECALC HACK (Albert)
+
+ $schedule->save($this->con);
}
/**
diff --git a/airtime_mvc/application/modules/rest/controllers/MediaController.php b/airtime_mvc/application/modules/rest/controllers/MediaController.php
index 2e6e49110..539201b36 100644
--- a/airtime_mvc/application/modules/rest/controllers/MediaController.php
+++ b/airtime_mvc/application/modules/rest/controllers/MediaController.php
@@ -136,9 +136,8 @@ class Rest_MediaController extends Zend_Rest_Controller
->appendBody("ERROR: Disk Quota reached.");
}
catch (Exception $e) {
- $this->unknownErrorResponse();
- Logging::error($e->getMessage());
- throw $e;
+ $this->serviceUnavailableResponse();
+ Logging::error($e->getMessage() . "\n" . $e->getTraceAsString());
}
}
@@ -249,5 +248,12 @@ class Rest_MediaController extends Zend_Rest_Controller
$resp->setHttpResponseCode(400);
$resp->appendBody("An unknown error occurred.");
}
+
+ private function serviceUnavailableResponse()
+ {
+ $resp = $this->getResponse();
+ $resp->setHttpResponseCode(400);
+ $resp->appendBody("An error occurred while processing your upload. Please try again in a few minutes.");
+ }
}
diff --git a/airtime_mvc/application/views/scripts/billing/upgrade.phtml b/airtime_mvc/application/views/scripts/billing/upgrade.phtml
index fc1799140..83077cb9e 100644
--- a/airtime_mvc/application/views/scripts/billing/upgrade.phtml
+++ b/airtime_mvc/application/views/scripts/billing/upgrade.phtml
@@ -265,10 +265,12 @@ echo($currentProduct["name"]);
//echo Application_Model_Preference::GetPlanLevel();
?>
+