Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas

Conflicts:
	airtime_mvc/application/modules/rest/controllers/MediaController.php

airtime_mvc/application/Bootstrap.php

@@ -11,6 +11,7 @@ require_once __DIR__."/configs/constants.php";
 require_once 'Preference.php';
 require_once 'Locale.php';
 require_once "DateHelper.php";
+require_once "LocaleHelper.php";
 require_once "OsPath.php";
 require_once "Database.php";
 require_once "Timezone.php";
@@ -53,7 +54,8 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
         $view = $this->getResource('view');
         $baseUrl = Application_Common_OsPath::getBaseDir();
 
-        $view->headScript()->appendScript("var baseUrl = '$baseUrl'");
+        $view->headScript()->appendScript("var baseUrl = '$baseUrl';");
+        $this->_initTranslationGlobals($view);
         
         $user = Application_Model_User::GetCurrentUser();
         if (!is_null($user)){
@@ -62,7 +64,17 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
             $userType = "";
         }
         $view->headScript()->appendScript("var userType = '$userType';");
+    }
     
+    /**
+     * 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) {
+        $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 . "';");
     }
 
     protected function _initHeadLink()

airtime_mvc/application/common/LocaleHelper.php

@@ -0,0 +1,7 @@
+<?php
+
+// Global functions for translating domain-specific strings
+
+function _pro($str) {
+    return dgettext("pro", $str);
+}

airtime_mvc/application/configs/constants.php

@@ -1,5 +1,21 @@
 <?php
 
+define('PRODUCT_NAME'       , 'Airtime');
+define('PRODUCT_SITE_URL'   , 'http://airtime.sourcefabric.org');
+
+define('COMPANY_NAME'       , 'Sourcefabric');
+define('COMPANY_SUFFIX'     , 'z.ú.');
+define('COMPANY_SITE'       , 'Sourcefabric.org');
+define('COMPANY_SITE_URL'   , 'http://sourcefabric.org/');
+
+define('WHOS_USING_URL'             , 'http://sourcefabric.org/en/airtime/whosusing');
+define('TERMS_AND_CONDITIONS_URL'   , 'http://www.sourcefabric.org/en/about/policy/');
+define('PRIVACY_POLICY_URL'         , 'http://www.sourcefabric.org/en/about/policy/');
+define('USER_MANUAL_URL'            , 'http://www.sourcefabric.org/en/airtime/manuals/');
+
+define('LICENSE_VERSION'    , 'GNU AGPL v.3');
+define('LICENSE_URL'        , 'http://www.gnu.org/licenses/agpl-3.0-standalone.html');
+
 define('AIRTIME_COPYRIGHT_DATE' , '2010-2012');
 define('AIRTIME_REST_VERSION'   , '1.1');
 define('AIRTIME_API_VERSION'    , '1.1');

airtime_mvc/application/controllers/ApiController.php

@@ -833,7 +833,7 @@ class ApiController extends Zend_Controller_Action
 
                 //File is not in database anymore.
                 if (is_null($file)) {
-                    $return_hash['error'] = _("File does not exist in Airtime.");
+                    $return_hash['error'] = sprintf(_("File does not exist in %s"), PRODUCT_NAME);
                 }
                 //Updating a metadata change.
                 else {
@@ -853,7 +853,7 @@ class ApiController extends Zend_Controller_Action
                     $md['MDATA_KEY_ORIGINAL_PATH'], $con);
 
                 if (is_null($file)) {
-                    $return_hash['error'] = _('File does not exist in Airtime');
+                    $return_hash['error'] = sprintf(_('File does not exist in %s'), PRODUCT_NAME);
                 } else {
                     $filepath = $md['MDATA_KEY_FILEPATH'];
                     //$filepath = str_replace("\\", "", $filepath);
@@ -865,7 +865,7 @@ class ApiController extends Zend_Controller_Action
                 $file = Application_Model_StoredFile::RecallByFilepath($filepath, $con);
 
                 if (is_null($file)) {
-                    $return_hash['error'] = _("File doesn't exist in Airtime.");
+                    $return_hash['error'] = sprintf(_('File does not exist in %s'), PRODUCT_NAME);
                     Logging::warn("Attempt to delete file that doesn't exist.
                         Path: '$filepath'");
                 } else {

airtime_mvc/application/controllers/LocaleController.php

@@ -2,6 +2,7 @@
 
 class LocaleController extends Zend_Controller_Action
 {
+
     public function init()
     {
     }

airtime_mvc/application/controllers/LoginController.php

@@ -16,15 +16,16 @@ class LoginController extends Zend_Controller_Action
         
         $request = $this->getRequest();
         $response = $this->getResponse();
+        $stationLocale = Application_Model_Preference::GetDefaultLocale();
         
         //Enable AJAX requests from www.airtime.pro for the sign-in process.
         CORSHelper::enableATProCrossOriginRequests($request, $response);
                 
-        Application_Model_Locale::configureLocalization($request->getcookie('airtime_locale', 'en_CA'));
+        
+        Application_Model_Locale::configureLocalization($request->getcookie('airtime_locale', $stationLocale));
         $auth = Zend_Auth::getInstance();
         
-        if ($auth->hasIdentity())
+        if ($auth->hasIdentity()) {
-        {
             $this->_redirect('Showbuilder');
         }
 
@@ -130,7 +131,9 @@ class LoginController extends Zend_Controller_Action
         $this->view->headScript()->appendFile($baseUrl.'js/airtime/login/password-restore.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
 
         $request = $this->getRequest();
-        Application_Model_Locale::configureLocalization($request->getcookie('airtime_locale', 'en_CA'));
+        $stationLocale = Application_Model_Preference::GetDefaultLocale();
+        
+        Application_Model_Locale::configureLocalization($request->getcookie('airtime_locale', $stationLocale));
 
         if (!Application_Model_Preference::GetEnableSystemEmail()) {
             $this->_redirect('login');
@@ -174,7 +177,9 @@ class LoginController extends Zend_Controller_Action
     public function passwordRestoreAfterAction()
     {
         $request = $this->getRequest();
-        Application_Model_Locale::configureLocalization($request->getcookie('airtime_locale', 'en_CA'));
+        $stationLocale = Application_Model_Preference::GetDefaultLocale();
+        
+        Application_Model_Locale::configureLocalization($request->getcookie('airtime_locale', $stationLocale));
 
         //uses separate layout without a navigation.
         $this->_helper->layout->setLayout('login');
@@ -193,7 +198,9 @@ class LoginController extends Zend_Controller_Action
         $auth = new Application_Model_Auth();
         $user = CcSubjsQuery::create()->findPK($user_id);
         
-        Application_Model_Locale::configureLocalization($request->getcookie('airtime_locale', 'en_CA'));
+        $stationLocale = Application_Model_Preference::GetDefaultLocale();
+
+        Application_Model_Locale::configureLocalization($request->getcookie('airtime_locale', $stationLocale));
 
         //check validity of token
         if (!$auth->checkToken($user_id, $token, 'password.restore')) {

airtime_mvc/application/controllers/UserController.php

@@ -73,12 +73,6 @@ class UserController extends Zend_Controller_Action
                     $user->setJabber($formData['jabber']);
                     $user->save();
 
-                    // Language and timezone settings are saved on a per-user basis
-                    // By default, the default language, and timezone setting on
-                    // preferences page is what gets assigned.
-                    Application_Model_Preference::SetUserLocale();
-                    Application_Model_Preference::SetUserTimezone();
-
                     $form->reset();
                     $this->view->form = $form;
 

airtime_mvc/application/forms/AddShowLiveStream.php

@@ -7,7 +7,7 @@ class Application_Form_AddShowLiveStream extends Zend_Form_SubForm
     public function init()
     {
         $cb_airtime_auth = new Zend_Form_Element_Checkbox("cb_airtime_auth");
-        $cb_airtime_auth->setLabel(_("Use Airtime Authentication:"))
+        $cb_airtime_auth->setLabel(sprintf(_("Use %s Authentication:"), PRODUCT_NAME))
                           ->setRequired(false)
                           ->setDecorators(array('ViewHelper'));
         $this->addElement($cb_airtime_auth);

airtime_mvc/application/forms/Login.php

@@ -53,13 +53,11 @@ class Application_Form_Login extends Zend_Form
         $locale->setMultiOptions(Application_Model_Locale::getLocales());
         $locale->setDecorators(array('ViewHelper'));
         $this->addElement($locale);
+        $this->setDefaults(array(
+            "locale" => Application_Model_Locale::getUserLocale()
+        ));
 
-        $recaptchaNeeded = false;
         if (Application_Model_LoginAttempts::getAttempts($_SERVER['REMOTE_ADDR']) >= 3) {
-            $recaptchaNeeded = true;
-        }
-        if ($recaptchaNeeded) {
-            // recaptcha
             $this->addRecaptcha();
         }
 

airtime_mvc/application/forms/RegisterAirtime.php

@@ -123,7 +123,7 @@ class Application_Form_RegisterAirtime extends Zend_Form
 
         // checkbox for publicise
         $checkboxPublicise = new Zend_Form_Element_Checkbox("Publicise");
-        $checkboxPublicise->setLabel(_('Promote my station on Sourcefabric.org'))
+        $checkboxPublicise->setLabel(sprintf(_('Promote my station on %s'), COMPANY_SITE))
                           ->setRequired(false)
                           ->setDecorators(array('ViewHelper'))
                           ->setValue(Application_Model_Preference::GetPublicise());
@@ -143,11 +143,14 @@ class Application_Form_RegisterAirtime extends Zend_Form
             )
         ));
 
+        $privacyPolicyAnchorOpen = "<a id='link_to_privacy' href='" . PRIVACY_POLICY_URL
+            . "' onclick='window.open(this.href); return false;'>";
         // checkbox for privacy policy
         $checkboxPrivacy = new Zend_Form_Element_Checkbox("Privacy");
         $checkboxPrivacy->setLabel(
-            sprintf(_("By checking this box, I agree to Sourcefabric's %sprivacy policy%s."),
+            sprintf(_('By checking this box, I agree to %s\'s %sprivacy policy%s.'),
-                "<a id='link_to_privacy' href='http://www.sourcefabric.org/en/about/policy/' onclick='window.open(this.href); return false;'>",
+                COMPANY_NAME,
+                $privacyPolicyAnchorOpen,
                 "</a>"))
             ->setDecorators(array('ViewHelper'));
         $this->addElement($checkboxPrivacy);

airtime_mvc/application/forms/SupportSettings.php

@@ -118,7 +118,7 @@ class Application_Form_SupportSettings extends Zend_Form
 
             // checkbox for publicise
             $checkboxPublicise = new Zend_Form_Element_Checkbox("Publicise");
-            $checkboxPublicise->setLabel(_('Promote my station on Sourcefabric.org'))
+            $checkboxPublicise->setLabel(sprintf(_('Promote my station on %s'), COMPANY_SITE))
                               ->setRequired(false)
                               ->setDecorators(array('ViewHelper'))
                               ->setValue(Application_Model_Preference::GetPublicise());
@@ -130,8 +130,9 @@ class Application_Form_SupportSettings extends Zend_Form
             // checkbox for privacy policy
             $checkboxPrivacy = new Zend_Form_Element_Checkbox("Privacy");
             $checkboxPrivacy->setLabel(
-                sprintf(_("By checking this box, I agree to Sourcefabric's %sprivacy policy%s."),
+                sprintf(_('By checking this box, I agree to %s\'s %sprivacy policy%s.'),
-                    "<a id='link_to_privacy' href='http://www.sourcefabric.org/en/about/policy/' onclick='window.open(this.href); return false;'>",
+                    COMPANY_NAME,
+                    $privacyPolicyAnchorOpen,
                     "</a>"))
                 ->setDecorators(array('ViewHelper'));
             $this->addElement($checkboxPrivacy);

airtime_mvc/application/layouts/scripts/login.phtml

@@ -13,9 +13,20 @@
         <?php echo $this->layout()->content ?>
     </div>
     <div class="footer">
-      <?php echo sprintf(_("Airtime copyright &copy; Sourcefabric z.ú. All rights reserved.%s"
+        <?php 
-      ."Maintained and distributed under the GNU GPL v.3 by %sSourcefabric z.ú.%s"),
+            $company = COMPANY_NAME . " " . COMPANY_SUFFIX;
-      "<br>", "<a href='http://www.sourcefabric.org'>" ,"</a>");?> 
+            $licenseSiteAnchor = "<a href='" . LICENSE_URL . "'>" 
+                                  . LICENSE_VERSION 
+                              . "</a>";
+            $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>",
+            $licenseSiteAnchor,
+            $companySiteAnchor);
+        ?> 
     </div>
  
 </body>

airtime_mvc/application/models/Auth.php

@@ -33,7 +33,8 @@ class Application_Model_Auth
         $message = sprintf(_("Hi %s, \n\nClick this link to reset your password: "), $user->getDbLogin());
         $message .= "{$e_link_protocol}://{$e_link_base}:{$e_link_port}{$e_link_path}";
 
-        $success = Application_Model_Email::send(_('Airtime Password Reset'), $message, $user->getDbEmail());
+        $str = sprintf(_('%s Password Reset'), PRODUCT_NAME);
+        $success = Application_Model_Email::send($str, $message, $user->getDbEmail());
 
         return $success;
     }

airtime_mvc/application/models/Locale.php

@@ -2,6 +2,11 @@
 
 class Application_Model_Locale
 {
+    private static $domains = array(
+        'airtime', 
+        'pro',
+    );
+    
     public static $locales = array(
     	    "en_CA" => "English (Canada)",
             "en_GB" => "English (Britain)",
@@ -48,10 +53,31 @@ class Application_Model_Locale
             Logging::warn("Your system does not have the " . $lang . " locale installed. Run: sudo locale-gen " . $lang);
         }
         
-        $domain = 'airtime';
+        // We need to run bindtextdomain and bind_textdomain_codeset for each domain we're using.
+        foreach (self::$domains as $domain) {
             bindtextdomain($domain, '../locale');
-        textdomain($domain);
             bind_textdomain_codeset($domain, $codeset);
         }
+        
+        textdomain('airtime');
+    }
+    
+    /**
+     * We need this function for the case where a user has logged out, but 
+     * has an airtime_locale cookie containing their locale setting.
+     * 
+     * If the user does not have an airtime_locale cookie set, we default 
+     * to the station locale.
+     * 
+     * When the user logs in, the value set in the login form will be passed 
+     * into the airtime_locale cookie. This cookie is also updated when 
+     * a user updates their user settings.
+     */
+    public static function getUserLocale() {
+        $request = Zend_Controller_Front::getInstance()->getRequest();
+        $locale = $request->getCookie('airtime_locale', Application_Model_Preference::GetLocale());
+        return $locale;
+    }
+
 }
 

