Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-refactor

2015-02-24 11:16:44 -05:00 · 2015-02-24 11:16:44 -05:00 · 7600b8ae82
parent c868136d26 90aa1faea4
commit 7600b8ae82
48 changed files with 236 additions and 8770 deletions
--- a/airtime_mvc/application/Bootstrap.php
+++ b/airtime_mvc/application/Bootstrap.php
@ -71,13 +71,28 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
        }
        $view->headScript()->appendScript("var userType = '$userType';");
    }
+
+    /**
+     * Create a global namespace to hold a session token for CSRF prevention
+     */
+    protected function _initCsrfNamespace() {
+        $csrf_namespace = new Zend_Session_Namespace('csrf_namespace');
+        // Check if the token exists
+        if (!$csrf_namespace->authtoken) {
+            // If we don't have a token, regenerate it and set a 2 hour timeout
+            // Should we log the user out here if the token is expired?
+            $csrf_namespace->authtoken = sha1(uniqid(rand(),1));
+            $csrf_namespace->setExpirationSeconds(2*60*60);
+        }
+    }
    
    /**
     * Ideally, globals should be written to a single js file once 
     * from a php init function. This will save us from having to 
     * reinitialize them every request
     */
-    private function _initTranslationGlobals($view) {
+    protected function _initTranslationGlobals() {
+        $view = $this->getResource('view');
        $view->headScript()->appendScript("var PRODUCT_NAME = '" . PRODUCT_NAME . "';");
        $view->headScript()->appendScript("var USER_MANUAL_URL = '" . USER_MANUAL_URL . "';");
        $view->headScript()->appendScript("var COMPANY_NAME = '" . COMPANY_NAME . "';");
--- a/airtime_mvc/application/common/FileDataHelper.php
+++ b/airtime_mvc/application/common/FileDataHelper.php
@ -19,9 +19,9 @@ class FileDataHelper {
        }
        if (array_key_exists("bpm", $data)) {
            //Some BPM tags are silly and include the word "BPM". Let's strip that...
-            $data["year"] = str_ireplace("BPM", "", $data["year"]);
+            $data["bpm"] = str_ireplace("BPM", "", $data["bpm"]);
            // This will convert floats to ints too.
-            $data["year"] = intval($data["year"]);
+            $data["bpm"] = intval($data["bpm"]);
        }
    }

--- a/airtime_mvc/application/controllers/AudiopreviewController.php
+++ b/airtime_mvc/application/controllers/AudiopreviewController.php
@ -201,10 +201,14 @@ class AudiopreviewController extends Zend_Controller_Action
                $elementMap['element_mp3'] = $track['item_id'];
            } elseif (strtolower($mime) === 'audio/ogg') {
                $elementMap['element_oga'] = $track['item_id'];
+            } elseif (strtolower($mime) === 'audio/vorbis') {
+                $elementMap['element_oga'] = $track['item_id'];
            } elseif (strtolower($mime) === 'audio/mp4') {
                $elementMap['element_m4a'] = $track['item_id'];
            } elseif (strtolower($mime) === 'audio/wav') {
                $elementMap['element_wav'] = $track['item_id'];
+            } elseif (strtolower($mime) === 'audio/x-wav') {
+                $elementMap['element_wav'] = $track['item_id'];
            } elseif (strtolower($mime) === 'audio/x-flac') {
                $elementMap['element_flac'] = $track['item_id'];
            } else {
@ -286,10 +290,14 @@ class AudiopreviewController extends Zend_Controller_Action
                    $elementMap['element_mp3'] = $track['item_id'];
                } elseif (strtolower($mime) === 'audio/ogg') {
                    $elementMap['element_oga'] = $track['item_id'];
+                } elseif (strtolower($mime) === 'audio/vorbis') {
+                    $elementMap['element_oga'] = $track['item_id'];
                } elseif (strtolower($mime) === 'audio/mp4') {
                    $elementMap['element_m4a'] = $track['item_id'];
                } elseif (strtolower($mime) === 'audio/wav') {
                    $elementMap['element_wav'] = $track['item_id'];
+                } elseif (strtolower($mime) === 'audio/x-wav') {
+                    $elementMap['element_wav'] = $track['item_id'];
                } elseif (strtolower($mime) === 'audio/x-flac') {
                    $elementMap['element_flac'] = $track['item_id'];
                } else {
--- a/airtime_mvc/application/controllers/LoginController.php
+++ b/airtime_mvc/application/controllers/LoginController.php
@ -98,6 +98,9 @@ class LoginController extends Zend_Controller_Action
    {
        $auth = Zend_Auth::getInstance();
        $auth->clearIdentity();
+        // Unset all session variables relating to CSRF prevention on logout
+        $csrf_namespace = new Zend_Session_Namespace('csrf_namespace');
+        $csrf_namespace->unsetAll();
        $this->_redirect('showbuilder/index');
    }

--- a/airtime_mvc/application/controllers/PluploadController.php
+++ b/airtime_mvc/application/controllers/PluploadController.php
@ -31,9 +31,10 @@ class PluploadController extends Zend_Controller_Action
            $this->view->quotaLimitReached = true;
        }

