From 82945038d5997a7719f2a994b888b7d808f0da3c Mon Sep 17 00:00:00 2001
From: Naomi <naomiaro@gmail.com>
Date: Fri, 10 May 2013 17:44:50 -0400
Subject: [PATCH] CRLF fix

---
 airtime_mvc/application/models/Schedule.php   | 38 +++++++++----------
 .../application/models/StreamSetting.php      |  2 +-
 airtime_mvc/application/models/Subjects.php   |  6 +--
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/airtime_mvc/application/models/Schedule.php b/airtime_mvc/application/models/Schedule.php
index cd99230b9..9a1572b6c 100644
--- a/airtime_mvc/application/models/Schedule.php
+++ b/airtime_mvc/application/models/Schedule.php
@@ -340,9 +340,9 @@ SQL;
         $map = array(
         	":fj_ts_1" => $p_track_start,
         	":fj_ts_2" => $p_track_end,
-        	":fj_ts_3" => $p_track_start,
+        	":fj_ts_3" => $p_track_start,
         	":fj_ts_4" => $p_track_end,
-        	":fj_ts_5" => $p_track_start,
+        	":fj_ts_5" => $p_track_start,
         	":fj_ts_6" => $p_track_end,
         );
         $paramMap = $paramMap + $map;
@@ -375,14 +375,14 @@ SQL;
       )
       LEFT JOIN cc_subjs AS sub ON (ws.creator_id = sub.id)
 SQL;
-        $map = array(
-        	":sj_ts_1" => $p_track_start,
-        	":sj_ts_2" => $p_track_end,
-        	":sj_ts_3" => $p_track_start,
-        	":sj_ts_4" => $p_track_end,
-        	":sj_ts_5" => $p_track_start,
-        	":sj_ts_6" => $p_track_end,
-        );
+        $map = array(
+        	":sj_ts_1" => $p_track_start,
+        	":sj_ts_2" => $p_track_end,
+        	":sj_ts_3" => $p_track_start,
+        	":sj_ts_4" => $p_track_end,
+        	":sj_ts_5" => $p_track_start,
+        	":sj_ts_6" => $p_track_end,
+        );
         $paramMap = $paramMap + $map;
 
         $streamSql = str_replace("%%columns%%",
@@ -441,14 +441,14 @@ ORDER BY si_starts,
          sched_starts;
 SQL;
 
-        $map = array(
-        	":ts_1" => $p_track_start,
-        	":ts_2" => $p_track_end,
-        	":ts_3" => $p_track_start,
-        	":ts_4" => $p_track_end,
-        	":ts_5" => $p_track_start,
-        	":ts_6" => $p_track_end,
-        );
+        $map = array(
+        	":ts_1" => $p_track_start,
+        	":ts_2" => $p_track_end,
+        	":ts_3" => $p_track_start,
+        	":ts_4" => $p_track_end,
+        	":ts_5" => $p_track_start,
+        	":ts_6" => $p_track_end,
+        );
         $paramMap = $paramMap + $map;
         
         $rows = Application_Common_Database::prepareAndExecute(
@@ -505,7 +505,7 @@ SQL;
 
         $res = Application_Common_Database::prepareAndExecute($sql, array(), 
         		Application_Common_Database::COLUMN);
-        
+        
         return $res;
     }
 
diff --git a/airtime_mvc/application/models/StreamSetting.php b/airtime_mvc/application/models/StreamSetting.php
index 3342122d4..c34c09a2e 100644
--- a/airtime_mvc/application/models/StreamSetting.php
+++ b/airtime_mvc/application/models/StreamSetting.php
@@ -73,7 +73,7 @@ class Application_Model_StreamSetting
                 ."AND value='true'";
 
         $ids = array();
-        
+        
         $rows = Application_Common_Database::prepareAndExecute($sql, array(), 'all');
 
         foreach ($rows as $row) {
diff --git a/airtime_mvc/application/models/Subjects.php b/airtime_mvc/application/models/Subjects.php
index 4eb39a949..cdd233fe0 100644
--- a/airtime_mvc/application/models/Subjects.php
+++ b/airtime_mvc/application/models/Subjects.php
@@ -46,9 +46,9 @@ class Application_Model_Subjects
     public static function getLoginAttempts($login)
     {
         $sql = "SELECT login_attempts FROM cc_subjs WHERE login=:login";
-        $map = array(":login" => $login);
-        
-        $res = Application_Common_Database::prepareAndExecute($sql, $map,
+        $map = array(":login" => $login);
+        
+        $res = Application_Common_Database::prepareAndExecute($sql, $map,
         		Application_Common_Database::COLUMN);
 
         return ($res !== false) ? $res : 0;