airtime_mvc/application/models/Preference.php

@@ -11,8 +11,7 @@ class Application_Model_Preference
         //we need this check because saas calls this function from outside Zend
         if (!class_exists("Zend_Auth", true) || !Zend_Auth::getInstance()->hasIdentity()) {
             $userId = null;
-		}
+        } else {
-		else {
             $auth = Zend_Auth::getInstance();
             $userId = $auth->getIdentity()->id;
         }
@@ -29,14 +28,14 @@ class Application_Model_Preference
         $cache = new Cache();
         
         try {
+            
             $con = Propel::getConnection(CcPrefPeer::DATABASE_NAME);
             $con->beginTransaction();
 
             $userId = self::getUserId();
             
-            if ($isUserValue && is_null($userId)) {
+            if ($isUserValue && is_null($userId))
                 throw new Exception("User id can't be null for a user preference {$key}.");
-            }
             
             Application_Common_Database::prepareAndExecute("LOCK TABLE cc_pref");
 
@@ -64,8 +63,7 @@ class Application_Model_Preference
                 //this case should not happen.
                 throw new Exception("Invalid number of results returned. Should be ".
                     "0 or 1, but is '$result' instead");
-            } 
+            } else if ($result == 1) {
-            elseif ($result == 1) {
                 
                 // result found
                 if (!$isUserValue) {
@@ -73,8 +71,7 @@ class Application_Model_Preference
                     $sql = "UPDATE cc_pref"
                         ." SET subjid = NULL, valstr = :value"
                         ." WHERE keystr = :key";
-                } 
+                } else {
-                else {
                     // user pref
                     $sql = "UPDATE cc_pref"
                         . " SET valstr = :value"
@@ -82,16 +79,14 @@ class Application_Model_Preference
                    
                     $paramMap[':id'] = $userId;
                 }
-            } 
+            } else {
-            else {
                 
                 // result not found
                 if (!$isUserValue) {
                     // system pref
                     $sql = "INSERT INTO cc_pref (keystr, valstr)"
                         ." VALUES (:key, :value)";
-                } 
+                } else {
-                else {
                     // user pref
                     $sql = "INSERT INTO cc_pref (subjid, keystr, valstr)"
                         ." VALUES (:id, :key, :value)";
@@ -109,8 +104,7 @@ class Application_Model_Preference
                     $con);
 
             $con->commit();
-        } 
+        } catch (Exception $e) {
-        catch (Exception $e) {
             $con->rollback();
             header('HTTP/1.0 503 Service Unavailable');
             Logging::info("Database error: ".$e->getMessage());
@@ -118,7 +112,6 @@ class Application_Model_Preference
         }
 
         $cache->store($key, $value, $isUserValue, $userId);
-        //Logging::info("SAVING {$key} {$userId} into cache. = {$value}");
     }
 
     private static function getValue($key, $isUserValue = false)
