From 0fec175681c8c25888b21ed78feed3af51608e67 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Tue, 11 Sep 2012 14:04:45 -0400 Subject: [PATCH 1/5] CC-1710: FLAC, BWF, AAC support -context menu for mp4's having a problem --- airtime_mvc/application/models/StoredFile.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/airtime_mvc/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php index e88184a3d..e69599ce8 100644 --- a/airtime_mvc/application/models/StoredFile.php +++ b/airtime_mvc/application/models/StoredFile.php @@ -410,7 +410,9 @@ class Application_Model_StoredFile return "mp3"; } elseif ($mime == "audio/x-flac") { return "flac"; - } else { + } elseif ($mime == "audio/mp4") { + return "mp4"; + } else { throw new Exception("Unknown $mime"); } } From 1afdcb8c2d20ad3bf4c22b5c10bf98b6a8f5a429 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Tue, 11 Sep 2012 14:05:40 -0400 Subject: [PATCH 2/5] Shortened an if statement to p ? x : y --- airtime_mvc/application/models/Datatables.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/airtime_mvc/application/models/Datatables.php b/airtime_mvc/application/models/Datatables.php index 6560925de..016ff0362 100644 --- a/airtime_mvc/application/models/Datatables.php +++ b/airtime_mvc/application/models/Datatables.php @@ -192,12 +192,8 @@ class Application_Model_Datatables $r['length'] = $pl->getLength(); } elseif ($r['ftype'] == "block") { $bl = new Application_Model_Block($r['id']); - if ($bl->isStatic()) { - $r['bl_type'] = 'static'; - } else { - $r['bl_type'] = 'dynamic'; - } - $r['length'] = $bl->getLength(); + $r['bl_type'] = $bl->isStatic() ? 'static' : 'dynamic'; + $r['length'] = $bl->getLength(); } } } From 1304111682842c91aeef7a815d3b42fcf815aac8 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Tue, 11 Sep 2012 14:10:13 -0400 Subject: [PATCH 3/5] Shortened code with if -> ? --- airtime_mvc/application/models/Preference.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/airtime_mvc/application/models/Preference.php b/airtime_mvc/application/models/Preference.php index 44baf5575..b1a723816 100644 --- a/airtime_mvc/application/models/Preference.php +++ b/airtime_mvc/application/models/Preference.php @@ -909,11 +909,7 @@ class Application_Model_Preference public static function GetDiskQuota() { $val = self::getValue("disk_quota"); - if (strlen($val) == 0) { - $val = "0"; - } - - return $val; + return (strlen($val) == 0) ? 0 : $val; } public static function SetLiveSteamMasterUsername($value) From 57b59a3290fd4d0cb0a331a6d8dd7496dde6d2b9 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Tue, 11 Sep 2012 14:33:50 -0400 Subject: [PATCH 4/5] Cleaned up preference.php --- airtime_mvc/application/models/Preference.php | 53 +++++-------------- 1 file changed, 12 insertions(+), 41 deletions(-) diff --git a/airtime_mvc/application/models/Preference.php b/airtime_mvc/application/models/Preference.php index b1a723816..82e83abcc 100644 --- a/airtime_mvc/application/models/Preference.php +++ b/airtime_mvc/application/models/Preference.php @@ -226,11 +226,7 @@ class Application_Model_Preference public static function GetDefaultTransitionFade() { $transition_fade = self::getValue("default_transition_fade"); - if ($transition_fade == "") { - $transition_fade = "00.000000"; - } - - return $transition_fade; + return ($transition_fade == "") ? "00.000000" : $transition_fade; } public static function SetStreamLabelFormat($type) @@ -332,11 +328,7 @@ class Application_Model_Preference public static function GetAllow3rdPartyApi() { $val = self::getValue("third_party_api"); - if (strlen($val) == 0) { - return "0"; - } else { - return $val; - } + return (strlen($val) == 0 ) ? "0" : $val; } public static function SetPhone($phone) @@ -447,6 +439,8 @@ class Application_Model_Preference $image = @file_get_contents($imagePath); $image = base64_encode($image); self::setValue("logoImage", $image); + } else { + Logging::warn("Attempting to set imagePath to empty string"); } } @@ -786,11 +780,7 @@ class Application_Model_Preference public static function GetWeekStartDay() { $val = self::getValue("week_start_day"); - if (strlen($val) == 0) { - return "0"; - } else { - return $val; - } + return (strlen($val) == 0) ? "0" : $val; } /** @@ -808,11 +798,7 @@ class Application_Model_Preference public static function GetStreamUpdateTimestemp() { $update_time = self::getValue("stream_update_timestamp"); - if ($update_time == null) { - $update_time = 0; - } - - return $update_time; + return ($update_time == null) ? 0 : $update_time; } public static function GetClientId() @@ -824,6 +810,8 @@ class Application_Model_Preference { if (is_numeric($id)) { self::setValue("client_id", $id); + } else { + Logging::warn("Attempting to set client_id to invalid value: $id"); } } @@ -894,11 +882,7 @@ class Application_Model_Preference public static function GetCalendarTimeInterval() { $val = self::getValue("calendar_time_interval", true /* user specific */); - if (strlen($val) == 0) { - $val = "30"; - } - - return $val; + return (strlen($val) == 0) ? "30" : $val; } public static function SetDiskQuota($value) @@ -940,11 +924,7 @@ class Application_Model_Preference public static function GetSourceStatus($sourcename) { $value = self::getValue($sourcename); - if ($value == null || $value == "false") { - return false; - } else { - return true; - } + return !($value == null || $value == "false"); } public static function SetSourceSwitchStatus($sourcename, $status) @@ -955,11 +935,7 @@ class Application_Model_Preference public static function GetSourceSwitchStatus($sourcename) { $value = self::getValue($sourcename."_switch"); - if ($value == null || $value == "off") { - return "off"; - } else { - return "on"; - } + return ($value == null || $value == "off") ? 'off' : 'on'; } public static function SetMasterDJSourceConnectionURL($value) @@ -1032,12 +1008,7 @@ class Application_Model_Preference public static function GetEnableSystemEmail() { $v = self::getValue("enable_system_email"); - - if ($v === "") { - return 0; - } - - return $v; + return ($v === "") ? 0 : $v; } public static function SetSystemEmail($value) From 6c1d7fedc1a6d2940313a5444292f629627c4ed5 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Tue, 11 Sep 2012 14:34:03 -0400 Subject: [PATCH 5/5] Made Loggging::warn proper. --- airtime_mvc/application/logging/Logging.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/airtime_mvc/application/logging/Logging.php b/airtime_mvc/application/logging/Logging.php index 0e2492f53..dfe7e1fbe 100644 --- a/airtime_mvc/application/logging/Logging.php +++ b/airtime_mvc/application/logging/Logging.php @@ -64,7 +64,8 @@ class Logging { $function = $caller['function']; $logger = self::getLogger(); - $logger->info("[$file : $function() : line $line] [WARN] - ".self::toString($p_msg)); + $logger->warn("[$file : $function() : line $line] - " + . self::toString($p_msg)); } public static function debug($p_msg)