Mass conversion of all files to the newly agreed coding standard: PSR 1/2

Converting Piwik core source files, PHP, JS, TPL, CSS

More info: http://piwik.org/participate/coding-standards/

1 files changed, 20 insertions, 25 deletions

diff --git a/index.php b/index.php
index ce36320bae..09281fd3de 100644
--- a/index.php
+++ b/index.php
@@ -8,24 +8,21 @@
  * @package Piwik
  */
 
-define('PIWIK_DOCUMENT_ROOT', dirname(__FILE__)=='/'?'':dirname(__FILE__));
-if(file_exists(PIWIK_DOCUMENT_ROOT . '/bootstrap.php'))
-{
-	require_once PIWIK_DOCUMENT_ROOT . '/bootstrap.php';
+define('PIWIK_DOCUMENT_ROOT', dirname(__FILE__) == '/' ? '' : dirname(__FILE__));
+if (file_exists(PIWIK_DOCUMENT_ROOT . '/bootstrap.php')) {
+    require_once PIWIK_DOCUMENT_ROOT . '/bootstrap.php';
 }
 
-error_reporting(E_ALL|E_NOTICE);
-@ini_set('display_errors', defined('PIWIK_DISPLAY_ERRORS') ? PIWIK_DISPLAY_ERRORS : @ini_get('display_errors')); 
+error_reporting(E_ALL | E_NOTICE);
+@ini_set('display_errors', defined('PIWIK_DISPLAY_ERRORS') ? PIWIK_DISPLAY_ERRORS : @ini_get('display_errors'));
 @ini_set('xdebug.show_exception_trace', 0);
 @ini_set('magic_quotes_runtime', 0);
 
-if(!defined('PIWIK_USER_PATH'))
-{
-	define('PIWIK_USER_PATH', PIWIK_DOCUMENT_ROOT);
+if (!defined('PIWIK_USER_PATH')) {
+    define('PIWIK_USER_PATH', PIWIK_DOCUMENT_ROOT);
 }
-if(!defined('PIWIK_INCLUDE_PATH'))
-{
-	define('PIWIK_INCLUDE_PATH', PIWIK_DOCUMENT_ROOT);
+if (!defined('PIWIK_INCLUDE_PATH')) {
+    define('PIWIK_INCLUDE_PATH', PIWIK_DOCUMENT_ROOT);
 }
 
 require_once PIWIK_INCLUDE_PATH . '/libs/upgradephp/upgrade.php';
@@ -35,19 +32,17 @@ require_once PIWIK_INCLUDE_PATH . '/core/testMinimumPhpVersion.php';
 
 session_cache_limiter('nocache');
 @date_default_timezone_set('UTC');
-require_once PIWIK_INCLUDE_PATH .'/core/Loader.php';
-
-if(!defined('PIWIK_ENABLE_ERROR_HANDLER') || PIWIK_ENABLE_ERROR_HANDLER)
-{
-	require_once PIWIK_INCLUDE_PATH .'/core/ErrorHandler.php';
-	require_once PIWIK_INCLUDE_PATH .'/core/ExceptionHandler.php';
-	set_error_handler('Piwik_ErrorHandler');
-	set_exception_handler('Piwik_ExceptionHandler');
+require_once PIWIK_INCLUDE_PATH . '/core/Loader.php';
+
+if (!defined('PIWIK_ENABLE_ERROR_HANDLER') || PIWIK_ENABLE_ERROR_HANDLER) {
+    require_once PIWIK_INCLUDE_PATH . '/core/ErrorHandler.php';
+    require_once PIWIK_INCLUDE_PATH . '/core/ExceptionHandler.php';
+    set_error_handler('Piwik_ErrorHandler');
+    set_exception_handler('Piwik_ExceptionHandler');
 }
 
-if(!defined('PIWIK_ENABLE_DISPATCH') || PIWIK_ENABLE_DISPATCH)
-{
-	$controller = Piwik_FrontController::getInstance();
-	$controller->init();
-	$controller->dispatch();
+if (!defined('PIWIK_ENABLE_DISPATCH') || PIWIK_ENABLE_DISPATCH) {
+    $controller = Piwik_FrontController::getInstance();
+    $controller->init();
+    $controller->dispatch();
 }