+        //Because uploads are done via AJAX (and we're not using Zend form for those), we manually add the CSRF
+        //token in here.
        $csrf_namespace = new Zend_Session_Namespace('csrf_namespace');
-        $csrf_namespace->setExpirationSeconds(5*60*60);
-        $csrf_namespace->authtoken = sha1(uniqid(rand(),1));
+        //The CSRF token is generated in Bootstrap.php

        $csrf_element = new Zend_Form_Element_Hidden('csrf');
        $csrf_element->setValue($csrf_namespace->authtoken)->setRequired('true')->removeDecorator('HtmlTag')->removeDecorator('Label');
--- a/airtime_mvc/application/controllers/ScheduleController.php
+++ b/airtime_mvc/application/controllers/ScheduleController.php
@ -136,7 +136,6 @@ class ScheduleController extends Zend_Controller_Action
        $editable = $user->isUserType(array(UTYPE_ADMIN, UTYPE_PROGRAM_MANAGER));

        $calendar_interval = Application_Model_Preference::GetCalendarTimeScale();
-        Logging::info($calendar_interval);
        if ($calendar_interval == "agendaDay") {
            list($start, $end) = Application_Model_Show::getStartEndCurrentDayView();
        } else if ($calendar_interval == "agendaWeek") {
--- a/airtime_mvc/application/controllers/ShowbuilderController.php
+++ b/airtime_mvc/application/controllers/ShowbuilderController.php
@ -283,6 +283,14 @@ class ShowbuilderController extends Zend_Controller_Action
        $mediaItems = $request->getParam("mediaIds", array());
        $scheduledItems = $request->getParam("schedIds", array());

+        $log_vars = array();
+        $log_vars["url"] = $_SERVER['HTTP_HOST'];
+        $log_vars["action"] = "showbuilder/schedule-add";
+        $log_vars["params"] = array();
+        $log_vars["params"]["media_items"] = $mediaItems;
+        $log_vars["params"]["scheduled_items"] = $scheduledItems;
+        Logging::info($log_vars);
+
        try {
            $scheduler = new Application_Model_Scheduler();
            $scheduler->scheduleAfter($scheduledItems, $mediaItems);
--- a/airtime_mvc/application/controllers/plugins/Acl_plugin.php
+++ b/airtime_mvc/application/controllers/plugins/Acl_plugin.php
@ -148,17 +148,22 @@ class Zend_Controller_Plugin_Acl extends Zend_Controller_Plugin_Abstract
                }
            }
        } else { //We have a session/identity.
-
            // If we have an identity and we're making a RESTful request,
            // we need to check the CSRF token
-            if ($request->_action != "get" && $request->getModuleName() == "rest") {
-                $tokenValid = $this->verifyCSRFToken($request->getParam("csrf_token"));
+            if ($_SERVER['REQUEST_METHOD'] != "GET" && $request->getModuleName() == "rest") {
+                $token = $request->getParam("csrf_token");
+                $tokenValid = $this->verifyCSRFToken($token);

                if (!$tokenValid) {
+                    $csrf_namespace = new Zend_Session_Namespace('csrf_namespace');
+                    $csrf_namespace->authtoken = sha1(openssl_random_pseudo_bytes(128));
+
+                    Logging::warn("Invalid CSRF token: $token");
                    $this->getResponse()
                         ->setHttpResponseCode(401)
-                         ->appendBody("ERROR: CSRF token mismatch.");
-                    return;
+                         ->appendBody("ERROR: CSRF token mismatch.")
+                         ->sendResponse();
+                    die();
                }
            }
            
@ -202,9 +207,7 @@ class Zend_Controller_Plugin_Acl extends Zend_Controller_Plugin_Abstract
        $current_namespace = new Zend_Session_Namespace('csrf_namespace');
        $observed_csrf_token = $token;
        $expected_csrf_token = $current_namespace->authtoken;
-        Logging::error("Observed: " . $observed_csrf_token);
-        Logging::error("Expected: " . $expected_csrf_token);
-        
+
        return ($observed_csrf_token == $expected_csrf_token);
    }
    
--- a/airtime_mvc/application/forms/LiveStreamingPreferences.php
+++ b/airtime_mvc/application/forms/LiveStreamingPreferences.php
@ -29,8 +29,8 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm
        $transition_fade = new Zend_Form_Element_Text("transition_fade");
        $transition_fade->setLabel(_("Switch Transition Fade (s)"))
                        ->setFilters(array('StringTrim'))
-                        ->addValidator('regex', false, array('/^[0-9]{1,2}(\.\d{1,3})?$/',
-                        'messages' => _('enter a time in seconds 0{.000}')))
+                        ->addValidator('regex', false, array('/^\d*(\.\d+)?$/',
+                                'messages' => _('Please enter a time in seconds (eg. 0.5)')))
                        ->setValue($defaultFade)
                        ->setDecorators(array('ViewHelper'));
        $this->addElement($transition_fade);
--- a/airtime_mvc/application/logging/Logging.php
+++ b/airtime_mvc/application/logging/Logging.php
@ -38,52 +38,50 @@ class Logging {
            return $p_msg;
        }
    }
