From 58957cc919d04bf73664758970a48d01b7f89aa5 Mon Sep 17 00:00:00 2001
From: Naomi <naomiaro@gmail.com>
Date: Mon, 29 Apr 2013 17:01:08 -0400
Subject: [PATCH] CC-2301 : running dos2unix on 3 files.

---
 .../application/forms/GeneralPreferences.php  | 34 +++++------
 airtime_mvc/application/models/Block.php      |  8 +--
 airtime_mvc/application/models/Preference.php | 60 +++++++++----------
 3 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/airtime_mvc/application/forms/GeneralPreferences.php b/airtime_mvc/application/forms/GeneralPreferences.php
index 6e02a3200..f73320e28 100644
--- a/airtime_mvc/application/forms/GeneralPreferences.php
+++ b/airtime_mvc/application/forms/GeneralPreferences.php
@@ -46,23 +46,23 @@ class Application_Form_GeneralPreferences extends Zend_Form_SubForm
             )
         ));
         
-        //Default station fade out
-        $this->addElement('text', 'stationDefaultFadeOut', array(
-        		'class'      => 'input_text',
-        		'label'      => _('Default Fade Out (s):'),
-        		'required'   => true,
-        		'filters'    => array('StringTrim'),
-        		'validators' => array(
-        				array(
-        						$rangeValidator,
-        						$notEmptyValidator,
-        						'regex', false, array('/^[0-9]{1,2}(\.\d{1})?$/', 'messages' => _('enter a time in seconds 0{.0}'))
-        				)
-        		),
-        		'value' => $defaultFadeOut,
-        		'decorators' => array(
-        				'ViewHelper'
-        		)
+        //Default station fade out
+        $this->addElement('text', 'stationDefaultFadeOut', array(
+        		'class'      => 'input_text',
+        		'label'      => _('Default Fade Out (s):'),
+        		'required'   => true,
+        		'filters'    => array('StringTrim'),
+        		'validators' => array(
+        				array(
+        						$rangeValidator,
+        						$notEmptyValidator,
+        						'regex', false, array('/^[0-9]{1,2}(\.\d{1})?$/', 'messages' => _('enter a time in seconds 0{.0}'))
+        				)
+        		),
+        		'value' => $defaultFadeOut,
+        		'decorators' => array(
+        				'ViewHelper'
+        		)
         ));
 
         $third_party_api = new Zend_Form_Element_Radio('thirdPartyApi');
diff --git a/airtime_mvc/application/models/Block.php b/airtime_mvc/application/models/Block.php
index e8db4ee12..b15f0d633 100644
--- a/airtime_mvc/application/models/Block.php
+++ b/airtime_mvc/application/models/Block.php
@@ -99,7 +99,7 @@ class Application_Model_Block implements Application_Model_LibraryEditable
             $this->block->save();
         }
 
-        $this->blockItem["fadein"] = Application_Model_Preference::GetDefaultFadeIn();
+        $this->blockItem["fadein"] = Application_Model_Preference::GetDefaultFadeIn();
         $this->blockItem["fadeout"] = Application_Model_Preference::GetDefaultFadeOut();
 
         $this->con = isset($con) ? $con : Propel::getConnection(CcBlockPeer::DATABASE_NAME);
@@ -230,9 +230,9 @@ SQL;
 
             $clipSec = Application_Common_DateHelper::playlistTimeToSeconds($row['length']);
             
-            $row['trackSec'] = $clipSec;
-            
-            $row['cueInSec'] = Application_Common_DateHelper::playlistTimeToSeconds($row['cuein']);
+            $row['trackSec'] = $clipSec;
+            
+            $row['cueInSec'] = Application_Common_DateHelper::playlistTimeToSeconds($row['cuein']);
             $row['cueOutSec'] = Application_Common_DateHelper::playlistTimeToSeconds($row['cueout']);
             
             $offset += $clipSec;
diff --git a/airtime_mvc/application/models/Preference.php b/airtime_mvc/application/models/Preference.php
index dbb3146dd..2e0096a49 100644
--- a/airtime_mvc/application/models/Preference.php
+++ b/airtime_mvc/application/models/Preference.php
@@ -195,38 +195,38 @@ class Application_Model_Preference
         }
     }
     
-    public static function SetDefaultFadeIn($fade)
-    {
-    	self::setValue("default_fade_in", $fade);
-    }
-    
-    public static function GetDefaultFadeIn()
-    {
-    	$fade = self::getValue("default_fade_in");
-    
-    	if ($fade === "") {
-    		// the default value of the fade is 00.5
-    		return "00.5";
-    	}
-    
-    	return $fade;
+    public static function SetDefaultFadeIn($fade)
+    {
+    	self::setValue("default_fade_in", $fade);
     }
     
-    public static function SetDefaultFadeOut($fade)
-    {
-    	self::setValue("default_fade_out", $fade);
-    }
-    
-    public static function GetDefaultFadeOut()
-    {
-    	$fade = self::getValue("default_fade_out");
-    
-    	if ($fade === "") {
-    		// the default value of the fade is 00.5
-    		return "00.5";
-    	}
-    
-    	return $fade;
+    public static function GetDefaultFadeIn()
+    {
+    	$fade = self::getValue("default_fade_in");
+    
+    	if ($fade === "") {
+    		// the default value of the fade is 00.5
+    		return "00.5";
+    	}
+    
+    	return $fade;
+    }
+    
+    public static function SetDefaultFadeOut($fade)
+    {
+    	self::setValue("default_fade_out", $fade);
+    }
+    
+    public static function GetDefaultFadeOut()
+    {
+    	$fade = self::getValue("default_fade_out");
+    
+    	if ($fade === "") {
+    		// the default value of the fade is 00.5
+    		return "00.5";
+    	}
+    
+    	return $fade;
     }
 
     public static function SetDefaultFade($fade)