Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CRLF fix

This commit is contained in:
Naomi 2013-05-10 17:44:50 -04:00
parent da46757e28
commit 82945038d5
3 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
airtime_mvc/application/models/Schedule.php
View File

@ -340,9 +340,9 @@ SQL;
$map = array( $map = array(
":fj_ts_1" => $p_track_start, ":fj_ts_1" => $p_track_start,
":fj_ts_2" => $p_track_end, ":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_4" => $p_track_end,
":fj_ts_5" => $p_track_start, ":fj_ts_5" => $p_track_start,
":fj_ts_6" => $p_track_end, ":fj_ts_6" => $p_track_end,
); );
$paramMap = $paramMap + $map; $paramMap = $paramMap + $map;
@ -375,14 +375,14 @@ SQL;
) )
LEFT JOIN cc_subjs AS sub ON (ws.creator_id = sub.id) LEFT JOIN cc_subjs AS sub ON (ws.creator_id = sub.id)
SQL; SQL;
$map = array( $map = array(
":sj_ts_1" => $p_track_start, ":sj_ts_1" => $p_track_start,
":sj_ts_2" => $p_track_end, ":sj_ts_2" => $p_track_end,
":sj_ts_3" => $p_track_start, ":sj_ts_3" => $p_track_start,
":sj_ts_4" => $p_track_end, ":sj_ts_4" => $p_track_end,
":sj_ts_5" => $p_track_start, ":sj_ts_5" => $p_track_start,
":sj_ts_6" => $p_track_end, ":sj_ts_6" => $p_track_end,
); );
$paramMap = $paramMap + $map; $paramMap = $paramMap + $map;
$streamSql = str_replace("%%columns%%", $streamSql = str_replace("%%columns%%",
@ -441,14 +441,14 @@ ORDER BY si_starts,
sched_starts; sched_starts;
SQL; SQL;
$map = array( $map = array(
":ts_1" => $p_track_start, ":ts_1" => $p_track_start,
":ts_2" => $p_track_end, ":ts_2" => $p_track_end,
":ts_3" => $p_track_start, ":ts_3" => $p_track_start,
":ts_4" => $p_track_end, ":ts_4" => $p_track_end,
":ts_5" => $p_track_start, ":ts_5" => $p_track_start,
":ts_6" => $p_track_end, ":ts_6" => $p_track_end,
); );
$paramMap = $paramMap + $map; $paramMap = $paramMap + $map;
$rows = Application_Common_Database::prepareAndExecute( $rows = Application_Common_Database::prepareAndExecute(
@ -505,7 +505,7 @@ SQL;
$res = Application_Common_Database::prepareAndExecute($sql, array(), $res = Application_Common_Database::prepareAndExecute($sql, array(),
Application_Common_Database::COLUMN); Application_Common_Database::COLUMN);
return $res; return $res;
} }

2
airtime_mvc/application/models/StreamSetting.php
View File

@ -73,7 +73,7 @@ class Application_Model_StreamSetting
."AND value='true'"; ."AND value='true'";
$ids = array(); $ids = array();
$rows = Application_Common_Database::prepareAndExecute($sql, array(), 'all'); $rows = Application_Common_Database::prepareAndExecute($sql, array(), 'all');
foreach ($rows as $row) { foreach ($rows as $row) {

6
airtime_mvc/application/models/Subjects.php
View File

@ -46,9 +46,9 @@ class Application_Model_Subjects
public static function getLoginAttempts($login) public static function getLoginAttempts($login)
{ {
$sql = "SELECT login_attempts FROM cc_subjs WHERE login=:login"; $sql = "SELECT login_attempts FROM cc_subjs WHERE login=:login";
$map = array(":login" => $login); $map = array(":login" => $login);
$res = Application_Common_Database::prepareAndExecute($sql, $map, $res = Application_Common_Database::prepareAndExecute($sql, $map,
Application_Common_Database::COLUMN); Application_Common_Database::COLUMN);
return ($res !== false) ? $res : 0; return ($res !== false) ? $res : 0;