+
+    /** @param debugMode Prints the function name, file, and line number. This is slow as it uses debug_backtrace()
+     *                   so don't use it unless you need it.
+     */
+    private static function getLinePrefix($debugMode=false)
+    {
+        $linePrefix = "";
+
+        if (array_key_exists('SERVER_NAME', $_SERVER)) {
+            $linePrefix .= $_SERVER['SERVER_NAME'] . " ";
+        }
+
+        if ($debugMode) {
+            //debug_backtrace is SLOW so we don't want this invoke unless there was a real error! (hence $debugMode)
+            $bt = debug_backtrace();
+            $caller = $bt[1];
+            $file = basename($caller['file']);
+            $line = $caller['line'];
+            $function = "Unknown function";
+            if (array_key_exists(2, $bt)) {
+                $function = $bt[2]['function'];
+            }
+            $linePrefix .= "[$file:$line - $function()] - ";
+        }
+
+        return $linePrefix;
+    }
    
    public static function info($p_msg)
    {
-        $bt = debug_backtrace();
-
-        $caller = array_shift($bt);
-        $file = basename($caller['file']);
-        $line = $caller['line'];
-        
-        $caller = array_shift($bt);
-        $function = $caller['function'];
-       
        $logger = self::getLogger();
-        $logger->info("[$file : $function() : line $line] - ".self::toString($p_msg));
+        $logger->info(self::getLinePrefix() . self::toString($p_msg));
    }

    public static function warn($p_msg)
    {
-        $bt = debug_backtrace();
-
-        $caller = array_shift($bt);
-        $file = basename($caller['file']);
-        $line = $caller['line'];
-        
-        $caller = array_shift($bt);
-        $function = $caller['function'];
-       
        $logger = self::getLogger();
-        $logger->warn("[$file : $function() : line $line] - "
-            . self::toString($p_msg));
+        $logger->warn(self::getLinePrefix() . self::toString($p_msg));
    }

    public static function error($p_msg)
    {
-        $bt = debug_backtrace();
-
-        $caller = array_shift($bt);
-        $file = basename($caller['file']);
-        $line = $caller['line'];
-        
-        $caller = array_shift($bt);
-        $function = $caller['function'];
-       
        $logger = self::getLogger();
-        $logger->err("[$file : $function() : line $line] - "
-            . self::toString($p_msg));
+        $logger->err(self::getLinePrefix(true) .  self::toString($p_msg));
    }
    
    public static function debug($p_msg)
@ -92,17 +90,8 @@ class Logging {
            return;
        }

-        $bt = debug_backtrace();
-
-        $caller = array_shift($bt);
-        $file = basename($caller['file']);
-        $line = $caller['line'];
-        
-        $caller = array_shift($bt);
-        $function = $caller['function'];
-
        $logger = self::getLogger();
-        $logger->debug("[$file : $function() : line $line] - ".self::toString($p_msg));            
+        $logger->debug(self::getLinePrefix(true) . self::toString($p_msg));
    }
    // kind of like debug but for printing arrays more compactly (skipping
    // empty elements
@ -134,4 +123,49 @@ class Logging {
        Propel::setLogger(null);
    }

