From d2704c4d222088ad4d878fd31d22deb7a626a847 Mon Sep 17 00:00:00 2001 From: denise Date: Mon, 14 May 2012 15:24:53 -0400 Subject: [PATCH 01/23] - check if variable exists before using if exlpode() was called --- airtime_mvc/application/models/LiveLog.php | 51 +++++++++++++++++----- 1 file changed, 41 insertions(+), 10 deletions(-) diff --git a/airtime_mvc/application/models/LiveLog.php b/airtime_mvc/application/models/LiveLog.php index c3a254062..dc3090239 100644 --- a/airtime_mvc/application/models/LiveLog.php +++ b/airtime_mvc/application/models/LiveLog.php @@ -32,10 +32,18 @@ class Application_Model_LiveLog $duration = $start->diff($end); $duration = $duration->format("%H:%i:%s"); $intervals = explode(":", $duration); + for ($i = 0; $i < sizeof($intervals); $i++) { + if (!isset($intervals[$i])) { + $intervals[$i] = 0; + } + } + // Trim milliseconds (DateInterval does not support) $sec = explode(".", $intervals[2]); - $intervals[2] = $sec[0]; - + if (isset($sec[0])) { + $intervals[2] = $sec[0]; + } + $seconds += $intervals[2]; if ($seconds / 60 >= 1) { $minutes += 1; @@ -59,9 +67,12 @@ class Application_Model_LiveLog } //Trim milliseconds $seconds = explode(".", $seconds); - $minutes = (double)(($hours*60)+$minutes . "." . $seconds[0]); - //$duration = new DateInterval("PT" . $minutes . "M" . $seconds[0] ."S"); - //return $duration->format("%i.%s"); + if (isset($seconds[0])) { + $minutes = (double)(($hours*60)+$minutes . "." . $seconds[0]); + } + else { + $minutes = (double)(($hours*60)+$minutes); + } return $minutes; } catch (Exception $e) { header('HTTP/1.0 503 Service Unavailable'); @@ -70,7 +81,7 @@ class Application_Model_LiveLog } } - public static function GetScheduledDuration($p_keepData = false) + public static function GetScheduledDuration($p_keepData=false) { try { $con = Propel::getConnection(); @@ -118,11 +129,21 @@ class Application_Model_LiveLog $clip_length = $track['clip_length']; //Convert clip_length into seconds $clip_length_intervals = explode(":", $clip_length); + for ($i = 0; $i < sizeof($clip_length_intervals); $i++) { + if (!isset($clip_length_intervals[$i])) { + $clip_length_intervals[$i] = 0; + } + } $clip_length_seconds = $clip_length_intervals[0]*3600 + $clip_length_intervals[1]*60 + $clip_length_intervals[2]; $extra_time = $extra_time->format("%H:%i:%s"); //Convert extra_time into seconds; $extra_time_intervals = explode(":", $extra_time); + for ($i = 0; $i < sizeof($extra_time_intervals); $i++) { + if (!isset($extra_time_intervals[$i])) { + $extra_time_intervals[$i] = 0; + } + } $extra_time_seconds = $extra_time_intervals[0]*3600 + $extra_time_intervals[1]*60 + $extra_time_intervals[2]; $clip_length_seconds -= $extra_time_seconds; @@ -152,9 +173,16 @@ class Application_Model_LiveLog } $intervals = explode(":", $clip_length); + for ($i = 0; $i < sizeof($intervals); $i++) { + if (!isset($intervals[$i])) { + $intervals[$i] = 0; + } + } // Trim milliseconds (DateInteral does not support) $sec = explode(".", $intervals[2]); - $intervals[2] = $sec[0]; + if (isset($sec[0])) { + $intervals[2] = $sec[0]; + } $seconds += $intervals[2]; if ($seconds / 60 >= 1) { @@ -181,9 +209,12 @@ class Application_Model_LiveLog $seconds = explode(".", $seconds); - $minutes = (double)(($hours*60)+$minutes . "." . $seconds[0]); - //$duration = new DateInterval("PT". $minutes . "M" . $seconds[0] ."S"); - //return $duration->format("%i.%s"); + if (isset($seconds[0])) { + $minutes = (double)(($hours*60)+$minutes . "." . $seconds[0]); + } + else { + $minutes = (double)(($hours*60)+$minutes); + } return $minutes; } catch (Exception $e) { header('HTTP/1.0 503 Service Unavailable'); From 12be26925e69dfa9672b620b00da7529b87ea14d Mon Sep 17 00:00:00 2001 From: denise Date: Mon, 14 May 2012 15:38:04 -0400 Subject: [PATCH 02/23] -set p_keepData parameter to true when Application_Model_Preference::GetSystemInfo is called -this will keep all the cc_live_log data in tact if support-settings are saved --- airtime_mvc/application/forms/RegisterAirtime.php | 2 +- airtime_mvc/application/forms/SupportSettings.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/airtime_mvc/application/forms/RegisterAirtime.php b/airtime_mvc/application/forms/RegisterAirtime.php index d4df4d77c..223422ae6 100644 --- a/airtime_mvc/application/forms/RegisterAirtime.php +++ b/airtime_mvc/application/forms/RegisterAirtime.php @@ -134,7 +134,7 @@ class Application_Form_RegisterAirtime extends Zend_Form 'readonly' => true, 'rows' => 5, 'cols' => 61, - 'value' => Application_Model_Preference::GetSystemInfo(), + 'value' => Application_Model_Preference::GetSystemInfo(false, true), 'decorators' => array( 'ViewHelper' ) diff --git a/airtime_mvc/application/forms/SupportSettings.php b/airtime_mvc/application/forms/SupportSettings.php index 27c5e0c80..426db3831 100644 --- a/airtime_mvc/application/forms/SupportSettings.php +++ b/airtime_mvc/application/forms/SupportSettings.php @@ -139,7 +139,7 @@ class Application_Form_SupportSettings extends Zend_Form 'readonly' => true, 'cols' => 61, 'rows' => 5, - 'value' => Application_Model_Preference::GetSystemInfo(), + 'value' => Application_Model_Preference::GetSystemInfo(false, true), 'decorators' => array( 'ViewHelper' ) From 08c20cff10e644b6748869f7370157317f76e941 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Mon, 14 May 2012 16:09:49 -0400 Subject: [PATCH 03/23] CC-3791: Media Monitor crash when there are media files with non-ascii name in watched folder -add UTF-8 header everywhere... --- .../airtimefilemonitor/airtimemediamonitorbootstrap.py | 2 ++ .../media-monitor/airtimefilemonitor/airtimemetadata.py | 2 ++ .../media-monitor/airtimefilemonitor/airtimenotifier.py | 2 ++ .../media-monitor/airtimefilemonitor/airtimeprocessevent.py | 4 +++- python_apps/media-monitor/airtimefilemonitor/mediaconfig.py | 2 ++ .../media-monitor/airtimefilemonitor/mediamonitorcommon.py | 2 ++ python_apps/media-monitor/airtimefilemonitor/workerprocess.py | 2 ++ python_apps/media-monitor/media_monitor.py | 2 ++ python_apps/pypo/pypofetch.py | 2 ++ python_apps/pypo/pypofile.py | 2 ++ python_apps/pypo/pypomessagehandler.py | 2 ++ python_apps/pypo/pypopush.py | 2 ++ python_apps/pypo/recorder.py | 2 ++ 13 files changed, 27 insertions(+), 1 deletion(-) diff --git a/python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py b/python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py index 5d738528c..368b02fef 100644 --- a/python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py +++ b/python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py @@ -1,3 +1,5 @@ +# -*- coding: utf-8 -*- + import os import time import pyinotify diff --git a/python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py b/python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py index c9f5afbc0..09f7c1a59 100644 --- a/python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py +++ b/python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py @@ -1,3 +1,5 @@ +# -*- coding: utf-8 -*- + import os import hashlib import mutagen diff --git a/python_apps/media-monitor/airtimefilemonitor/airtimenotifier.py b/python_apps/media-monitor/airtimefilemonitor/airtimenotifier.py index e527d56cb..c6586efc5 100644 --- a/python_apps/media-monitor/airtimefilemonitor/airtimenotifier.py +++ b/python_apps/media-monitor/airtimefilemonitor/airtimenotifier.py @@ -1,3 +1,5 @@ +# -*- coding: utf-8 -*- + import json import time import os diff --git a/python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py b/python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py index 464a05a15..48d772346 100644 --- a/python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py +++ b/python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py @@ -1,3 +1,5 @@ +# -*- coding: utf-8 -*- + import socket import logging import time @@ -217,7 +219,7 @@ class AirtimeProcessEvent(ProcessEvent): #directory. def process_IN_MOVED_FROM(self, event): - #we only care about files that have been moved away from imported/ or organize/ dir + #we don't care about files that have been moved from problem_directory if event.path in self.config.problem_directory: return diff --git a/python_apps/media-monitor/airtimefilemonitor/mediaconfig.py b/python_apps/media-monitor/airtimefilemonitor/mediaconfig.py index 1d60d7b97..f51b23506 100644 --- a/python_apps/media-monitor/airtimefilemonitor/mediaconfig.py +++ b/python_apps/media-monitor/airtimefilemonitor/mediaconfig.py @@ -1,3 +1,5 @@ +# -*- coding: utf-8 -*- + import sys from configobj import ConfigObj diff --git a/python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py b/python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py index bbacc69f9..396f9909a 100644 --- a/python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py +++ b/python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py @@ -1,3 +1,5 @@ +# -*- coding: utf-8 -*- + import os import grp import pwd diff --git a/python_apps/media-monitor/airtimefilemonitor/workerprocess.py b/python_apps/media-monitor/airtimefilemonitor/workerprocess.py index ce8e19f0a..deccd736c 100644 --- a/python_apps/media-monitor/airtimefilemonitor/workerprocess.py +++ b/python_apps/media-monitor/airtimefilemonitor/workerprocess.py @@ -1,3 +1,5 @@ +# -*- coding: utf-8 -*- + from mediaconfig import AirtimeMediaConfig import traceback import os diff --git a/python_apps/media-monitor/media_monitor.py b/python_apps/media-monitor/media_monitor.py index 8db6df69f..a629e6718 100644 --- a/python_apps/media-monitor/media_monitor.py +++ b/python_apps/media-monitor/media_monitor.py @@ -1,3 +1,5 @@ +# -*- coding: utf-8 -*- + import time import logging import logging.config diff --git a/python_apps/pypo/pypofetch.py b/python_apps/pypo/pypofetch.py index a7695490d..3588bfbef 100644 --- a/python_apps/pypo/pypofetch.py +++ b/python_apps/pypo/pypofetch.py @@ -1,3 +1,5 @@ +# -*- coding: utf-8 -*- + import os import sys import time diff --git a/python_apps/pypo/pypofile.py b/python_apps/pypo/pypofile.py index 1a52fd5c8..7b948000c 100644 --- a/python_apps/pypo/pypofile.py +++ b/python_apps/pypo/pypofile.py @@ -1,3 +1,5 @@ +# -*- coding: utf-8 -*- + from threading import Thread from Queue import Empty from configobj import ConfigObj diff --git a/python_apps/pypo/pypomessagehandler.py b/python_apps/pypo/pypomessagehandler.py index 128ebec13..83897a57e 100644 --- a/python_apps/pypo/pypomessagehandler.py +++ b/python_apps/pypo/pypomessagehandler.py @@ -1,3 +1,5 @@ +# -*- coding: utf-8 -*- + import logging import logging.config import sys diff --git a/python_apps/pypo/pypopush.py b/python_apps/pypo/pypopush.py index 56736c107..86d799b22 100644 --- a/python_apps/pypo/pypopush.py +++ b/python_apps/pypo/pypopush.py @@ -1,3 +1,5 @@ +# -*- coding: utf-8 -*- + from datetime import datetime from datetime import timedelta diff --git a/python_apps/pypo/recorder.py b/python_apps/pypo/recorder.py index 4096ed767..7404fd080 100644 --- a/python_apps/pypo/recorder.py +++ b/python_apps/pypo/recorder.py @@ -1,3 +1,5 @@ +# -*- coding: utf-8 -*- + import logging import logging.config import json From c24a8a2308c1b51260379e09ef8779d460e90112 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Mon, 14 May 2012 17:50:08 -0400 Subject: [PATCH 04/23] CC-3791: Media Monitor crash when there are media files with non-ascii name in watched folder -override LC_ALL=POSIX that happens on system bootup --- python_apps/media-monitor/airtime-media-monitor | 1 + 1 file changed, 1 insertion(+) diff --git a/python_apps/media-monitor/airtime-media-monitor b/python_apps/media-monitor/airtime-media-monitor index f1382824b..553568032 100755 --- a/python_apps/media-monitor/airtime-media-monitor +++ b/python_apps/media-monitor/airtime-media-monitor @@ -15,6 +15,7 @@ cd ${media_monitor_path} exec 2>&1 export PYTHONPATH=${api_client_path} +export LC_ALL=`cat /etc/default/locale | grep "LANG=" | cut -d= -f2` # Note the -u when calling python! we need it to get unbuffered binary stdout and stderr exec python -u ${media_monitor_path}${media_monitor_script} > /var/log/airtime/media-monitor/py-interpreter.log 2>&1 From 6add79268fdbf4e3bfeaebc8718ad5b390935f9e Mon Sep 17 00:00:00 2001 From: denise Date: Mon, 14 May 2012 18:10:20 -0400 Subject: [PATCH 05/23] CC-3797: Feedback Metrics "Show Me What I Am Sending" doesnt show all of the fields that are being sent - system info from airtime-check-system now displays in "Show Me What I Am Sending" --- airtime_mvc/application/models/Preference.php | 8 ++++++-- utils/airtime-check-system.php | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/airtime_mvc/application/models/Preference.php b/airtime_mvc/application/models/Preference.php index 0820357e7..a8af84410 100644 --- a/airtime_mvc/application/models/Preference.php +++ b/airtime_mvc/application/models/Preference.php @@ -400,7 +400,6 @@ class Application_Model_Preference public static function GetSystemInfo($returnArray=false, $p_testing=false) { exec('/usr/bin/airtime-check-system --no-color', $output); - $output = preg_replace('/\s+/', ' ', $output); $systemInfoArray = array(); @@ -409,7 +408,12 @@ class Application_Model_Preference if(isset($info[1])){ $key = str_replace(' ', '_', trim($info[0])); $key = strtoupper($key); - $systemInfoArray[$key] = $info[1]; + if ($key == 'WEB_SERVER' || $key == 'CPU' || $key == 'OS' || $key == 'TOTAL_RAM' || + $key == 'FREE_RAM' || $key == 'AIRTIME_VERSION' || $key == 'KERNAL_VERSION' || + $key == 'MACHINE_ARCHITECTURE' || $key == 'TOTAL_MEMORY_MBYTES' || $key == 'TOTAL_SWAP_MBYTES' || + $key == 'PLAYOUT_ENGINE_CPU_PERC' ) { + $systemInfoArray[$key] = $info[1]; + } } } diff --git a/utils/airtime-check-system.php b/utils/airtime-check-system.php index a91fa4efa..22ff7362c 100644 --- a/utils/airtime-check-system.php +++ b/utils/airtime-check-system.php @@ -34,7 +34,7 @@ class AirtimeCheck { { // Need to check that we are superuser before running this. $euid = posix_geteuid(); - $user = posix_getlogin(); + $user = exec('whoami'); if($euid != 0 && $user != "www-data"){ echo "Must be root user.\n"; exit(1); From 92931f662f709c5b019093ea18741e2e03f92802 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Mon, 14 May 2012 18:35:20 -0400 Subject: [PATCH 06/23] CC-3791: Media Monitor crash when there are media files with non-ascii name in watched folder -override LC_ALL=POSIX that happens on system bootup --- install_minimal/airtime-install | 8 ++++++++ python_apps/media-monitor/airtime-media-monitor | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/install_minimal/airtime-install b/install_minimal/airtime-install index 06c317f08..0b73569b1 100755 --- a/install_minimal/airtime-install +++ b/install_minimal/airtime-install @@ -185,6 +185,14 @@ if [ "$DO_UPGRADE" -eq "0" ]; then fi set -e +echo "* Making sure /etc/default/locale is set properly" +update-locale +cat /etc/default/locale | grep -i "LANG=.*UTF-\?8" +if [ "$?" != "0" ]; then + echo "non UTF-8 default locale found in /etc/default/locale.".PHP_EOL; + exit 1 +fi + $SCRIPTPATH/include/airtime-copy-files.sh $SCRIPTPATH/include/airtime-initialize.sh $@ diff --git a/python_apps/media-monitor/airtime-media-monitor b/python_apps/media-monitor/airtime-media-monitor index 553568032..4af3f4be8 100755 --- a/python_apps/media-monitor/airtime-media-monitor +++ b/python_apps/media-monitor/airtime-media-monitor @@ -15,7 +15,7 @@ cd ${media_monitor_path} exec 2>&1 export PYTHONPATH=${api_client_path} -export LC_ALL=`cat /etc/default/locale | grep "LANG=" | cut -d= -f2` +export LC_ALL=`cat /etc/default/locale | grep "LANG=" | cut -d= -f2 | tr -d "\n\""` # Note the -u when calling python! we need it to get unbuffered binary stdout and stderr exec python -u ${media_monitor_path}${media_monitor_script} > /var/log/airtime/media-monitor/py-interpreter.log 2>&1 From 9d672ab3740298e5243b0cfd9e56e8e6444f0426 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Mon, 14 May 2012 18:44:23 -0400 Subject: [PATCH 07/23] CC-3791: Media Monitor crash when there are media files with non-ascii name in watched folder -was using PHP syntax :/ -remove error checking around grep process --- install_minimal/airtime-install | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/install_minimal/airtime-install b/install_minimal/airtime-install index 0b73569b1..51627b188 100755 --- a/install_minimal/airtime-install +++ b/install_minimal/airtime-install @@ -186,10 +186,12 @@ fi set -e echo "* Making sure /etc/default/locale is set properly" +set +e update-locale cat /etc/default/locale | grep -i "LANG=.*UTF-\?8" +set -e if [ "$?" != "0" ]; then - echo "non UTF-8 default locale found in /etc/default/locale.".PHP_EOL; + echo "non UTF-8 default locale found in /etc/default/locale." exit 1 fi From 7d691a44af9b985ea11a166c0783ce9dee3034a4 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Mon, 14 May 2012 18:52:06 -0400 Subject: [PATCH 08/23] CC-3791: Media Monitor crash when there are media files with non-ascii name in watched folder -move locale check to beginning of install script --- install_minimal/airtime-install | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/install_minimal/airtime-install b/install_minimal/airtime-install index 51627b188..45be0bb9f 100755 --- a/install_minimal/airtime-install +++ b/install_minimal/airtime-install @@ -105,6 +105,17 @@ if [ "$LSOF_EXIST" != "0" -o "$SUDO_EXIST" != "0" ]; then exit 1 fi +echo "* Making sure /etc/default/locale is set properly" +set +e +update-locale +cat /etc/default/locale | grep -i "LANG=.*UTF-\?8" +set -e +if [ "$?" != "0" ]; then + echo "non UTF-8 default locale found in /etc/default/locale." + exit 1 +fi + + # Check if airtime exists already set +e php --php-ini ${SCRIPTPATH}/airtime-php.ini ${SCRIPTPATH}/include/airtime-installed-check.php @@ -185,16 +196,6 @@ if [ "$DO_UPGRADE" -eq "0" ]; then fi set -e -echo "* Making sure /etc/default/locale is set properly" -set +e -update-locale -cat /etc/default/locale | grep -i "LANG=.*UTF-\?8" -set -e -if [ "$?" != "0" ]; then - echo "non UTF-8 default locale found in /etc/default/locale." - exit 1 -fi - $SCRIPTPATH/include/airtime-copy-files.sh $SCRIPTPATH/include/airtime-initialize.sh $@ From b79f02ab88a5ec59a6ec03d2d1a4bb7a0edc0a7a Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Mon, 14 May 2012 19:19:35 -0400 Subject: [PATCH 09/23] CC-3791: Media Monitor crash when there are media files with non-ascii name in watched folder --- python_apps/media-monitor/media_monitor.py | 10 +++++++++- python_apps/pypo/airtime-playout | 1 + python_apps/pypo/pypocli.py | 17 +++++++++++++++-- 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/python_apps/media-monitor/media_monitor.py b/python_apps/media-monitor/media_monitor.py index a629e6718..2a4558191 100644 --- a/python_apps/media-monitor/media_monitor.py +++ b/python_apps/media-monitor/media_monitor.py @@ -8,6 +8,7 @@ import os import signal import traceback import locale +import re from configobj import ConfigObj @@ -47,7 +48,14 @@ def configure_locale(): else: new_locale = default_locale - logger.debug("New locale set to: " + locale.setlocale(locale.LC_ALL, new_locale)) + test = re.compile(r"UTF-?8", re.IGNORECASE) + if re.findall(new_locale): + logger.info("New locale set to: %s", locale.setlocale(locale.LC_ALL, new_locale)) + else: + logger.info("Invalid locale %s", new_locale) + sys.exit(1) + + reload(sys) sys.setdefaultencoding("UTF-8") diff --git a/python_apps/pypo/airtime-playout b/python_apps/pypo/airtime-playout index 05fbd20c4..101977596 100755 --- a/python_apps/pypo/airtime-playout +++ b/python_apps/pypo/airtime-playout @@ -14,6 +14,7 @@ exec 2>&1 export HOME="/var/tmp/airtime/pypo/" export PYTHONPATH=${api_client_path}:$PYTHONPATH +export LC_ALL=`cat /etc/default/locale | grep "LANG=" | cut -d= -f2 | tr -d "\n\""` # Note the -u when calling python! we need it to get unbuffered binary stdout and stderr exec python -u ${pypo_path}${pypo_script} > /var/log/airtime/pypo/py-interpreter.log 2>&1 diff --git a/python_apps/pypo/pypocli.py b/python_apps/pypo/pypocli.py index 0ef7e1927..b1c58fc88 100644 --- a/python_apps/pypo/pypocli.py +++ b/python_apps/pypo/pypocli.py @@ -11,6 +11,7 @@ import logging.config import logging.handlers import locale import os +import re from Queue import Queue from threading import Lock @@ -51,6 +52,7 @@ parser.add_option("-c", "--check", help="Check the cached schedule and exit", de #logging.captureWarnings(True) def configure_locale(): + logger.debug("Before %s", locale.nl_langinfo(locale.CODESET)) current_locale = locale.getlocale() if current_locale[1] is None: @@ -69,13 +71,24 @@ def configure_locale(): else: new_locale = default_locale - logger.debug("New locale set to: " + locale.setlocale(locale.LC_ALL, new_locale)) + test = re.compile(r"UTF-?8", re.IGNORECASE) + if re.findall(new_locale): + logger.info("New locale set to: %s", locale.setlocale(locale.LC_ALL, new_locale)) + else: + logger.info("Invalid locale %s", new_locale) + sys.exit(1) + + - + reload(sys) + sys.setdefaultencoding("UTF-8") current_locale_encoding = locale.getlocale()[1].lower() + logger.debug("sys default encoding %s", sys.getdefaultencoding()) + logger.debug("After %s", locale.nl_langinfo(locale.CODESET)) if current_locale_encoding not in ['utf-8', 'utf8']: logger.error("Need a UTF-8 locale. Currently '%s'. Exiting..." % current_locale_encoding) + sys.exit(1) # configure logging try: From c1d33e9f72e628de02f7a3e3df0dd9560f011cee Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Mon, 14 May 2012 19:31:50 -0400 Subject: [PATCH 10/23] CC-3791: Media Monitor crash when there are media files with non-ascii name in watched folder -syntax errors --- python_apps/media-monitor/media_monitor.py | 2 +- python_apps/pypo/pypocli.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/python_apps/media-monitor/media_monitor.py b/python_apps/media-monitor/media_monitor.py index 2a4558191..024b5ae41 100644 --- a/python_apps/media-monitor/media_monitor.py +++ b/python_apps/media-monitor/media_monitor.py @@ -49,7 +49,7 @@ def configure_locale(): new_locale = default_locale test = re.compile(r"UTF-?8", re.IGNORECASE) - if re.findall(new_locale): + if test.findall(new_locale): logger.info("New locale set to: %s", locale.setlocale(locale.LC_ALL, new_locale)) else: logger.info("Invalid locale %s", new_locale) diff --git a/python_apps/pypo/pypocli.py b/python_apps/pypo/pypocli.py index b1c58fc88..0f804fd30 100644 --- a/python_apps/pypo/pypocli.py +++ b/python_apps/pypo/pypocli.py @@ -72,7 +72,7 @@ def configure_locale(): new_locale = default_locale test = re.compile(r"UTF-?8", re.IGNORECASE) - if re.findall(new_locale): + if test.findall(new_locale): logger.info("New locale set to: %s", locale.setlocale(locale.LC_ALL, new_locale)) else: logger.info("Invalid locale %s", new_locale) From c397a6f797800fee3d158b8ac83a0a1f363f88e3 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Mon, 14 May 2012 19:46:53 -0400 Subject: [PATCH 11/23] CC-3791: Media Monitor crash when there are media files with non-ascii name in watched folder -move utf-8 locale check to bash --- python_apps/media-monitor/airtime-media-monitor | 10 +++++++++- python_apps/media-monitor/media_monitor.py | 8 +------- python_apps/pypo/airtime-playout | 10 +++++++++- python_apps/pypo/pypocli.py | 8 +------- 4 files changed, 20 insertions(+), 16 deletions(-) diff --git a/python_apps/media-monitor/airtime-media-monitor b/python_apps/media-monitor/airtime-media-monitor index 4af3f4be8..9fb0ce262 100755 --- a/python_apps/media-monitor/airtime-media-monitor +++ b/python_apps/media-monitor/airtime-media-monitor @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -e # Location of pypo_cli.py Python script @@ -14,6 +14,14 @@ cd ${media_monitor_path} exec 2>&1 +set +e +cat /etc/default/locale | grep -i "LANG=.*UTF-\?8" +set -e +if [ "$?" != "0" ]; then + echo "non UTF-8 default locale found in /etc/default/locale." > /var/log/airtime/pypo/error.log + exit 1 +fi + export PYTHONPATH=${api_client_path} export LC_ALL=`cat /etc/default/locale | grep "LANG=" | cut -d= -f2 | tr -d "\n\""` diff --git a/python_apps/media-monitor/media_monitor.py b/python_apps/media-monitor/media_monitor.py index 024b5ae41..3fbb681bd 100644 --- a/python_apps/media-monitor/media_monitor.py +++ b/python_apps/media-monitor/media_monitor.py @@ -8,7 +8,6 @@ import os import signal import traceback import locale -import re from configobj import ConfigObj @@ -48,12 +47,7 @@ def configure_locale(): else: new_locale = default_locale - test = re.compile(r"UTF-?8", re.IGNORECASE) - if test.findall(new_locale): - logger.info("New locale set to: %s", locale.setlocale(locale.LC_ALL, new_locale)) - else: - logger.info("Invalid locale %s", new_locale) - sys.exit(1) + logger.info("New locale set to: %s", locale.setlocale(locale.LC_ALL, new_locale)) diff --git a/python_apps/pypo/airtime-playout b/python_apps/pypo/airtime-playout index 101977596..f6d11df11 100755 --- a/python_apps/pypo/airtime-playout +++ b/python_apps/pypo/airtime-playout @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -e virtualenv_bin="/usr/lib/airtime/airtime_virtualenv/bin/" . ${virtualenv_bin}activate @@ -12,6 +12,14 @@ pypo_script="pypocli.py" cd ${pypo_path} exec 2>&1 +set +e +cat /etc/default/locale | grep -i "LANG=.*UTF-\?8" +set -e +if [ "$?" != "0" ]; then + echo "non UTF-8 default locale found in /etc/default/locale." > /var/log/airtime/pypo/error.log + exit 1 +fi + export HOME="/var/tmp/airtime/pypo/" export PYTHONPATH=${api_client_path}:$PYTHONPATH export LC_ALL=`cat /etc/default/locale | grep "LANG=" | cut -d= -f2 | tr -d "\n\""` diff --git a/python_apps/pypo/pypocli.py b/python_apps/pypo/pypocli.py index 0f804fd30..1cc8ff2c8 100644 --- a/python_apps/pypo/pypocli.py +++ b/python_apps/pypo/pypocli.py @@ -11,7 +11,6 @@ import logging.config import logging.handlers import locale import os -import re from Queue import Queue from threading import Lock @@ -71,12 +70,7 @@ def configure_locale(): else: new_locale = default_locale - test = re.compile(r"UTF-?8", re.IGNORECASE) - if test.findall(new_locale): - logger.info("New locale set to: %s", locale.setlocale(locale.LC_ALL, new_locale)) - else: - logger.info("Invalid locale %s", new_locale) - sys.exit(1) + logger.info("New locale set to: %s", locale.setlocale(locale.LC_ALL, new_locale)) From cadf0acac7cebaa12a765875f72f4d8b8820066b Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Mon, 14 May 2012 19:53:07 -0400 Subject: [PATCH 12/23] CC-3791: Media Monitor crash when there are media files with non-ascii name in watched folder -fix utf-8 check --- python_apps/media-monitor/airtime-media-monitor | 4 ++-- python_apps/pypo/airtime-playout | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/python_apps/media-monitor/airtime-media-monitor b/python_apps/media-monitor/airtime-media-monitor index 9fb0ce262..6bb450c62 100755 --- a/python_apps/media-monitor/airtime-media-monitor +++ b/python_apps/media-monitor/airtime-media-monitor @@ -1,4 +1,4 @@ -#!/bin/bash -e +#!/bin/bash # Location of pypo_cli.py Python script @@ -18,7 +18,7 @@ set +e cat /etc/default/locale | grep -i "LANG=.*UTF-\?8" set -e if [ "$?" != "0" ]; then - echo "non UTF-8 default locale found in /etc/default/locale." > /var/log/airtime/pypo/error.log + echo "non UTF-8 default locale found in /etc/default/locale." > /var/log/airtime/media-monitor/error.log exit 1 fi diff --git a/python_apps/pypo/airtime-playout b/python_apps/pypo/airtime-playout index f6d11df11..09ee51a91 100755 --- a/python_apps/pypo/airtime-playout +++ b/python_apps/pypo/airtime-playout @@ -1,4 +1,4 @@ -#!/bin/bash -e +#!/bin/bash virtualenv_bin="/usr/lib/airtime/airtime_virtualenv/bin/" . ${virtualenv_bin}activate From 4a6a31c5a4444451d1e46dfb7be5e3a66dabf007 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Mon, 14 May 2012 19:55:38 -0400 Subject: [PATCH 13/23] CC-3791: Media Monitor crash when there are media files with non-ascii name in watched folder -indent error --- python_apps/media-monitor/media_monitor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python_apps/media-monitor/media_monitor.py b/python_apps/media-monitor/media_monitor.py index 3fbb681bd..7522ecdcc 100644 --- a/python_apps/media-monitor/media_monitor.py +++ b/python_apps/media-monitor/media_monitor.py @@ -47,7 +47,7 @@ def configure_locale(): else: new_locale = default_locale - logger.info("New locale set to: %s", locale.setlocale(locale.LC_ALL, new_locale)) + logger.info("New locale set to: %s", locale.setlocale(locale.LC_ALL, new_locale)) From 6a2bab66fa0d2936543fab2733a6e0bcf7889c7f Mon Sep 17 00:00:00 2001 From: Naomi Aro Date: Tue, 15 May 2012 13:02:24 +0200 Subject: [PATCH 14/23] CC-3825 : Deleting any recorded show cancels the current recording show --- airtime_mvc/application/models/RabbitMq.php | 2 +- airtime_mvc/application/models/ShowInstance.php | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/airtime_mvc/application/models/RabbitMq.php b/airtime_mvc/application/models/RabbitMq.php index a01d5c9a9..4e00da379 100644 --- a/airtime_mvc/application/models/RabbitMq.php +++ b/airtime_mvc/application/models/RabbitMq.php @@ -82,7 +82,7 @@ class Application_Model_RabbitMq $temp['event_type'] = $event_type; $temp['server_timezone'] = Application_Model_Preference::GetTimezone(); - if($event_type = "update_recorder_schedule"){ + if($event_type == "update_recorder_schedule"){ $temp['shows'] = Application_Model_Show::getShows($now, $end_timestamp, $excludeInstance=NULL, $onlyRecord=TRUE); } $data = json_encode($temp); diff --git a/airtime_mvc/application/models/ShowInstance.php b/airtime_mvc/application/models/ShowInstance.php index 024a4faa5..f1dd07cd3 100644 --- a/airtime_mvc/application/models/ShowInstance.php +++ b/airtime_mvc/application/models/ShowInstance.php @@ -543,9 +543,6 @@ class Application_Model_ShowInstance { } Application_Model_RabbitMq::PushSchedule(); - if($recording){ - Application_Model_RabbitMq::SendMessageToShowRecorder("cancel_recording"); - } } public function setRecordedFile($file_id) From 07d029b8ccdc8e89677800b49689e1b1a8928e96 Mon Sep 17 00:00:00 2001 From: Naomi Aro Date: Tue, 15 May 2012 14:56:31 +0200 Subject: [PATCH 15/23] CC-3777 : Decide on what should happen with canceling recorded show --- airtime_mvc/application/models/Scheduler.php | 13 +++++-------- airtime_mvc/public/js/airtime/schedule/schedule.js | 2 +- .../public/js/airtime/showbuilder/builder.js | 2 +- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/airtime_mvc/application/models/Scheduler.php b/airtime_mvc/application/models/Scheduler.php index 744d65c9e..f7c20fcfe 100644 --- a/airtime_mvc/application/models/Scheduler.php +++ b/airtime_mvc/application/models/Scheduler.php @@ -651,15 +651,12 @@ class Application_Model_Scheduler { } $this->removeItems($remove, false); - } + } + } - $instance->setDbEnds($this->nowDT); - $instance->save($this->con); - } - else { - $instance->delete($this->con); - } - + $instance->setDbEnds($this->nowDT); + $instance->save($this->con); + $this->con->commit(); if ($instance->getDbRecord()) { diff --git a/airtime_mvc/public/js/airtime/schedule/schedule.js b/airtime_mvc/public/js/airtime/schedule/schedule.js index c3c1e1c26..80ef628c1 100644 --- a/airtime_mvc/public/js/airtime/schedule/schedule.js +++ b/airtime_mvc/public/js/airtime/schedule/schedule.js @@ -46,7 +46,7 @@ function confirmCancelShow(show_instance_id){ } function confirmCancelRecordedShow(show_instance_id){ - if (confirm('Erase current show and stop recording?')) { + if (confirm('Stop recording current show?')) { var url = "/Schedule/cancel-current-show"; $.ajax({ url: url, diff --git a/airtime_mvc/public/js/airtime/showbuilder/builder.js b/airtime_mvc/public/js/airtime/showbuilder/builder.js index 242121d80..22364c915 100644 --- a/airtime_mvc/public/js/airtime/showbuilder/builder.js +++ b/airtime_mvc/public/js/airtime/showbuilder/builder.js @@ -849,7 +849,7 @@ var AIRTIME = (function(AIRTIME){ data = $tr.data("aData"); if (data.record === true) { - msg = 'Erase current show and stop recording?'; + msg = 'Stop recording current show?'; } if (confirm(msg)) { From d2dc02cf9e8ebfb76a29ed83022c4a92a842c8d2 Mon Sep 17 00:00:00 2001 From: Naomi Aro Date: Tue, 15 May 2012 15:07:42 +0200 Subject: [PATCH 16/23] CC-3777 : Decide on what should happen with canceling recorded show --- airtime_mvc/application/models/Scheduler.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/airtime_mvc/application/models/Scheduler.php b/airtime_mvc/application/models/Scheduler.php index f7c20fcfe..3e7a39aa7 100644 --- a/airtime_mvc/application/models/Scheduler.php +++ b/airtime_mvc/application/models/Scheduler.php @@ -652,6 +652,10 @@ class Application_Model_Scheduler { $this->removeItems($remove, false); } + } + else { + $rebroadcasts = $instance->getCcShowInstancessRelatedByDbId(null, $this->con); + $rebroadcasts->delete($this->con); } $instance->setDbEnds($this->nowDT); From c4c988b98a818f01970d87991588f26564e6f180 Mon Sep 17 00:00:00 2001 From: denise Date: Tue, 15 May 2012 11:54:11 -0400 Subject: [PATCH 17/23] CC-3797: Feedback Metrics "Show Me What I Am Sending" doesnt show all of the fields that are being sent -now shows all keys, null or not, in the list --- airtime_mvc/application/models/Preference.php | 30 +++++++++---------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/airtime_mvc/application/models/Preference.php b/airtime_mvc/application/models/Preference.php index a8af84410..2505a563f 100644 --- a/airtime_mvc/application/models/Preference.php +++ b/airtime_mvc/application/models/Preference.php @@ -465,26 +465,24 @@ class Application_Model_Preference $outputString = "\n"; foreach($outputArray as $key => $out){ - if($key == 'SAAS' && ($out != '' || $out != 'disabled')){ + if($key == 'TRIAL_END_DATE' && ($out != '' || $out != 'NULL')){ continue; } - if($out != '' || is_numeric($out)){ - if($key == "STREAM_INFO"){ - $outputString .= $key." :\n"; - foreach($out as $s_info){ - foreach($s_info as $k => $v){ - $outputString .= "\t".strtoupper($k)." : ".$v."\n"; - } + if($key == "STREAM_INFO"){ + $outputString .= $key." :\n"; + foreach($out as $s_info){ + foreach($s_info as $k => $v){ + $outputString .= "\t".strtoupper($k)." : ".$v."\n"; } - }else if ($key == "SOUNDCLOUD_ENABLED") { - if ($out) { - $outputString .= $key." : TRUE\n"; - } else if (!$out) { - $outputString .= $key." : FALSE\n"; - } - }else{ - $outputString .= $key.' : '.$out."\n"; } + }else if ($key == "SOUNDCLOUD_ENABLED") { + if ($out) { + $outputString .= $key." : TRUE\n"; + } else if (!$out) { + $outputString .= $key." : FALSE\n"; + } + }else{ + $outputString .= $key.' : '.$out."\n"; } } if($returnArray){ From 025ef0ed27e50fd942bffe90b0bfd2408f2c6164 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Tue, 15 May 2012 12:35:02 -0400 Subject: [PATCH 18/23] CC-3826: Couldn't find constant MDATA_KEY_RECORD_DATE -fixed --- airtime_mvc/application/configs/constants.php | 1 + airtime_mvc/application/controllers/ApiController.php | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/airtime_mvc/application/configs/constants.php b/airtime_mvc/application/configs/constants.php index 1a39ddb43..db3660342 100644 --- a/airtime_mvc/application/configs/constants.php +++ b/airtime_mvc/application/configs/constants.php @@ -26,6 +26,7 @@ define('MDATA_KEY_ENCODER', 'encoded_by'); define('MDATA_KEY_ISRC', 'isrc_number'); define('MDATA_KEY_COPYRIGHT', 'copyright'); define('MDATA_KEY_YEAR', 'year'); +define('MDATA_KEY_RECORD_DATE', 'year'); define('MDATA_KEY_BPM', 'bpm'); define('MDATA_KEY_TRACKNUMBER', 'track_number'); define('MDATA_KEY_CONDUCTOR', 'conductor'); diff --git a/airtime_mvc/application/controllers/ApiController.php b/airtime_mvc/application/controllers/ApiController.php index a9dda358b..f7fd4ce8e 100644 --- a/airtime_mvc/application/controllers/ApiController.php +++ b/airtime_mvc/application/controllers/ApiController.php @@ -603,7 +603,6 @@ class ApiController extends Zend_Controller_Action $filepath = $md['MDATA_KEY_FILEPATH']; $filepath = str_replace("\\", "", $filepath); $file->setFilePath($filepath); - //$file->setMetadata($md); } } else if ($mode == "delete") { From 4b03a45d4660e7eb5cfdffabada6fd92429f27dd Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Tue, 15 May 2012 14:20:53 -0400 Subject: [PATCH 19/23] CC-3757: Widgets: ON AIR show's elapsed and remaining time are wrong -fixed --- airtime_mvc/application/models/Show.php | 3 +-- widgets/js/jquery.showinfo.js | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/airtime_mvc/application/models/Show.php b/airtime_mvc/application/models/Show.php index 6794fe756..33d84b33e 100644 --- a/airtime_mvc/application/models/Show.php +++ b/airtime_mvc/application/models/Show.php @@ -1753,8 +1753,7 @@ class Application_Model_Show { ." AND modified_instance != TRUE" ." ORDER BY si.starts"; - // Convert back to local timezone - $rows = $con->query($sql)->fetchAll(); + $rows = $con->query($sql)->fetchAll(PDO::FETCH_ASSOC); $numberOfRows = count($rows); $results['previousShow'] = array(); diff --git a/widgets/js/jquery.showinfo.js b/widgets/js/jquery.showinfo.js index 8017081d7..873f5b64f 100644 --- a/widgets/js/jquery.showinfo.js +++ b/widgets/js/jquery.showinfo.js @@ -282,7 +282,7 @@ function ScheduleData(data){ this.schedulePosixTime = convertDateToPosixTime(data.schedulerTime); - this.schedulePosixTime += parseInt(data.timezoneOffset)*1000; + //this.schedulePosixTime += parseInt(data.timezoneOffset, 10)*1000; var date = new Date(); this.localRemoteTimeOffset = date.getTime() - this.schedulePosixTime; } From 6695e3e190f9e05f404260535d8bea0904e5472f Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Tue, 15 May 2012 14:35:01 -0400 Subject: [PATCH 20/23] -fix javascript error in widgets --- airtime_mvc/application/models/Show.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/airtime_mvc/application/models/Show.php b/airtime_mvc/application/models/Show.php index 33d84b33e..62a94cff8 100644 --- a/airtime_mvc/application/models/Show.php +++ b/airtime_mvc/application/models/Show.php @@ -1770,6 +1770,7 @@ class Application_Model_Show { "id"=>$rows[$i-1]['id'], "instance_id"=>$rows[$i-1]['instance_id'], "name"=>$rows[$i-1]['name'], + "url"=>$rows[$i-1]['url'], "start_timestamp"=>$rows[$i-1]['start_timestamp'], "end_timestamp"=>$rows[$i-1]['end_timestamp'], "starts"=>$rows[$i-1]['starts'], @@ -1783,6 +1784,7 @@ class Application_Model_Show { "id"=>$rows[$i+1]['id'], "instance_id"=>$rows[$i+1]['instance_id'], "name"=>$rows[$i+1]['name'], + "url"=>$rows[$i+1]['url'], "start_timestamp"=>$rows[$i+1]['start_timestamp'], "end_timestamp"=>$rows[$i+1]['end_timestamp'], "starts"=>$rows[$i+1]['starts'], @@ -1801,6 +1803,7 @@ class Application_Model_Show { "id"=>$rows[$i]['id'], "instance_id"=>$rows[$i]['instance_id'], "name"=>$rows[$i]['name'], + "url"=>$rows[$i]['url'], "start_timestamp"=>$rows[$i]['start_timestamp'], "end_timestamp"=>$rows[$i]['end_timestamp'], "starts"=>$rows[$i]['starts'], From b96f0590b1011c178e454aacba9a84bda61ef2b1 Mon Sep 17 00:00:00 2001 From: denise Date: Tue, 15 May 2012 15:10:56 -0400 Subject: [PATCH 21/23] CC-3808: No tooltip for preview playlist -done --- airtime_mvc/application/models/StoredFile.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airtime_mvc/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php index f72966382..89bae6760 100644 --- a/airtime_mvc/application/models/StoredFile.php +++ b/airtime_mvc/application/models/StoredFile.php @@ -703,7 +703,7 @@ Logging::log("getting media! - 2"); $row['image'] = ''; } else { - $row['image'] = ''; + $row['image'] = ''; } } From 1245d1e86020d613f0e91c6c81fa204786082039 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Tue, 15 May 2012 15:17:19 -0400 Subject: [PATCH 22/23] CC-3826: Couldn't find constant MDATA_KEY_RECORD_DATE -fixed in a better way --- airtime_mvc/application/configs/constants.php | 1 - airtime_mvc/application/models/StoredFile.php | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/airtime_mvc/application/configs/constants.php b/airtime_mvc/application/configs/constants.php index db3660342..1a39ddb43 100644 --- a/airtime_mvc/application/configs/constants.php +++ b/airtime_mvc/application/configs/constants.php @@ -26,7 +26,6 @@ define('MDATA_KEY_ENCODER', 'encoded_by'); define('MDATA_KEY_ISRC', 'isrc_number'); define('MDATA_KEY_COPYRIGHT', 'copyright'); define('MDATA_KEY_YEAR', 'year'); -define('MDATA_KEY_RECORD_DATE', 'year'); define('MDATA_KEY_BPM', 'bpm'); define('MDATA_KEY_TRACKNUMBER', 'track_number'); define('MDATA_KEY_CONDUCTOR', 'conductor'); diff --git a/airtime_mvc/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php index f72966382..945f80439 100644 --- a/airtime_mvc/application/models/StoredFile.php +++ b/airtime_mvc/application/models/StoredFile.php @@ -92,7 +92,9 @@ class Application_Model_StoredFile { else { $dbMd = array(); foreach ($p_md as $mdConst => $mdValue) { - $dbMd[constant($mdConst)] = $mdValue; + if (defined($mdConst)){ + $dbMd[constant($mdConst)] = $mdValue; + } } $this->setDbColMetadata($dbMd); } From e0c53afe0b3ee1d3019abfe02886b1fa11dfc380 Mon Sep 17 00:00:00 2001 From: denise Date: Tue, 15 May 2012 15:43:06 -0400 Subject: [PATCH 23/23] CC-3796: If you change the show's start and end time, the length of content will be displayed as ".00" -fixed --- airtime_mvc/application/models/ShowInstance.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airtime_mvc/application/models/ShowInstance.php b/airtime_mvc/application/models/ShowInstance.php index f1dd07cd3..3a078bf1e 100644 --- a/airtime_mvc/application/models/ShowInstance.php +++ b/airtime_mvc/application/models/ShowInstance.php @@ -574,7 +574,7 @@ class Application_Model_ShowInstance { { $time = $this->_showInstance->getDbTimeFilled(); - if ($time != "00:00:00") { + if ($time != "00:00:00" && $time != null && strcmp($time, '')!=0) { $time_arr = explode(".", $time); if (count($time_arr) > 1) { $time_arr[1] = "." . $time_arr[1];