Merge branch '2.5.x' into 2.5.x-installer

airtime_mvc/application/layouts/scripts/login.phtml

@@ -21,9 +21,9 @@
             $companySiteAnchor = "<a href='" . COMPANY_SITE_URL . "'>"
                                   . $company
                                 . "</a>";
-            echo sprintf(_('%1$s copyright &copy; %2$s All rights reserved.%3$s'
-                . 'Maintained and distributed under the %4$s by %5$s'), 
-            PRODUCT_NAME, $company, "<br>",
+            echo sprintf(_('%1$s copyright &copy; %2$s All rights reserved.<br />'
+                . 'Maintained and distributed under the %3$s by %4$s'), 
+            PRODUCT_NAME, $company,
             $licenseSiteAnchor,
             $companySiteAnchor);
         ?> 

airtime_mvc/application/models/Scheduler.php

@@ -1112,35 +1112,36 @@ class Application_Model_Scheduler
 
             $removedItems = CcScheduleQuery::create()->findPks($scheduledIds);
 
-            //check to make sure all items selected are up to date
-            foreach ($removedItems as $removedItem) {
+            // This array is used to keep track of every show instance that was
+            // effected by the track deletion. It will be used later on to
+            // remove gaps in the schedule and adjust crossfade times.
+            $effectedInstanceIds = array();
 
+            foreach ($removedItems as $removedItem) {
                 $instance = $removedItem->getCcShowInstances($this->con);
+                $effectedInstanceIds[] = $instance->getDbId();
 
                 //check if instance is linked and if so get the schedule items
                 //for all linked instances so we can delete them too
                 if (!$cancelShow && $instance->getCcShow()->isLinked()) {
                     //returns all linked instances if linked
                     $ccShowInstances = $this->getInstances($instance->getDbId());
+
                     $instanceIds = array();
                     foreach ($ccShowInstances as $ccShowInstance) {
                         $instanceIds[] = $ccShowInstance->getDbId();
                     }
-                    /*
-                     * Find all the schedule items that are in the same position
-                     * as the selected item by the user.
-                     * The position of each track is the same across each linked instance
-                     */
+                    $effectedInstanceIds = array_merge($effectedInstanceIds, $instanceIds);
+                    
+                    // Delete the same track, represented by $removedItem, in
+                    // each linked show instance.
                     $itemsToDelete = CcScheduleQuery::create()
                         ->filterByDbPosition($removedItem->getDbPosition())
                         ->filterByDbInstanceId($instanceIds, Criteria::IN)
-                        ->find();
-                    foreach ($itemsToDelete as $item) {
-                        if (!$removedItems->contains($item)) {
-                            $removedItems->append($item);
-                        }
-                    }
+                        ->filterByDbId($removedItem->getDbId(), Criteria::NOT_EQUAL)
+                        ->delete($this->con);
                 }
+                
 
                 //check to truncate the currently playing item instead of deleting it.
                 if ($removedItem->isCurrentItem($this->epochNow)) {
@@ -1165,29 +1166,11 @@ class Application_Model_Scheduler
                 } else {
                     $removedItem->delete($this->con);
                 }
-
-                // update is_scheduled in cc_files but only if
-                // the file is not scheduled somewhere else
-                $fileId = $removedItem->getDbFileId();
-                // check if the removed item is scheduled somewhere else
-                $futureScheduledFiles = Application_Model_Schedule::getAllFutureScheduledFiles();
-                if (!is_null($fileId) && !in_array($fileId, $futureScheduledFiles)) {
-                     $db_file = CcFilesQuery::create()->findPk($fileId, $this->con);
-                     $db_file->setDbIsScheduled(false)->save($this->con);
-                }
             }
+            Application_Model_StoredFile::updatePastFilesIsScheduled();
 
             if ($adjustSched === true) {
-                //get the show instances of the shows we must adjust times for.
-                foreach ($removedItems as $item) {
-
-                    $instance = $item->getDBInstanceId();
-                    if (!in_array($instance, $showInstances)) {
-                        $showInstances[] = $instance;
-                    }
-                }
-
-                foreach ($showInstances as $instance) {
+                foreach ($effectedInstanceIds as $instance) {
                     $this->removeGaps($instance);
                     $this->calculateCrossfades($instance);
                 }
@@ -1195,7 +1178,7 @@ class Application_Model_Scheduler
 
             //update the status flag in cc_schedule.
             $instances = CcShowInstancesQuery::create()
-                ->filterByPrimaryKeys($showInstances)
+                ->filterByPrimaryKeys($effectedInstanceIds)
                 ->find($this->con);
 
             foreach ($instances as $instance) {

airtime_mvc/application/models/Show.php

@@ -1131,7 +1131,6 @@ SELECT s.name,
        s.genre,
        s.id,
        si.id AS instance_id,
-       si.description AS instance_description,
        si.record,
        s.url,
        s.image_path,
@@ -1220,7 +1219,6 @@ SELECT si.starts AS start_timestamp,
        s.description,
        s.id,
        si.id AS instance_id,
-       si.description AS instance_description,
        si.record,
        s.url,
        s.image_path,
@@ -1267,7 +1265,6 @@ SQL;
                     $results['previousShow'][0] = array(
                             "id"                      => $rows[$i-1]['id'],
                             "instance_id"             => $rows[$i-1]['instance_id'],
-                            "instance_description"    => $rows[$i-1]['instance_description'],
                             "name"                    => $rows[$i-1]['name'],
                             "description"            => $rows[$i-1]['description'],
                             "url"                     => $rows[$i-1]['url'],
@@ -1286,7 +1283,6 @@ SQL;
                     $results['nextShow'][0] =  array(
                             "id"                     => $rows[$i+1]['id'],
                             "instance_id"             => $rows[$i+1]['instance_id'],
-                            "instance_description"    => $rows[$i+1]['instance_description'],
                             "name"                    => $rows[$i+1]['name'],
                             "description"             => $rows[$i+1]['description'],
                             "url"                     => $rows[$i+1]['url'],
@@ -1309,7 +1305,6 @@ SQL;
                 $results['nextShow'][0] = array(
                         "id"                      => $rows[$i]['id'],
                         "instance_id"             => $rows[$i]['instance_id'],
-                        "instance_description"    => $rows[$i]['instance_description'],
                                     "name"                    => $rows[$i]['name'],
                         "description"             => $rows[$i]['description'],
                                     "url"                     => $rows[$i]['url'],
@@ -1329,7 +1324,6 @@ SQL;
             $results['previousShow'][0] = array(
                     "id"                      => $rows[$previousShowIndex]['id'],
                     "instance_id"             => $rows[$previousShowIndex]['instance_id'],
-                    "instance_description"    => $rows[$previousShowIndex]['instance_description'],
                     "name"                    => $rows[$previousShowIndex]['name'],
                     "description"             => $rows[$previousShowIndex]['description'],
                     "start_timestamp"         => $rows[$previousShowIndex]['start_timestamp'],

airtime_mvc/application/views/scripts/form/register-dialog.phtml

@@ -3,10 +3,10 @@
         <fieldset>
             <dl class="zend_form">
                <dt class="block-display info-text">
-                    <?php echo sprintf(_('Help %1$s improve by letting us know how you are using it. This info '
-                    .'will be collected regularly in order to enhance your user experience.%2$s'
-                    .'Click \'Yes, help %1$s\' and we\'ll make sure the features you use are '
-                    .'constantly improving.'), PRODUCT_NAME, "<br /><br />") ?>
+                    <?php echo sprintf(_("Help improve %s by letting us know how you're using it. This information"
+                    ." will be collected regularly in order to enhance your user experience.<br />"
+                    ."Click the box below and we'll make sure the features you use are constantly improving."), 
+                           PRODUCT_NAME)?>
                 </dt>
                 <dd id="SupportFeedback-element" class="block-display">
                     <label class="optional" for="SupportFeedback">

airtime_mvc/application/views/scripts/form/support-setting.phtml

@@ -2,10 +2,10 @@
     <dl class="zend_form">
         <dd id="SupportFeedback-element" style="width:90%;">
             <div class="info-text">
-               <?php echo sprintf(_("Help %s improve by letting %s know how you are using it. This information"
-                ." will be collected regularly in order to enhance your user experience.%s"
-                ."Click the 'Send support feedback' box and we'll make sure the features you use are constantly improving."), 
-                       PRODUCT_NAME, COMPANY_NAME, "<br />")?>
+               <?php echo sprintf(_("Help improve %s by letting us know how you're using it. This information"
+                ." will be collected regularly in order to enhance your user experience.<br />"
+                ."Click the box below and we'll make sure the features you use are constantly improving."), 
+                       PRODUCT_NAME)?>
             </div>
             <label class="optional" for="SupportFeedback">
                 <?php echo $this->element->getElement('SupportFeedback') ?>

tests/selenium/Account Plans.html

@@ -1,196 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head profile="http://selenium-ide.openqa.org/profiles/test-case">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<link rel="selenium.base" href="http://bananas.airtime.pro/" />
-<title>Account Plans</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">Account Plans</td></tr>
-</thead><tbody>
-<tr>
-	<td>open</td>
-	<td>/billing/upgrade</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>link=Account Plans</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=hobbyist_grid_price</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=starter_grid_price</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=plus_grid_price</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=premium_grid_price</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyText</td>
-	<td>id=hobbyist_grid_price</td>
-	<td>$9.95 / month</td>
-</tr>
-<tr>
-	<td>verifyText</td>
-	<td>id=starter_grid_price</td>
-	<td>$39.95 / month</td>
-</tr>
-<tr>
-	<td>verifyText</td>
-	<td>id=plus_grid_price</td>
-	<td>$64.95 / month</td>
-</tr>
-<tr>
-	<td>verifyText</td>
-	<td>id=premium_grid_price</td>
-	<td>$99.95 / month</td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=current_plan</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=newproductbillingcycle-monthly</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=newproductbillingcycle-annually</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=newproductid-25</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=newproductid-26</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=newproductid-27</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=newproductid-28</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>css=span.subtotal</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=firstname</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=lastname</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=companyname</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=email</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=address1</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=address2</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=city</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=state</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=postcode</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=country</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=phonenumber</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=securityqid</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=securityqans</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=customfields-7</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=customfields-71</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=paymentmethod-paypal</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>//div[@id='total_box']/b[2]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>css=input[type=&quot;submit&quot;]</td>
-	<td></td>
-</tr>
-</tbody></table>
-</body>
-</html>

tests/selenium/Add Media Skeleton Present.html

@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head profile="http://selenium-ide.openqa.org/profiles/test-case">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<link rel="selenium.base" href="http://bananas.airtime.pro/" />
+
 <title>Add Media Skeleton Present</title>
 </head>
 <body>

tests/selenium/Calendar Add Show Skeleton.html

@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head profile="http://selenium-ide.openqa.org/profiles/test-case">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<link rel="selenium.base" href="http://bananas.airtime.pro/" />
+
 <title>Calendar Add Show Skeleton</title>
 </head>
 <body>

tests/selenium/Calendar Day Week Month Views.html

@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head profile="http://selenium-ide.openqa.org/profiles/test-case">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<link rel="selenium.base" href="http://bananas.airtime.pro/" />
+
 <title>Calendar Day Week Month Views</title>
 </head>
 <body>

tests/selenium/Calendar Skeleton Present.html

@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head profile="http://selenium-ide.openqa.org/profiles/test-case">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<link rel="selenium.base" href="http://bananas.airtime.pro/" />
+
 <title>Calendar Skeleton Present</title>
 </head>
 <body>

tests/selenium/Library Skeleton Present.html

@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head profile="http://selenium-ide.openqa.org/profiles/test-case">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<link rel="selenium.base" href="http://bananas.airtime.pro/" />
+
 <title>Library Skeleton Present</title>
 </head>
 <body>

tests/selenium/Listen Button Skeleton.html

@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head profile="http://selenium-ide.openqa.org/profiles/test-case">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<link rel="selenium.base" href="http://bananas.airtime.pro/" />
+
 <title>Listen Button Skeleton</title>
 </head>
 <body>

tests/selenium/Login and Logout.html

@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head profile="http://selenium-ide.openqa.org/profiles/test-case">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<link rel="selenium.base" href="http://bananas.airtime.pro/" />
+
 <title>Login and Logout</title>
 </head>
 <body>

tests/selenium/Login.html

@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head profile="http://selenium-ide.openqa.org/profiles/test-case">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<link rel="selenium.base" href="http://bananas.airtime.pro/" />
+
 <title>Login</title>
 </head>
 <body>

tests/selenium/Preferences Skeletons.html

@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head profile="http://selenium-ide.openqa.org/profiles/test-case">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<link rel="selenium.base" href="http://bananas.airtime.pro/" />
+
 <title>Preferences Skeletons</title>
 </head>
 <body>

tests/selenium/System Menu Contents.html

@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head profile="http://selenium-ide.openqa.org/profiles/test-case">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<link rel="selenium.base" href="http://bananas.airtime.pro/" />
+
 <title>System Menu Contents</title>
 </head>
 <body>