+    public static function loggingShutdownCallback()
+    {
+        //Catch the types of errors that PHP doesn't normally let us catch and
+        //would otherwise log to the apache log. We route these to our Airtime log to improve the modularity
+        //and reliability of our error logging. (All errors are in one spot!)
+        $err = error_get_last();
+        if (!is_array($err) || !array_key_exists('type', $err)) {
+            return;
+        }
+
+        switch($err['type'])
+        {
+            case E_ERROR:
+            case E_PARSE:
+            case E_CORE_ERROR:
+            case E_CORE_WARNING:
+            case E_COMPILE_ERROR:
+            case E_COMPILE_WARNING:
+                //error_log("Oh noes, a fatal: " . var_export($err, true), 1, 'fatals@example.com');
+                $errorStr = '';
+                if (array_key_exists('message', $err)) {
+                    $errorStr .= $err['message'];
+                }
+                if (array_key_exists('file', $err))
+                {
+                    $errorStr .= ' at ' .$err['file'];
+                }
+                if (array_key_exists('line', $err))
+                {
+                    $errorStr .= ':' . $err['line'];
+                }
+
+                $errorStr .= "\n" . var_export($err, true);
+                Logging::error($errorStr);
+                break;
+        }
+    }
+
+    public static function setupParseErrorLogging()
+    {
+        //Static callback:
+        register_shutdown_function('Logging::loggingShutdownCallback');
+    }
+
 }
+
--- a/airtime_mvc/application/models/Block.php
+++ b/airtime_mvc/application/models/Block.php
@ -1517,24 +1517,27 @@ SQL;
                    $i++;
                }
            }
-            
+
            // check if file exists
            $qry->add("file_exists", "true", Criteria::EQUAL);
            $qry->add("hidden", "false", Criteria::EQUAL);
-        if (isset($storedCrit['sort'])) {
-            $sortTracks = $storedCrit['sort']['value'];
-        }
-        if ($sortTracks == 'newest') {
-            $qry->addDescendingOrderByColumn('utime');
-        }
-        else if ($sortTracks == 'oldest') {
-            $qry->addAscendingOrderByColumn('utime');
-        }
-        else {
-            $qry->addAscendingOrderByColumn('random()');
-        }
+            $sortTracks = 'random';
+            if (isset($storedCrit['sort'])) {
+                $sortTracks = $storedCrit['sort']['value'];
+            }
+            if ($sortTracks == 'newest') {
+                $qry->addDescendingOrderByColumn('utime');
+            }
+            else if ($sortTracks == 'oldest') {
+                $qry->addAscendingOrderByColumn('utime');
+            }
+            else if ($sortTracks == 'random') {
+                $qry->addAscendingOrderByColumn('random()');
+            } else {
+                Logging::warning("Unimplemented sortTracks type in ".__FILE__);
+            }

-    }
+        }
        // construct limit restriction
        $limits = array();
        
--- a/airtime_mvc/locale/az/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/az/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/locale/az/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/az/LC_MESSAGES/airtime.po
@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: Airtime\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-13 13:55-0500\n"
-"PO-Revision-Date: 2015-01-15 11:11+0000\n"
+"PO-Revision-Date: 2015-02-05 10:31+0000\n"
 "Last-Translator: Daniel James <daniel@64studio.com>\n"
 "Language-Team: Azerbaijani (http://www.transifex.com/projects/p/airtime/language/az/)\n"
 "MIME-Version: 1.0\n"
--- a/airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/locale/hy/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/hy/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/locale/hy/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/hy/LC_MESSAGES/airtime.po
--- a/airtime_mvc/locale/hy_AM/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/hy_AM/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/locale/hy_AM/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/hy_AM/LC_MESSAGES/airtime.po
@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: Airtime\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-13 13:55-0500\n"
-"PO-Revision-Date: 2015-01-15 11:11+0000\n"
+"PO-Revision-Date: 2015-02-05 10:31+0000\n"
 "Last-Translator: Daniel James <daniel@64studio.com>\n"
 "Language-Team: Armenian (Armenia) (http://www.transifex.com/projects/p/airtime/language/hy_AM/)\n"
 "MIME-Version: 1.0\n"
--- a/airtime_mvc/locale/ja_JP/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/ja_JP/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/locale/ja_JP/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/ja_JP/LC_MESSAGES/airtime.po
--- a/airtime_mvc/locale/ka/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/ka/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/locale/ka/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/ka/LC_MESSAGES/airtime.po
@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: Airtime\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-13 13:55-0500\n"
-"PO-Revision-Date: 2015-01-15 11:11+0000\n"
+"PO-Revision-Date: 2015-02-05 10:31+0000\n"
 "Last-Translator: Daniel James <daniel@64studio.com>\n"
 "Language-Team: Georgian (http://www.transifex.com/projects/p/airtime/language/ka/)\n"
 "MIME-Version: 1.0\n"