@@ -129,15 +122,12 @@ class Application_Model_Preference
             
             $userId = self::getUserId();
             
-        	if ($isUserValue && is_null($userId)) {
+            if ($isUserValue && is_null($userId))
                 throw new Exception("User id can't be null for a user preference.");
-        	}
 
+            // If the value is already cached, return it
             $res = $cache->fetch($key, $isUserValue, $userId);
-        	if ($res !== false) {
+            if ($res !== false) return $res;
-        		//Logging::info("returning {$key} {$userId} from cache. = {$res}");
-        		return $res;
-        	}
            
             //Check if key already exists
             $sql = "SELECT COUNT(*) FROM cc_pref"
@@ -157,8 +147,7 @@ class Application_Model_Preference
             //return an empty string if the result doesn't exist.
             if ($result == 0) {
                 $res = "";
-            } 
+            } else {
-            else {
                 $sql = "SELECT valstr FROM cc_pref"
                 ." WHERE keystr = :key";
                 
@@ -556,9 +545,8 @@ class Application_Model_Preference
     {
         // When a new user is created they will get the default timezone
         // setting which the admin sets on preferences page
-        if (is_null($timezone)) {
+        if (is_null($timezone))
             $timezone = self::GetDefaultTimezone();
-        }
         self::setValue("user_timezone", $timezone, true);
     }
 
@@ -567,8 +555,7 @@ class Application_Model_Preference
         $timezone = self::getValue("user_timezone", true); 
         if (!$timezone) {
             return self::GetDefaultTimezone();
-        } 
+        } else {
-        else {
             return $timezone;
         }
     }
@@ -580,8 +567,7 @@ class Application_Model_Preference
         
         if (!is_null($userId)) {
             return self::GetUserTimezone();
-        } 
+        } else {
-        else {
             return self::GetDefaultTimezone();
         }
     }
