From e8950c88159df1a2452f0d688fa1fd4a0003e56b Mon Sep 17 00:00:00 2001 From: Duncan Sommerville Date: Tue, 4 Nov 2014 11:07:24 -0500 Subject: [PATCH] Changed tabs to spaces --- .../application/controllers/ApiController.php | 2 +- airtime_mvc/public/index.php | 18 ++++++++---------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/airtime_mvc/application/controllers/ApiController.php b/airtime_mvc/application/controllers/ApiController.php index 4001f7d50..9e4d4fdef 100644 --- a/airtime_mvc/application/controllers/ApiController.php +++ b/airtime_mvc/application/controllers/ApiController.php @@ -423,7 +423,7 @@ class ApiController extends Zend_Controller_Action * variables in the result to reflect the given timezone. * * @param object $result reference to the object to send back to the user - * @param string $timezone the user's timezone parameter value + * @param string $timezone the user's timezone parameter value * @param boolean $upcase whether the timezone output should be upcased */ private function applyLiveTimezoneAdjustments(&$result, $timezone, $upcase) diff --git a/airtime_mvc/public/index.php b/airtime_mvc/public/index.php index 5fcfa36d7..abfcd36dd 100644 --- a/airtime_mvc/public/index.php +++ b/airtime_mvc/public/index.php @@ -5,23 +5,21 @@ // but the default installation configs are likely to be installed by // amature users on the setup that does not have https. Forcing // cookie_secure on non https would result in confusing login problems. -if(!empty($_SERVER['HTTPS'])){ - ini_set('session.cookie_secure', '1'); +if(!empty($_SERVER['HTTPS'])) { + ini_set('session.cookie_secure', '1'); } ini_set('session.cookie_httponly', '1'); error_reporting(E_ALL|E_STRICT); -function exception_error_handler($errno, $errstr, $errfile, $errline) -{ - //Check if the statement that threw this error wanted its errors to be +function exception_error_handler($errno, $errstr, $errfile, $errline) { + //Check if the statement that threw this error wanted its errors to be //suppressed. If so then return without with throwing exception. - if (0 === error_reporting()) { - return; - } + if (0 === error_reporting()) return; throw new ErrorException($errstr, $errno, 0, $errfile, $errline); return false; } + set_error_handler("exception_error_handler"); // Define path to application directory @@ -57,8 +55,8 @@ if (file_exists('/usr/share/php/libzend-framework-php')) { /** Zend_Application */ require_once 'Zend/Application.php'; $application = new Zend_Application( - APPLICATION_ENV, - APPLICATION_PATH . '/configs/application.ini' + APPLICATION_ENV, + APPLICATION_PATH . '/configs/application.ini' ); require_once (APPLICATION_PATH."/logging/Logging.php");