From 6da9b6bf42cb73a558180d710ebf57b61cca3a65 Mon Sep 17 00:00:00 2001
From: Jamie Connor <jamieconnor@gmail.com>
Date: Sat, 7 Sep 2013 14:52:45 +1200
Subject: [PATCH] Removed repeated code
---
.../application/controllers/ApiController.php | 61 ++++++++-----------
1 file changed, 25 insertions(+), 36 deletions(-)
diff --git a/airtime_mvc/application/controllers/ApiController.php b/airtime_mvc/application/controllers/ApiController.php
index c3a3c14f0..a44926146 100644
--- a/airtime_mvc/application/controllers/ApiController.php
+++ b/airtime_mvc/application/controllers/ApiController.php
@@ -315,44 +315,33 @@ class ApiController extends Zend_Controller_Action
$result = array();
- if(isset($_GET['number_of_days'])){ //allows for schedule to be returned for multiple days
- for ($i=0; $i<$number_of_days; $i++) {
- $utcDayEnd = Application_Common_DateHelper::GetDayEndTimestamp($utcDayStart);
- $shows = Application_Model_Show::getNextShows($utcDayStart, "ALL", $utcDayEnd);
- $utcDayStart = $utcDayEnd;
-
- Application_Model_Show::convertToLocalTimeZone($shows,
- array("starts", "ends", "start_timestamp",
- "end_timestamp"));
-
- $result[$i] = $shows;
- }
- // XSS exploit prevention
- for ($i=0; $i<$number_of_days; $i++) {
- foreach ($result[$i] as &$show) {
- $show["name"] = htmlspecialchars($show["name"]);
- $show["url"] = htmlspecialchars($show["url"]);
- }
- }
- }else{
- for ($i=0; $i<7; $i++) {
- $utcDayEnd = Application_Common_DateHelper::GetDayEndTimestamp($utcDayStart);
- $shows = Application_Model_Show::getNextShows($utcDayStart, "ALL", $utcDayEnd);
- $utcDayStart = $utcDayEnd;
-
- Application_Model_Show::convertToLocalTimeZone($shows,
- array("starts", "ends", "start_timestamp",
- "end_timestamp"));
+ $request = $this->getRequest();
+ $days = $request->getParam('days');
+ if (empty($days)) {$days = 7;}
+
+ for ($i=0; $i<$days; $i++) {
+ $utcDayEnd = Application_Common_DateHelper::GetDayEndTimestamp($utcDayStart);
+ $shows = Application_Model_Show::getNextShows($utcDayStart, "ALL", $utcDayEnd);
+ $utcDayStart = $utcDayEnd;
+ Application_Model_Show::convertToLocalTimeZone($shows,
+ array("starts", "ends", "start_timestamp",
+ "end_timestamp"));
+
+ if ($days==7) { //return with day of week index - standard
$result[$dow[$i]] = $shows;
- }
- // XSS exploit prevention
- foreach ($dow as $d) {
- foreach ($result[$d] as &$show) {
- $show["name"] = htmlspecialchars($show["name"]);
- $show["url"] = htmlspecialchars($show["url"]);
- }
- }
+ }
+ else{ //return with number index - days has been specified
+ $result[$i] = $shows;
+ }
+
+ }
+ // XSS exploit prevention
+ for ($i=0; $i<$days; $i++) {
+ foreach ($result[$i] as &$show) {
+ $show["name"] = htmlspecialchars($show["name"]);
+ $show["url"] = htmlspecialchars($show["url"]);
+ }
}