@@ -612,9 +598,8 @@ class Application_Model_Preference
     {
         // When a new user is created they will get the default locale
         // setting which the admin sets on preferences page
-        if (is_null($locale)) {
+        if (is_null($locale))
             $locale = self::GetDefaultLocale();
-        }
         self::setValue("user_locale", $locale, true);
     }
 
@@ -624,8 +609,7 @@ class Application_Model_Preference
         
         if (!is_null($userId)) {
             return self::GetUserLocale();
-        } 
+        } else {
-        else {
             return self::GetDefaultLocale();
         }
     }
@@ -1419,9 +1403,8 @@ class Application_Model_Preference
     public static function getReplayGainModifier() {
         $rg_modifier = self::getValue("replay_gain_modifier");
         
-        if ($rg_modifier === "") {
+        if ($rg_modifier === "")
             return "0";
-        }
         
         return $rg_modifier;
     }

airtime_mvc/application/models/Show.php

@@ -1137,7 +1137,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,
@@ -1226,7 +1225,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,
@@ -1273,7 +1271,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'],
@@ -1292,7 +1289,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'],
@@ -1335,7 +1331,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/modules/rest/controllers/MediaController.php

@@ -1,8 +1,13 @@
 <?php
 
-
 class Rest_MediaController extends Zend_Rest_Controller
 {
+    const MUSIC_DIRS_STOR_PK = 1;
+    
+    const IMPORT_STATUS_SUCCESS = 0;
+    const IMPORT_STATUS_PENDING = 1;
+    const IMPORT_STATUS_FAILED = 2;
+    
     //fields that are not modifiable via our RESTful API
     private static $blackList = array(
         'id',
@@ -215,6 +220,8 @@ class Rest_MediaController extends Zend_Rest_Controller
         }
         
         $file = CcFilesQuery::create()->findPk($id);
+        // Since we check for this value when deleting files, set it first
+        $file->setDbDirectory(self::MUSIC_DIRS_STOR_PK);
 
         $requestData = json_decode($this->getRequest()->getRawBody(), true);
         $whiteList = $this->removeBlacklistedFieldsFromRequestData($requestData);
@@ -251,7 +258,7 @@ class Rest_MediaController extends Zend_Rest_Controller
                 ->setHttpResponseCode(200)
                 ->appendBody(json_encode(CcFiles::sanitizeResponse($file)));
         } else {
-            $file->setDbImportStatus(2)->save();
+            $file->setDbImportStatus(self::IMPORT_STATUS_FAILED)->save();
             $this->fileNotFoundResponse();
         }
     }
