From 4ea3d8612147d1367c8b5f6e3bfda91fd8bf73d2 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Fri, 14 Sep 2012 16:58:42 -0400 Subject: [PATCH 1/6] remove unnecessary logging --- airtime_mvc/application/Bootstrap.php | 1 - 1 file changed, 1 deletion(-) diff --git a/airtime_mvc/application/Bootstrap.php b/airtime_mvc/application/Bootstrap.php index 8e8a64e28..c4c53ffa5 100644 --- a/airtime_mvc/application/Bootstrap.php +++ b/airtime_mvc/application/Bootstrap.php @@ -18,7 +18,6 @@ date_default_timezone_set('UTC'); require_once (APPLICATION_PATH."/logging/Logging.php"); Logging::setLogPath('/var/log/airtime/zendphp.log'); -Logging::info(Application_Model_Preference::GetTimezone()); date_default_timezone_set(Application_Model_Preference::GetTimezone()); global $CC_CONFIG; From 81dadb7f850eaae39903517038e6d929c27b5fab Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Fri, 14 Sep 2012 17:01:35 -0400 Subject: [PATCH 2/6] Removed annoying logging --- airtime_mvc/application/controllers/WebstreamController.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/airtime_mvc/application/controllers/WebstreamController.php b/airtime_mvc/application/controllers/WebstreamController.php index 9cea83a5e..67176a46b 100644 --- a/airtime_mvc/application/controllers/WebstreamController.php +++ b/airtime_mvc/application/controllers/WebstreamController.php @@ -19,7 +19,6 @@ class WebstreamController extends Zend_Controller_Action if (!$this->isAuthorized(-1)) { // TODO: this header call does not actually print any error message header("Status: 401 Not Authorized"); - Logging::info("Ain't not Authorized"); return; } @@ -112,8 +111,6 @@ class WebstreamController extends Zend_Controller_Action host/dj, that he has the correct permission.*/ $user = Application_Model_User::getCurrentUser(); //only allow when webstream belongs to the DJ - Logging::info("Webstream id:".$webstream->getDbCreatorId()); - Logging::info("User id:".$user->getId()); return $webstream->getDbCreatorId() == $user->getId(); } /*we are creating a new stream. Don't need to check whether the From f2b07e4a8323bcb31af90f0c87c8cc9a4404f6b8 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Fri, 14 Sep 2012 17:02:38 -0400 Subject: [PATCH 3/6] alignment --- .../application/controllers/WebstreamController.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/airtime_mvc/application/controllers/WebstreamController.php b/airtime_mvc/application/controllers/WebstreamController.php index 67176a46b..070063980 100644 --- a/airtime_mvc/application/controllers/WebstreamController.php +++ b/airtime_mvc/application/controllers/WebstreamController.php @@ -129,16 +129,15 @@ class WebstreamController extends Zend_Controller_Action $id = $request->getParam("id"); - $parameters = array(); - $parameters['id'] = trim($request->getParam("id")); - $parameters['length'] = trim($request->getParam("length")); - $parameters['name'] = trim($request->getParam("name")); + $parameters = array(); + $parameters['id'] = trim($request->getParam("id")); + $parameters['length'] = trim($request->getParam("length")); + $parameters['name'] = trim($request->getParam("name")); $parameters['description'] = trim($request->getParam("description")); - $parameters['url'] = trim($request->getParam("url")); + $parameters['url'] = trim($request->getParam("url")); if (!$this->isAuthorized($id)) { header("Status: 401 Not Authorized"); - return; } From 7b1b271a2c5458417d6ff61ded053d3172c02fac Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Fri, 14 Sep 2012 17:09:05 -0400 Subject: [PATCH 4/6] Reformatted sql to use heredocs --- airtime_mvc/application/models/User.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/airtime_mvc/application/models/User.php b/airtime_mvc/application/models/User.php index 9fcf9f62c..d07552472 100644 --- a/airtime_mvc/application/models/User.php +++ b/airtime_mvc/application/models/User.php @@ -335,11 +335,14 @@ class Application_Model_User public static function getUserData($id) { - $sql = "SELECT login, first_name, last_name, type, id, email, cell_phone, skype_contact, jabber_contact" - ." FROM cc_subjs" - ." WHERE id = :id"; - - return Application_Common_Database::prepareAndExecute($sql, array(":id" => $id), 'single'); + $sql = << $id), 'single'); } public static function getCurrentUser() From 092595eb9fba73807224b77b323ce5565973538a Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Fri, 14 Sep 2012 17:10:10 -0400 Subject: [PATCH 5/6] Removed profane logging message --- airtime_mvc/application/controllers/WebstreamController.php | 1 - 1 file changed, 1 deletion(-) diff --git a/airtime_mvc/application/controllers/WebstreamController.php b/airtime_mvc/application/controllers/WebstreamController.php index 070063980..7081fad80 100644 --- a/airtime_mvc/application/controllers/WebstreamController.php +++ b/airtime_mvc/application/controllers/WebstreamController.php @@ -119,7 +119,6 @@ class WebstreamController extends Zend_Controller_Action } else { Logging::info( $user ); } - Logging::info("what the fuck"); return false; } From 2faf299c730177957744423283bf75cff18f977f Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Fri, 14 Sep 2012 17:28:50 -0400 Subject: [PATCH 6/6] Removed code duplication --- .../application/controllers/WebstreamController.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/airtime_mvc/application/controllers/WebstreamController.php b/airtime_mvc/application/controllers/WebstreamController.php index 7081fad80..e9e93fe44 100644 --- a/airtime_mvc/application/controllers/WebstreamController.php +++ b/airtime_mvc/application/controllers/WebstreamController.php @@ -128,12 +128,10 @@ class WebstreamController extends Zend_Controller_Action $id = $request->getParam("id"); - $parameters = array(); - $parameters['id'] = trim($request->getParam("id")); - $parameters['length'] = trim($request->getParam("length")); - $parameters['name'] = trim($request->getParam("name")); - $parameters['description'] = trim($request->getParam("description")); - $parameters['url'] = trim($request->getParam("url")); + $parameters = array(); + foreach (array('id','length','name','description','url') as $p) { + $parameters[$p] = trim($request->getParam($p)); + } if (!$this->isAuthorized($id)) { header("Status: 401 Not Authorized");