From efca227388598441841bacb7e19843e2435f3dd8 Mon Sep 17 00:00:00 2001 From: Albert Santoni Date: Fri, 21 Mar 2014 14:30:41 -0400 Subject: [PATCH 1/2] SAAS-417: Disable Live Chat for Starter Plans * Disable Live Chat for Starter Plans --- airtime_mvc/application/Bootstrap.php | 6 ++++-- airtime_mvc/application/models/Preference.php | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/airtime_mvc/application/Bootstrap.php b/airtime_mvc/application/Bootstrap.php index c3e2a884f..1748294d6 100644 --- a/airtime_mvc/application/Bootstrap.php +++ b/airtime_mvc/application/Bootstrap.php @@ -138,8 +138,10 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap && 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) { - $client_id = Application_Model_Preference::GetClientId(); - $view->headScript()->appendScript("var livechat_client_id = '$client_id';"); + if (Application_Model_Preference::GetLiveChatEnabled()) { + $client_id = Application_Model_Preference::GetClientId(); + $view->headScript()->appendScript("var livechat_client_id = '$client_id';"); + } $view->headScript()->appendFile($baseUrl . 'js/airtime/common/livechat.js?'.$CC_CONFIG['airtime_version'], 'text/javascript'); } diff --git a/airtime_mvc/application/models/Preference.php b/airtime_mvc/application/models/Preference.php index 87c85ae01..373a73d9a 100644 --- a/airtime_mvc/application/models/Preference.php +++ b/airtime_mvc/application/models/Preference.php @@ -1003,6 +1003,24 @@ class Application_Model_Preference Logging::warn("Attempting to set client_id to invalid value: $id"); } } + + public static function GetLiveChatEnabled() + { + $liveChat = self::getValue("live_chat", false); + if (is_null($liveChat) || $liveChat == "" || $liveChat == "1") { //Defaults to on + return true; + } + return false; + } + + public static function SetLiveChatEnabled($toggle) + { + if (is_bool($toggle)) { + self::setValue("live_chat", $toggle ? "1" : "0"); + } else { + Logging::warn("Attempting to set live_chat to invalid value: $toggle. Must be a bool."); + } + } /* User specific preferences start */ From e5e4d5bb012a562a82b550e450d8664d7522a6bc Mon Sep 17 00:00:00 2001 From: Albert Santoni Date: Fri, 21 Mar 2014 16:27:32 -0400 Subject: [PATCH 2/2] SAAS-417: quick fix for typo --- airtime_mvc/application/Bootstrap.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airtime_mvc/application/Bootstrap.php b/airtime_mvc/application/Bootstrap.php index 1748294d6..8ac1bf378 100644 --- a/airtime_mvc/application/Bootstrap.php +++ b/airtime_mvc/application/Bootstrap.php @@ -141,8 +141,8 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap if (Application_Model_Preference::GetLiveChatEnabled()) { $client_id = Application_Model_Preference::GetClientId(); $view->headScript()->appendScript("var livechat_client_id = '$client_id';"); + $view->headScript()->appendFile($baseUrl . 'js/airtime/common/livechat.js?'.$CC_CONFIG['airtime_version'], 'text/javascript'); } - $view->headScript()->appendFile($baseUrl . 'js/airtime/common/livechat.js?'.$CC_CONFIG['airtime_version'], 'text/javascript'); } if (isset($CC_CONFIG['demo']) && $CC_CONFIG['demo'] == 1) {