@@ -263,6 +270,7 @@ class Rest_MediaController extends Zend_Rest_Controller
             return;
         }
         
+            
         $id = $this->getId();
         if (!$id) {
             return;

airtime_mvc/application/services/ShowFormService.php

@@ -390,33 +390,22 @@ class Application_Service_ShowFormService
     }
 
     /**
-     * 
      * Before we send the form data in for validation, there
      * are a few fields we may need to adjust first
+     * 
      * @param $formData
      */
     public function preEditShowValidationCheck($formData)
     {
-        $validateStartDate = true;
+        // If the start date or time were disabled, don't validate them
-        $validateStartTime = true;
+        $validateStartDate = $formData['start_date_disabled'] === "false";
+        $validateStartTime = $formData['start_time_disabled'] === "false";
 
         //CcShowDays object of the show currently being edited
         $currentShowDay = $this->ccShow->getFirstCcShowDay();
 
         //DateTime object
         $dt = $currentShowDay->getLocalStartDateAndTime();
-
-        if (!array_key_exists('add_show_start_date', $formData)) {
-            //Changing the start date was disabled, since the
-            //array key does not exist. We need to repopulate this entry from the db.
-            $formData['add_show_start_date'] = $dt->format("Y-m-d");
-
-            if (!array_key_exists('add_show_start_time', $formData)) {
-                $formData['add_show_start_time'] = $dt->format("H:i");
-                $validateStartTime = false;
-            }
-            $validateStartDate = false;
-        }
         $formData['add_show_record'] = $currentShowDay->getDbRecord();
 
         //if the show is repeating, set the start date to the next
@@ -440,9 +429,7 @@ class Application_Service_ShowFormService
         $ccShowInstance = CcShowInstancesQuery::create()
             ->filterByDbShowId($this->ccShow->getDbId())
             ->filterByDbModifiedInstance(false)
-            ->filterByDbEnds(gmdate("Y-m-d H:i:s"), Criteria::GREATER_THAN)
+            ->filterByDbStarts(gmdate("Y-m-d H:i:s"), Criteria::GREATER_THAN)
-            ->orderByDbStarts()
-            ->limit(1)
             ->findOne();
         
         $starts = new DateTime($ccShowInstance->getDbStarts(), new DateTimeZone("UTC"));
@@ -455,6 +442,7 @@ class Application_Service_ShowFormService
         return array($starts, $ends);
     }
 
