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

Changed tabs to spaces

This commit is contained in:
Duncan Sommerville 2014-11-04 11:07:24 -05:00
parent 3024daba0e
commit e8950c8815
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/application/controllers/ApiController.php
View File

@ -423,7 +423,7 @@ class ApiController extends Zend_Controller_Action
* variables in the result to reflect the given timezone. * variables in the result to reflect the given timezone.
* *
* @param object $result reference to the object to send back to the user * @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 * @param boolean $upcase whether the timezone output should be upcased
*/ */
private function applyLiveTimezoneAdjustments(&$result, $timezone, $upcase) private function applyLiveTimezoneAdjustments(&$result, $timezone, $upcase)

18
airtime_mvc/public/index.php
View File

@ -5,23 +5,21 @@
// but the default installation configs are likely to be installed by // but the default installation configs are likely to be installed by
// amature users on the setup that does not have https. Forcing // amature users on the setup that does not have https. Forcing
// cookie_secure on non https would result in confusing login problems. // cookie_secure on non https would result in confusing login problems.
if(!empty($_SERVER['HTTPS'])){ if(!empty($_SERVER['HTTPS'])) {
ini_set('session.cookie_secure', '1'); ini_set('session.cookie_secure', '1');
} }
ini_set('session.cookie_httponly', '1'); ini_set('session.cookie_httponly', '1');
error_reporting(E_ALL|E_STRICT); error_reporting(E_ALL|E_STRICT);
function exception_error_handler($errno, $errstr, $errfile, $errline) function exception_error_handler($errno, $errstr, $errfile, $errline) {
{ //Check if the statement that threw this error wanted its errors to be
//Check if the statement that threw this error wanted its errors to be
//suppressed. If so then return without with throwing exception. //suppressed. If so then return without with throwing exception.
if (0 === error_reporting()) { if (0 === error_reporting()) return;
return;
}
throw new ErrorException($errstr, $errno, 0, $errfile, $errline); throw new ErrorException($errstr, $errno, 0, $errfile, $errline);
return false; return false;
} }
set_error_handler("exception_error_handler"); set_error_handler("exception_error_handler");
// Define path to application directory // Define path to application directory
@ -57,8 +55,8 @@ if (file_exists('/usr/share/php/libzend-framework-php')) {
/** Zend_Application */ /** Zend_Application */
require_once 'Zend/Application.php'; require_once 'Zend/Application.php';
$application = new Zend_Application( $application = new Zend_Application(
APPLICATION_ENV, APPLICATION_ENV,
APPLICATION_PATH . '/configs/application.ini' APPLICATION_PATH . '/configs/application.ini'
); );
require_once (APPLICATION_PATH."/logging/Logging.php"); require_once (APPLICATION_PATH."/logging/Logging.php");