From 2ca4a369b2ba57e1d036c7c6fd36636879c473c0 Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Fri, 24 Aug 2012 17:02:37 -0400
Subject: [PATCH] CC-4264: Smart Block: Fail to generate block with some
 unavailable files

- fixed
---
 airtime_mvc/application/models/Block.php      | 21 +++++++++++--------
 .../views/scripts/library/library.phtml       |  3 +--
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/airtime_mvc/application/models/Block.php b/airtime_mvc/application/models/Block.php
index 62d152fd1..49e07d9b6 100644
--- a/airtime_mvc/application/models/Block.php
+++ b/airtime_mvc/application/models/Block.php
@@ -430,13 +430,16 @@ EOT;
     
             foreach ($p_items as $ac) {
                 Logging::info("Adding audio file {$ac}");
-                
-                if (is_array($ac) && $ac[1] == 'audioclip') {
-                    $res = $this->insertBlockElement($this->buildEntry($ac[0], $pos));
-                    $pos = $pos + 1;
-                } elseif (!is_array($ac)) {
-                    $res = $this->insertBlockElement($this->buildEntry($ac, $pos));
-                    $pos = $pos + 1;
+                try {
+                    if (is_array($ac) && $ac[1] == 'audioclip') {
+                        $res = $this->insertBlockElement($this->buildEntry($ac[0], $pos));
+                        $pos = $pos + 1;
+                    } elseif (!is_array($ac)) {
+                        $res = $this->insertBlockElement($this->buildEntry($ac, $pos));
+                        $pos = $pos + 1;
+                    }
+                } catch (Exception $e) {
+                    Logging::log($e->getMessage());
                 }
             }
     
@@ -1223,8 +1226,8 @@ EOT;
                 $limits['time'] = 1440 * 60;
                 $limits['items'] = $storedCrit['limit']['value'];
             } else {
-                $limits['time'] = $storedCrit['limit']['modifier'] == "hours" ? 
-                    intval(floatval($storedCrit['limit']['value']) * 60 * 60) : 
+                $limits['time'] = $storedCrit['limit']['modifier'] == "hours" ?
+                    intval(floatval($storedCrit['limit']['value']) * 60 * 60) :
                     intval($storedCrit['limit']['value'] * 60);
                 $limits['items'] = null;
             }
diff --git a/airtime_mvc/application/views/scripts/library/library.phtml b/airtime_mvc/application/views/scripts/library/library.phtml
index e0d889f76..d35eb7fa6 100644
--- a/airtime_mvc/application/views/scripts/library/library.phtml
+++ b/airtime_mvc/application/views/scripts/library/library.phtml
@@ -1,5 +1,4 @@
 <div id="import_status" class="library_import" style="display:none">File import in progress... <img src="/css/images/file_import_loader.gif"></img></div>
-<div id="advanced_search">
-</div>
+<div id="advanced_search"></div>
 <table id="library_display" cellpadding="0" cellspacing="0" class="datatable">
 </table>
\ No newline at end of file