--- a/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/public/index.php
+++ b/airtime_mvc/public/index.php
@ -72,6 +72,7 @@ $application = new Zend_Application(

 require_once (APPLICATION_PATH."/logging/Logging.php");
 Logging::setLogPath('/var/log/airtime/zendphp.log');
+Logging::setupParseErrorLogging();

 // Create application, bootstrap, and run
 try {
@ -83,15 +84,18 @@ try {
        $application->bootstrap()->run();
    }
 } catch (Exception $e) {
-    echo $e->getMessage();
-    echo "<pre>";
-    echo $e->getTraceAsString();
-    echo "</pre>";
-    Logging::info($e->getMessage());
+
+    header($_SERVER['SERVER_PROTOCOL'] . ' 500 Internal Server Error', true, 500);
+
+    Logging::error($e->getMessage());
    if (VERBOSE_STACK_TRACE) {
-        Logging::info($e->getTraceAsString());
+        echo $e->getMessage();
+        echo "<pre>";
+        echo $e->getTraceAsString();
+        echo "</pre>";
+        Logging::error($e->getTraceAsString());
    } else {
-        Logging::info($e->getTrace());
+        Logging::error($e->getTrace());
    }
    throw $e;
 }
--- a/airtime_mvc/public/js/airtime/library/library.js
+++ b/airtime_mvc/public/js/airtime/library/library.js
@ -316,15 +316,24 @@ var AIRTIME = (function(AIRTIME) {
    };
    
    mod.fnDeleteItems = function(aMedia) {
-       
+
+        //Prevent the user from spamming the delete button while the AJAX request is in progress
+        AIRTIME.button.disableButton("btn-group #sb-trash", false);
+        //Hack to immediately show the "Processing" div in DataTables to give the user some sort of feedback.
+        $(".dataTables_processing").css('visibility','visible');
+
        $.post(baseUrl+"library/delete", 
            {"format": "json", "media": aMedia}, 
            function(json){
                if (json.message !== undefined) {
                    alert(json.message);
                }
+
                chosenItems = {};
                oTable.fnStandingRedraw();
+
+                //Re-enable the delete button
+                AIRTIME.button.enableButton("btn-group #sb-trash", false);
            });
    };
    
--- a/airtime_mvc/tests/application/models/database/datasets/test_checkOverlappingShows.xml
+++ b/airtime_mvc/tests/application/models/database/datasets/test_checkOverlappingShows.xml
@ -14,6 +14,7 @@
        <column>live_stream_pass</column>
        <column>linked</column>
        <column>is_linkable</column>
+        <column>image_path</column>
        <row>
            <value>1</value>
            <value>test show</value>
@ -28,6 +29,7 @@
            <null />
            <value></value>
            <value>1</value>
+            <value></value>
        </row>
    </table>

@ -338,4 +340,4 @@

    <table name="cc_show_hosts">
    </table>
-</dataset>
+</dataset>
--- a/airtime_mvc/tests/application/services/database/datasets/test_ccShowInsertedIntoDatabase.xml
+++ b/airtime_mvc/tests/application/services/database/datasets/test_ccShowInsertedIntoDatabase.xml
@ -14,6 +14,7 @@
        <column>live_stream_pass</column>
        <column>linked</column>
        <column>is_linkable</column>
+        <column>image_path</column>
        <row>
            <value>1</value>
            <value>test show</value>
@ -28,6 +29,7 @@
            <null />
            <value></value>
            <value>1</value>
+            <value></value>
        </row>
   </table>
-</dataset>
+</dataset>
--- a/airtime_mvc/tests/application/services/database/datasets/test_changeRepeatDayUpdatesScheduleCorrectly.xml
+++ b/airtime_mvc/tests/application/services/database/datasets/test_changeRepeatDayUpdatesScheduleCorrectly.xml
@ -14,6 +14,7 @@
        <column>live_stream_pass</column>
        <column>linked</column>
        <column>is_linkable</column>
+        <column>image_path</column>
        <row>
            <value>1</value>
            <value>test show</value>
@ -28,6 +29,7 @@
            <null />
            <value>1</value>
            <value>1</value>
+            <value></value>
        </row>
    </table>

@ -134,4 +136,4 @@
            <value>1</value>
        </row>
    </table>
-</dataset>
+</dataset>
--- a/airtime_mvc/tests/application/services/database/datasets/test_createBiWeeklyRepeatNoEndNoRRShow.xml
+++ b/airtime_mvc/tests/application/services/database/datasets/test_createBiWeeklyRepeatNoEndNoRRShow.xml
@ -14,6 +14,7 @@
        <column>live_stream_pass</column>
        <column>linked</column>
        <column>is_linkable</column>
+        <column>image_path</column>
        <row>
            <value>1</value>
            <value>test show</value>
@ -28,6 +29,7 @@
            <null />
            <value></value>
            <value>1</value>
+            <value></value>
        </row>
   </table>

@ -104,4 +106,4 @@

    <table name="cc_show_hosts">
    </table>
-</dataset>
+</dataset>
--- a/airtime_mvc/tests/application/services/database/datasets/test_createLinkedShow.xml
+++ b/airtime_mvc/tests/application/services/database/datasets/test_createLinkedShow.xml
@ -14,6 +14,7 @@
        <column>live_stream_pass</column>
        <column>linked</column>
        <column>is_linkable</column>
+        <column>image_path</column>
        <row>
            <value>1</value>
            <value>test show</value>
@ -28,6 +29,7 @@
            <null />
            <value>1</value>
            <value>1</value>
+            <value></value>
        </row>
    </table>

@ -134,4 +136,4 @@

    <table name="cc_show_hosts">
    </table>
-</dataset>
+</dataset>
--- a/airtime_mvc/tests/application/services/database/datasets/test_createMonthlyMonthlyRepeatNoEndNoRRShow.xml
+++ b/airtime_mvc/tests/application/services/database/datasets/test_createMonthlyMonthlyRepeatNoEndNoRRShow.xml
@ -14,6 +14,7 @@
        <column>live_stream_pass</column>
        <column>linked</column>
        <column>is_linkable</column>
+        <column>image_path</column>
        <row>
            <value>1</value>
            <value>test show</value>
@ -28,6 +29,7 @@
            <null />
            <value></value>
            <value>1</value>
+            <value></value>
        </row>
   </table>

@ -94,4 +96,4 @@

    <table name="cc_show_hosts">
    </table>
-</dataset>
+</dataset>
--- a/airtime_mvc/tests/application/services/database/datasets/test_createMonthlyWeeklyRepeatNoEndNoRRShow.xml
+++ b/airtime_mvc/tests/application/services/database/datasets/test_createMonthlyWeeklyRepeatNoEndNoRRShow.xml
@ -14,6 +14,7 @@
        <column>live_stream_pass</column>
        <column>linked</column>
        <column>is_linkable</column>
+        <column>image_path</column>
        <row>
            <value>1</value>
            <value>test show</value>
@ -28,6 +29,7 @@
            <null />
            <value></value>
            <value>1</value>
+            <value></value>
        </row>
    </table>

@ -94,4 +96,4 @@

    <table name="cc_show_hosts">
    </table>
-</dataset>
+</dataset>
--- a/airtime_mvc/tests/application/services/database/datasets/test_createNoRepeatNoRRShow.xml
+++ b/airtime_mvc/tests/application/services/database/datasets/test_createNoRepeatNoRRShow.xml
@ -14,6 +14,7 @@
        <column>live_stream_pass</column>
        <column>linked</column>
        <column>is_linkable</column>
+        <column>image_path</column>
        <row>
            <value>1</value>
            <value>test show</value>
@ -28,6 +29,7 @@
            <null />
            <value></value>
            <value>1</value>
+            <value></value>
        </row>
   </table>

@ -84,4 +86,4 @@

    <table name="cc_show_hosts">
    </table>
-</dataset>
+</dataset>
--- a/airtime_mvc/tests/application/services/database/datasets/test_createNoRepeatRRShow.xml
+++ b/airtime_mvc/tests/application/services/database/datasets/test_createNoRepeatRRShow.xml
@ -14,6 +14,7 @@
        <column>live_stream_pass</column>
        <column>linked</column>
        <column>is_linkable</column>
+        <column>image_path</column>
        <row>
            <value>1</value>
            <value>test show</value>
@ -28,6 +29,7 @@
            <null />
            <value></value>
            <value>1</value>
+            <value></value>
        </row>
   </table>

@ -248,4 +250,4 @@

    <table name="cc_show_hosts">
    </table>
-</dataset>
+</dataset>
--- a/airtime_mvc/tests/application/services/database/datasets/test_createQuadWeeklyRepeatNoEndNoRRShow.xml
+++ b/airtime_mvc/tests/application/services/database/datasets/test_createQuadWeeklyRepeatNoEndNoRRShow.xml
@ -14,6 +14,7 @@
        <column>live_stream_pass</column>
        <column>linked</column>
        <column>is_linkable</column>
+        <column>image_path</column>
        <row>
            <value>1</value>
            <value>test show</value>
@ -28,6 +29,7 @@
            <null />
            <value></value>
            <value>1</value>
+            <value></value>
        </row>
   </table>

@ -94,4 +96,4 @@

    <table name="cc_show_hosts">
    </table>
-</dataset>
+</dataset>
--- a/airtime_mvc/tests/application/services/database/datasets/test_createTriWeeklyRepeatNoEndNoRRShow.xml
+++ b/airtime_mvc/tests/application/services/database/datasets/test_createTriWeeklyRepeatNoEndNoRRShow.xml
@ -14,6 +14,7 @@
        <column>live_stream_pass</column>
        <column>linked</column>
        <column>is_linkable</column>
+        <column>image_path</column>
        <row>
            <value>1</value>
            <value>test show</value>
@ -28,6 +29,7 @@
            <null />
            <value></value>
            <value>1</value>
+            <value></value>
        </row>
   </table>

@ -94,4 +96,4 @@

    <table name="cc_show_hosts">
    </table>
-</dataset>
+</dataset>
--- a/airtime_mvc/tests/application/services/database/datasets/test_createWeeklyRepeatNoEndNoRRShow.xml
+++ b/airtime_mvc/tests/application/services/database/datasets/test_createWeeklyRepeatNoEndNoRRShow.xml
@ -14,6 +14,7 @@
        <column>live_stream_pass</column>
        <column>linked</column>
        <column>is_linkable</column>
+        <column>image_path</column>
        <row>
            <value>1</value>
            <value>test show</value>
@ -28,6 +29,7 @@
            <null />
            <value></value>
            <value>1</value>
+            <value></value>
        </row>
    </table>

@ -134,4 +136,4 @@

    <table name="cc_show_hosts">
    </table>
-</dataset>
+</dataset>
--- a/airtime_mvc/tests/application/services/database/datasets/test_createWeeklyRepeatRRShow.xml
+++ b/airtime_mvc/tests/application/services/database/datasets/test_createWeeklyRepeatRRShow.xml
@ -14,6 +14,7 @@
        <column>live_stream_pass</column>
        <column>linked</column>
        <column>is_linkable</column>
+        <column>image_path</column>
        <row>
            <value>1</value>
            <value>test show</value>
@ -28,6 +29,7 @@
            <null />
            <value></value>
            <value>1</value>
+            <value></value>
        </row>
   </table>

@ -270,4 +272,4 @@

    <table name="cc_show_hosts">
    </table>
-</dataset>
+</dataset>
--- a/airtime_mvc/tests/application/services/database/datasets/test_deleteShowInstance.xml
+++ b/airtime_mvc/tests/application/services/database/datasets/test_deleteShowInstance.xml
@ -14,6 +14,7 @@
        <column>live_stream_pass</column>
        <column>linked</column>
        <column>is_linkable</column>
+        <column>image_path</column>
        <row>
            <value>1</value>
            <value>test show</value>
@ -28,6 +29,7 @@
            <null />
            <value></value>
            <value>1</value>
+            <value></value>
        </row>
   </table>

@ -134,4 +136,4 @@

    <table name="cc_show_hosts">
    </table>
-</dataset>
+</dataset>
--- a/airtime_mvc/tests/application/services/database/datasets/test_deleteShowInstanceAndAllFollowing.xml
+++ b/airtime_mvc/tests/application/services/database/datasets/test_deleteShowInstanceAndAllFollowing.xml
@ -14,6 +14,7 @@
        <column>live_stream_pass</column>
        <column>linked</column>
        <column>is_linkable</column>
+        <column>image_path</column>
        <row>
            <value>1</value>
            <value>test show</value>
@ -28,6 +29,7 @@
            <null />
            <value></value>
            <value>1</value>
+            <value></value>
        </row>
   </table>

@ -260,4 +262,4 @@

    <table name="cc_show_hosts">
    </table>
-</dataset>
+</dataset>
--- a/airtime_mvc/tests/application/services/database/datasets/test_editRepeatingShowChangeNoEndOption.xml
+++ b/airtime_mvc/tests/application/services/database/datasets/test_editRepeatingShowChangeNoEndOption.xml
@ -14,6 +14,7 @@
        <column>live_stream_pass</column>
        <column>linked</column>
        <column>is_linkable</column>
+        <column>image_path</column>
        <row>
            <value>1</value>
            <value>test show</value>
@ -28,6 +29,7 @@
            <null />
            <value></value>
            <value>1</value>
+            <value></value>
        </row>
    </table>

@ -94,4 +96,4 @@

    <table name="cc_show_hosts">
    </table>
-</dataset>
+</dataset>
--- a/airtime_mvc/tests/application/services/database/datasets/test_editRepeatingShowInstance.xml
+++ b/airtime_mvc/tests/application/services/database/datasets/test_editRepeatingShowInstance.xml
@ -14,6 +14,7 @@
        <column>live_stream_pass</column>
        <column>linked</column>
        <column>is_linkable</column>
+        <column>image_path</column>
        <row>
            <value>1</value>
            <value>test show</value>
@ -28,6 +29,7 @@
            <null />
            <value></value>
            <value>1</value>
+            <value></value>
        </row>
   </table>

@ -157,4 +159,4 @@

    <table name="cc_show_hosts">
    </table>
-</dataset>
+</dataset>
--- a/airtime_mvc/tests/application/services/database/datasets/test_removeFirstRepeatShowDayUpdatesScheduleCorrectly.xml
+++ b/airtime_mvc/tests/application/services/database/datasets/test_removeFirstRepeatShowDayUpdatesScheduleCorrectly.xml
@ -14,6 +14,7 @@
        <column>live_stream_pass</column>
        <column>linked</column>
        <column>is_linkable</column>
+        <column>image_path</column>
        <row>
            <value>1</value>
            <value>test show</value>
@ -28,6 +29,7 @@
            <null />
            <value>1</value>
            <value>1</value>
+            <value></value>
        </row>
    </table>

@ -134,4 +136,4 @@
            <value>1</value>
        </row>
    </table>
-</dataset>
+</dataset>
--- a/airtime_mvc/tests/application/services/database/datasets/test_repeatShowCreationWhenUserMovesForwardInCalendar.xml
+++ b/airtime_mvc/tests/application/services/database/datasets/test_repeatShowCreationWhenUserMovesForwardInCalendar.xml
@ -14,6 +14,7 @@
        <column>live_stream_pass</column>
        <column>linked</column>
        <column>is_linkable</column>
+        <column>image_path</column>
        <row>
            <value>1</value>
            <value>test show</value>
@ -28,6 +29,7 @@
            <null />
            <value></value>
            <value>1</value>
+            <value></value>
        </row>
   </table>

@ -134,4 +136,4 @@

    <table name="cc_show_hosts">
    </table>
-</dataset>
+</dataset>
--- a/airtime_mvc/tests/application/services/database/datasets/test_unlinkLinkedShow.xml
+++ b/airtime_mvc/tests/application/services/database/datasets/test_unlinkLinkedShow.xml
@ -14,6 +14,7 @@
        <column>live_stream_pass</column>
        <column>linked</column>
        <column>is_linkable</column>
+        <column>image_path</column>
        <row>
            <value>1</value>
            <value>test show</value>
@ -28,6 +29,7 @@
            <null />
            <value></value>
            <value></value>
+            <value></value>
        </row>
    </table>

@ -134,4 +136,4 @@

    <table name="cc_show_hosts">
    </table>
-</dataset>
+</dataset>
--- a/airtime_mvc/tests/application/services/database/datasets/test_weeklyToBiWeekly.xml
+++ b/airtime_mvc/tests/application/services/database/datasets/test_weeklyToBiWeekly.xml
@ -14,6 +14,7 @@
        <column>live_stream_pass</column>
        <column>linked</column>
        <column>is_linkable</column>
+        <column>image_path</column>
        <row>
            <value>1</value>
            <value>test show</value>
@ -28,6 +29,7 @@
            <null />
            <value></value>
            <value>1</value>
+            <value></value>
        </row>
   </table>

@ -104,4 +106,4 @@

    <table name="cc_show_hosts">
    </table>
-</dataset>
+</dataset>
--- a/airtime_mvc/tests/application/services/database/datasets/test_weeklyToNoRepeat.xml
+++ b/airtime_mvc/tests/application/services/database/datasets/test_weeklyToNoRepeat.xml
@ -14,6 +14,7 @@
        <column>live_stream_pass</column>
        <column>linked</column>
        <column>is_linkable</column>
+        <column>image_path</column>
        <row>
            <value>1</value>
            <value>test show</value>
@ -28,6 +29,7 @@
            <null />
            <value></value>
            <value>1</value>
+            <value></value>
        </row>
   </table>

@ -84,4 +86,4 @@

    <table name="cc_show_hosts">
    </table>
-</dataset>
+</dataset>