Merge remote-tracking branch 'origin/saas-suspend' into saas

This commit is contained in:
Albert Santoni 2015-04-17 15:23:40 -04:00
commit 1515984664
8 changed files with 109 additions and 61 deletions

View File

@ -91,7 +91,8 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
/**
* Create a global namespace to hold a session token for CSRF prevention
*/
protected function _initCsrfNamespace() {
protected function _initCsrfNamespace()
{
$csrf_namespace = new Zend_Session_Namespace('csrf_namespace');
// Check if the token exists
if (!$csrf_namespace->authtoken) {
@ -107,7 +108,8 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
* from a php init function. This will save us from having to
* reinitialize them every request
*/
private function _initTranslationGlobals() {
private function _initTranslationGlobals()
{
$view = $this->getResource('view');
$view->headScript()->appendScript("var PRODUCT_NAME = '" . PRODUCT_NAME . "';");
$view->headScript()->appendScript("var USER_MANUAL_URL = '" . USER_MANUAL_URL . "';");
@ -193,7 +195,8 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
if (strpos($_SERVER['REQUEST_URI'], $baseUrl . 'Dashboard/stream-player') === false
&& strpos($_SERVER['REQUEST_URI'], $baseUrl . 'audiopreview/audio-preview') === false
&& strpos($_SERVER['REQUEST_URI'], $baseUrl . 'audiopreview/playlist-preview') === false
&& strpos($_SERVER['REQUEST_URI'], $baseUrl.'audiopreview/block-preview') === false) {
&& strpos($_SERVER['REQUEST_URI'], $baseUrl . 'audiopreview/block-preview') === false
) {
$plan_level = strval(Application_Model_Preference::GetPlanLevel());
// Since the Hobbyist plan doesn't come with Live Chat support, don't enable it
if (Application_Model_Preference::GetLiveChatEnabled() && $plan_level !== 'hobbyist') {
@ -217,6 +220,8 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
{
$view = $this->getResource('view');
$view->addHelperPath('../application/views/helpers', 'Airtime_View_Helper');
$view->assign('suspended', (Application_Model_Preference::getProvisioningStatus() == PROVISIONING_STATUS_SUSPENDED));
}
protected function _initTitle()

View File

@ -88,3 +88,7 @@ define("SUBDOMAIN_WHMCS_CUSTOM_FIELD_NAME", "Choose your domain");
//Sentry error logging
define('SENTRY_CONFIG_PATH', '/etc/airtime-saas/sentry.airtime_web.ini');
//Provisioning status
define('PROVISIONING_STATUS_SUSPENDED' , 'Suspended');
define('PROVISIONING_STATUS_ACTIVE' , 'Active');

View File

@ -13,7 +13,6 @@ class DashboardController extends Zend_Controller_Action
public function indexAction()
{
// action body
}
public function disconnectSourceAction()

View File

@ -38,6 +38,9 @@ class ProvisioningController extends Zend_Controller_Action
if ($_POST['description']) {
Application_Model_Preference::SetStationDescription($_POST['description']);
}
if ($_POST['provisioning_status']) {
Application_Model_Preference::setProvisioningStatus($_POST['provisioning_status']);
}
} catch (Exception $e) {
$this->getResponse()
->setHttpResponseCode(400)

View File

@ -20,7 +20,12 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
<!-- End Google Tag Manager -->
<?php echo $this->partial('partialviews/trialBox.phtml', array("is_trial"=>$this->isTrial(), "trial_remain"=> $this->trialRemaining())) ?>
<div id="Panel">
<?php if(!$this->suspended) : ?>
<?php echo $this->partial('partialviews/suspended.phtml'); ?>
<?php else : ?>
<?php echo $this->versionNotify();
$sss = $this->SourceSwitchStatus();
$scs = $this->SourceConnectionStatus();
@ -44,8 +49,10 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
<?php echo $this->navigation()->menu() ?>
<div style="clear:both;"></div>
</div>
<?php endif; //suspended ?>
</div>
<div class="wrapper" id="content"><?php echo $this->layout()->content ?></div>
<script id="tmpl-pl-cues" type="text/template">

View File

@ -1443,4 +1443,15 @@ class Application_Model_Preference
self::setDiskUsage($currentDiskUsage + $filesize);
}
public static function setProvisioningStatus($status)
{
self::setValue("provisioning_status", $status);
}
public static function getProvisioningStatus()
{
return self::getValue("provisioning_status");
}
}

View File

@ -0,0 +1,9 @@
<div class="suspension_notice">
<H2>Station Suspended</H2>
<p>
<?php echo(_pro(sprintf('Your station is suspended due to an <b>unpaid invoice</b>. To restore your station, <a href="%s">please pay any overdue invoices</a>.', '/billing/invoices'))); ?>
</p>
<p>
<?php echo(_pro(sprintf('Suspended stations will be <b>removed</b> if an invoice is unpaid for 30 days. If you believe this suspension was in error, <a href="%s">please contact support</a>.', 'https://sourcefabricberlin.zendesk.com/anonymous_requests/new'))); ?>
</p>
</div>

View File

@ -3217,3 +3217,13 @@ dd .stream-status {
{
color: #222;
}
.suspension_notice
{
text-align: center;
background-color: #b87070;
margin: 5px 5px;
padding: 20px;
font-size: 16px;
font-family: Helvetica, Arial, sans-serif;
}