From ca012afde7cb061417f3685a22acce4a6dc230dd Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Thu, 6 Sep 2012 14:50:52 -0400 Subject: [PATCH 1/2] CC-4341: Report of stream status does not work the first time, but works after 'Save' is clicked -added missing package to install script --- install_full/ubuntu/airtime-full-install | 3 ++- install_full/ubuntu/airtime-full-install-nginx | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/install_full/ubuntu/airtime-full-install b/install_full/ubuntu/airtime-full-install index 49755239a..d70429d6d 100755 --- a/install_full/ubuntu/airtime-full-install +++ b/install_full/ubuntu/airtime-full-install @@ -51,7 +51,8 @@ php-pear php5-gd postgresql odbc-postgresql python libsoundtouch-ocaml \ libtaglib-ocaml libao-ocaml libmad-ocaml ecasound \ libesd0 libportaudio2 libsamplerate0 rabbitmq-server patch \ php5-curl mpg123 monit python-virtualenv multitail libcamomile-ocaml-data \ -libpulse0 vorbis-tools lsb-release lsof sudo mp3gain vorbisgain flac vorbis-tools +libpulse0 vorbis-tools lsb-release lsof sudo mp3gain vorbisgain flac vorbis-tools \ +timeout #install packages with --force-yes option (this is useful in the case #of Debian, where these packages are unauthorized) diff --git a/install_full/ubuntu/airtime-full-install-nginx b/install_full/ubuntu/airtime-full-install-nginx index 407b52eb6..0f6abf950 100755 --- a/install_full/ubuntu/airtime-full-install-nginx +++ b/install_full/ubuntu/airtime-full-install-nginx @@ -42,7 +42,8 @@ php-pear php5-gd postgresql odbc-postgresql python libsoundtouch-ocaml \ libtaglib-ocaml libao-ocaml libmad-ocaml ecasound \ libesd0 libportaudio2 libsamplerate0 rabbitmq-server patch \ php5-curl mpg123 monit python-virtualenv multitail libcamomile-ocaml-data \ -libpulse0 vorbis-tools lsb-release lsof sudo mp3gain vorbisgain flac vorbis-tools +libpulse0 vorbis-tools lsb-release lsof sudo mp3gain vorbisgain flac vorbis-tools \ +timeout #install packages with --force-yes option (this is useful in the case #of Debian, where these packages are unauthorized) From 18ec23526fa09f5587b087e7e624415cb5a91038 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Thu, 6 Sep 2012 15:02:26 -0400 Subject: [PATCH 2/2] CC-4294: Webstream length should make hours or minutes optional. Also minutes > 59 should be parsed correctly. -fixed --- airtime_mvc/application/models/Webstream.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airtime_mvc/application/models/Webstream.php b/airtime_mvc/application/models/Webstream.php index 8c74dca5a..22d51a3e8 100644 --- a/airtime_mvc/application/models/Webstream.php +++ b/airtime_mvc/application/models/Webstream.php @@ -115,7 +115,7 @@ class Application_Model_Webstream implements Application_Model_LibraryEditable $di = null; $length = $parameters["length"]; - $result = preg_match("/^(?:([0-9]{1,2})h)?\s*(?:([0-6]?[0-9])m)?$/", $length, $matches); + $result = preg_match("/^(?:([0-9]{1,2})h)?\s*(?:([0-9]{1,2})m)?$/", $length, $matches); $invalid_date_interval = false; if ($result == 1 && count($matches) == 2) {