+
     /**
      * 
      * Validates show forms

airtime_mvc/application/views/scripts/billing/invoices.phtml

@@ -4,11 +4,11 @@
 $topTextClass = "";
 if (array_key_exists("planupdated", $_GET))
 {
-    $topText = _("<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle.");
+    $topText = _pro("<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle.");
     $topTextClass = "status-good";
 }
 else {
-    $topText = _("Tip: To pay an invoice, click \"View Invoice\"<br> and look for the \"Checkout\" button.");
+    $topText = _pro("Tip: To pay an invoice, click \"View Invoice\"<br> and look for the \"Checkout\" button.");
 }
     
 ?>

airtime_mvc/application/views/scripts/dashboard/about.phtml

@@ -2,19 +2,25 @@
     <h2><?php echo _("About") ?></h2>
 <p>
 <?php 
-echo sprintf(_("%sAirtime%s %s, the open radio software for scheduling and remote station management. %s"),
+
-    "<a href='http://airtime.sourcefabric.org' target='_blank'>",
+$productSiteAnchor = "<a href='" . PRODUCT_SITE_URL . "' target='_blank'>"
-    "</a>",
+                        . PRODUCT_NAME
-     $this->airtime_version,
+                    . "</a>";
-    "<br />")
+echo sprintf(_('%1$s %2$s, the open radio software for scheduling and remote station management.'),
+    $productSiteAnchor,
+    $this->airtime_version)
 ?>
-<br>© 2013 
+<br />
+<br />© 2013 
 <?php 
-echo sprintf(_("%sSourcefabric%s z.ú Airtime is distributed under the %sGNU GPL v.3%s"),
+$companySiteAnchor = "<a href='" . COMPANY_SITE_URL . "' target='_blank'>"
-    "<a href='http://www.sourcefabric.org' target='_blank'>",
+                        . COMPANY_NAME . " " . COMPANY_SUFFIX
-    "</a>",
+                    . "</a>";
-    "<a href='http://www.gnu.org/licenses/gpl-3.0-standalone.html' target='_blank'>",
+$licenseAnchor = "<a href='" . LICENSE_URL . "' target='_blank'>"
-    "</a>")
+                    . LICENSE_VERSION
+                . "</a>";
+echo sprintf(_('%1$s %2$s is distributed under the %3$s'),
+    $companySiteAnchor, PRODUCT_NAME, $licenseAnchor)
 ?>
 </p>
 </div>

airtime_mvc/application/views/scripts/dashboard/help.phtml

@@ -1,7 +1,7 @@
 <div class="gray-logo"></div>
 <div class="text-content">
-  <h2><?php echo _("Welcome to Airtime!") ?></h2>
+  <h2><?php echo sprintf(_("Welcome to %s!"), PRODUCT_NAME) ?></h2>
-<p><?php echo _("Here's how you can get started using Airtime to automate your broadcasts: ")?></p>
+<p><?php echo sprintf(_("Here's how you can get started using %s to automate your broadcasts: "), PRODUCT_NAME)?></p>
 
 <ol>
     <li><?php echo _("Begin by adding your files to the library using the 'Add Media' menu button. You can drag and drop your files to this window too.")?></li>
@@ -10,8 +10,12 @@
     <li><?php echo _("Select your media from the left pane and drag them to your show in the right pane."); ?></li>
 </ol>
 <p><strong><?php echo _("Then you're good to go!")?></strong><br />
-<?php echo sprintf(_("For more detailed help, read the %suser manual%s."),
+<?php 
-    "<a href='http://www.sourcefabric.org/en/airtime/manuals/' target='_blank'>",
+$userManualAnchorOpen = "<a href='" . USER_MANUAL_URL . "' target='_blank'>";
-    "</a>") ?></p>
+echo sprintf(_("For more detailed help, read the %suser manual%s."),
+    $userManualAnchorOpen, "</a>") 
+
+?>
+</p>
 </div>
 

airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml

@@ -40,9 +40,8 @@
             <?php foreach($watched_dirs as $watched_dir): ?>
                 <dd class="block-display selected-item">
                     <?php echo ($watched_dir->getExistsFlag())?"":"<span class='ui-icon-alert'><img src='/css/images/warning-icon.png'></span>"?><span id="folderPath" style="display:block; width:350px"><?php echo htmlspecialchars($watched_dir->getDirectory());?></span></span>
-                    <span title="<?php echo _("Rescan watched directory (This is useful if it is network mount and may be out of sync with Airtime)")?>" class="ui-icon ui-icon-refresh"></span>
+                    <span title="<?php echo sprintf(_("Rescan watched directory (This is useful if it is network mount and may be out of sync with %s)"), PRODUCT_NAME)?>" class="ui-icon ui-icon-refresh"></span>
                     <span title="<?php echo _("Remove watched directory")?>" class="ui-icon ui-icon-close"></span>
-                    
                 </dd>
             <?php endforeach; ?>
         <?php else: ?>

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 Airtime improve by letting us know how you are using it. This info "
+                    <?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.%s"
+                    .'will be collected regularly in order to enhance your user experience.%2$s'
-                    ."Click 'Yes, help Airtime' and we'll make sure the features you use are "
+                    .'Click \'Yes, help %1$s\' and we\'ll make sure the features you use are '
-                    ."constantly improving."), "<br /><br />") ?>
+                    .'constantly improving.'), PRODUCT_NAME, "<br /><br />") ?>
                 </dt>
                 <dd id="SupportFeedback-element" class="block-display">
                     <label class="optional" for="SupportFeedback">
@@ -22,10 +22,12 @@
                     <?php endif; ?>
                 </dd>
                 <dt class="block-display info-text">
-                    <?php echo sprintf(_("Click the box below to advertise your station on %sSourcefabric.org%s."
+                    <?php 
-                        ." In order to promote your station, 'Send support feedback' must be enabled. This data will be collected in addition to the support feedback."),
+                        $whosUsingAnchor = "<a id='link_to_whos_using' href='" . WHOS_USING_URL . "' onclick='window.open(this.href); return false'>"
-                        "<a id='link_to_whos_using' href='http://sourcefabric.org/en/airtime/whosusing' onclick='window.open(this.href); return false'>",
+                                            . COMPANY_SITE
-                        "</a>")?>
+                                        . "</a>";
+                        echo sprintf(_("Click the box below to promote your station on %s."), $whosUsingAnchor)
+                    ?>
                 </dt>
                 <dd id="publicize-element" class="block-display">
                     <label class="optional" for="Publicise">
@@ -175,7 +177,7 @@
                         <?php echo $this->element->getElement('Privacy')->getLabel() ?>
                     </label>
                 <?php }else{?>
-                    <a id="link_to_terms_and_condition" href="http://www.sourcefabric.org/en/about/policy/" onclick="window.open(this.href); return false;"><?php echo _("Terms and Conditions") ?></a>
+                    <a id="link_to_terms_and_condition" href="<?php echo TERMS_AND_CONDITIONS_URL ?>" onclick="window.open(this.href); return false;"><?php echo _("Terms and Conditions") ?></a>
                 <?php }?>
             </div>
     </form>

airtime_mvc/application/views/scripts/login/index.phtml

@@ -4,7 +4,7 @@
     <div id="login" class="login-content clearfix">
         <?php if(isset($this->demo) && $this->demo == 1){?>
             <p style="font-weight:bold">
-            <?php echo _("Welcome to the Airtime demo! You can log in using the username 'admin' and the password 'admin'.")?>            
+            <?php echo sprintf(_("Welcome to the %s demo! You can log in using the username 'admin' and the password 'admin'."), PRODUCT_NAME)?>            
             </p>
         <?php }?>
         <p class="light" style='<?php echo $this->error?"color:#902d2d;font-size:11px;padding:2px 4px;background:#c6b4b4;margin-bottom:2px;border:1px solid #c83f3f;":""?>'><?php echo $this->message; ?></p>

airtime_mvc/application/views/scripts/partialviews/trialBox.phtml

@@ -6,7 +6,7 @@
            <div class="trial-box-calendar-gray"><?php echo _("days") ?></div>
       </div>
       <div class="trial-box-button">
-            <a title="<?php echo _("Purchase an Airtime Pro plan!")?>" href="/billing/upgrade"><?php echo _("My Account") ?></a>
+            <a title="<?php echo sprintf(_("Purchase an %s Pro plan!"), PRODUCT_NAME)?>" href="/billing/upgrade"><?php echo _("My Account") ?></a>
       </div>
   </div>
 <?php }?> 

airtime_mvc/application/views/scripts/systemstatus/index.phtml

@@ -11,7 +11,7 @@
         <tbody>
             <!--
             <tr class="odd">
-            	<td><?php echo _("Airtime Version") ?></td>
+                <td><?php echo sprintf(_("%s Version"), PRODUCT_NAME) ?></td>
                 <td>1.9.3</td>
                 <td>&nbsp;</td>
             </tr>

airtime_mvc/locale/az/LC_MESSAGES/pro.po

@@ -0,0 +1,7 @@
+#: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
+msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
+msgid "Tip: To pay an invoice, click \"View Invoice\"<br> and look for the \"Checkout\" button."
+msgstr ""

airtime_mvc/locale/cs_CZ/LC_MESSAGES/pro.po

@@ -0,0 +1,7 @@
+#: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
+msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
+msgid "Tip: To pay an invoice, click \"View Invoice\"<br> and look for the \"Checkout\" button."
+msgstr ""

airtime_mvc/locale/de_AT/LC_MESSAGES/pro.po

@@ -0,0 +1,7 @@
+#: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
+msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
+msgid "Tip: To pay an invoice, click \"View Invoice\"<br> and look for the \"Checkout\" button."
+msgstr ""

airtime_mvc/locale/de_DE/LC_MESSAGES/pro.po

@@ -0,0 +1,7 @@
+#: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
+msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
+msgid "Tip: To pay an invoice, click \"View Invoice\"<br> and look for the \"Checkout\" button."
+msgstr ""

airtime_mvc/locale/el_GR/LC_MESSAGES/pro.po

@@ -0,0 +1,7 @@
+#: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
+msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
+msgid "Tip: To pay an invoice, click \"View Invoice\"<br> and look for the \"Checkout\" button."
+msgstr ""

airtime_mvc/locale/en_CA/LC_MESSAGES/pro.po

@@ -0,0 +1,7 @@
+#: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
+msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
+msgid "Tip: To pay an invoice, click \"View Invoice\"<br> and look for the \"Checkout\" button."
+msgstr ""

airtime_mvc/locale/en_GB/LC_MESSAGES/pro.po

@@ -0,0 +1,7 @@
+#: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
+msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
+msgid "Tip: To pay an invoice, click \"View Invoice\"<br> and look for the \"Checkout\" button."
+msgstr ""

airtime_mvc/locale/en_US/LC_MESSAGES/pro.po

@@ -0,0 +1,7 @@
+#: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
+msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
+msgid "Tip: To pay an invoice, click \"View Invoice\"<br> and look for the \"Checkout\" button."
+msgstr ""

airtime_mvc/locale/es_ES/LC_MESSAGES/pro.po

@@ -0,0 +1,7 @@
+#: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
+msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
+msgid "Tip: To pay an invoice, click \"View Invoice\"<br> and look for the \"Checkout\" button."
+msgstr ""

airtime_mvc/locale/fr_FR/LC_MESSAGES/pro.po

@@ -0,0 +1,7 @@
+#: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
+msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
+msgid "Tip: To pay an invoice, click \"View Invoice\"<br> and look for the \"Checkout\" button."
+msgstr ""

airtime_mvc/locale/hr_HR/LC_MESSAGES/pro.po

@@ -0,0 +1,7 @@
+#: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
+msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
+msgid "Tip: To pay an invoice, click \"View Invoice\"<br> and look for the \"Checkout\" button."
+msgstr ""

airtime_mvc/locale/hu_HU/LC_MESSAGES/pro.po

@@ -0,0 +1,7 @@
+#: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
+msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
+msgid "Tip: To pay an invoice, click \"View Invoice\"<br> and look for the \"Checkout\" button."
+msgstr ""

airtime_mvc/locale/hy/LC_MESSAGES/pro.po

@@ -0,0 +1,7 @@
+#: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
+msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
+msgid "Tip: To pay an invoice, click \"View Invoice\"<br> and look for the \"Checkout\" button."
+msgstr ""

airtime_mvc/locale/hy_AM/LC_MESSAGES/pro.po

@@ -0,0 +1,7 @@
+#: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
+msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
+msgid "Tip: To pay an invoice, click \"View Invoice\"<br> and look for the \"Checkout\" button."
+msgstr ""

airtime_mvc/locale/it_IT/LC_MESSAGES/pro.po

@@ -0,0 +1,7 @@
+#: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
+msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
+msgid "Tip: To pay an invoice, click \"View Invoice\"<br> and look for the \"Checkout\" button."
+msgstr ""

airtime_mvc/locale/ja/LC_MESSAGES/pro.po

@@ -0,0 +1,7 @@
+#: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
+msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
+msgid "Tip: To pay an invoice, click \"View Invoice\"<br> and look for the \"Checkout\" button."
+msgstr ""

airtime_mvc/locale/ja_JP/LC_MESSAGES/pro.po

@@ -0,0 +1,7 @@
+#: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
+msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
+msgid "Tip: To pay an invoice, click \"View Invoice\"<br> and look for the \"Checkout\" button."
+msgstr ""

airtime_mvc/locale/ka/LC_MESSAGES/pro.po

@@ -0,0 +1,7 @@
+#: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
+msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
+msgid "Tip: To pay an invoice, click \"View Invoice\"<br> and look for the \"Checkout\" button."
+msgstr ""

airtime_mvc/locale/ko_KR/LC_MESSAGES/pro.po

@@ -0,0 +1,7 @@
+#: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
+msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
+msgid "Tip: To pay an invoice, click \"View Invoice\"<br> and look for the \"Checkout\" button."
+msgstr ""

airtime_mvc/locale/nl_NL/LC_MESSAGES/pro.po

@@ -0,0 +1,7 @@
+#: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
+msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
+msgid "Tip: To pay an invoice, click \"View Invoice\"<br> and look for the \"Checkout\" button."
+msgstr ""

airtime_mvc/locale/pl_PL/LC_MESSAGES/pro.po

@@ -0,0 +1,7 @@
+#: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
+msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
+msgid "Tip: To pay an invoice, click \"View Invoice\"<br> and look for the \"Checkout\" button."
+msgstr ""

airtime_mvc/locale/pt_BR/LC_MESSAGES/pro.po

@@ -0,0 +1,7 @@
+#: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
+msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
+msgid "Tip: To pay an invoice, click \"View Invoice\"<br> and look for the \"Checkout\" button."
+msgstr ""

airtime_mvc/locale/ru_RU/LC_MESSAGES/pro.po

@@ -0,0 +1,7 @@
+#: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
+msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
+msgid "Tip: To pay an invoice, click \"View Invoice\"<br> and look for the \"Checkout\" button."
+msgstr ""

airtime_mvc/locale/si/LC_MESSAGES/pro.po

@@ -0,0 +1,7 @@
+#: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
+msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
+msgid "Tip: To pay an invoice, click \"View Invoice\"<br> and look for the \"Checkout\" button."
+msgstr ""

airtime_mvc/locale/sr_RS/LC_MESSAGES/pro.po

@@ -0,0 +1,7 @@
+#: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
+msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
+msgid "Tip: To pay an invoice, click \"View Invoice\"<br> and look for the \"Checkout\" button."
+msgstr ""