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, 52 insertions, 59 deletions

diff --git a/piwik.php b/piwik.php
index 14e5e5d518..6633313410 100644
--- a/piwik.php
+++ b/piwik.php
@@ -11,81 +11,74 @@ $GLOBALS['PIWIK_TRACKER_DEBUG'] = false;
 $GLOBALS['PIWIK_TRACKER_DEBUG_FORCE_SCHEDULED_TASKS'] = false;
 define('PIWIK_ENABLE_TRACKING', true);
 
-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';
 }
 
 $GLOBALS['PIWIK_TRACKER_MODE'] = true;
-error_reporting(E_ALL|E_NOTICE);
+error_reporting(E_ALL | E_NOTICE);
 @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);
 }
 
 @ignore_user_abort(true);
 
-require_once PIWIK_INCLUDE_PATH .'/libs/upgradephp/upgrade.php';
-require_once PIWIK_INCLUDE_PATH .'/libs/Event/Dispatcher.php';
-require_once PIWIK_INCLUDE_PATH .'/libs/Event/Notification.php';
-require_once PIWIK_INCLUDE_PATH .'/core/PluginsManager.php';
-require_once PIWIK_INCLUDE_PATH .'/core/Plugin.php';
-require_once PIWIK_INCLUDE_PATH .'/core/Common.php';
-require_once PIWIK_INCLUDE_PATH .'/core/IP.php';
-require_once PIWIK_INCLUDE_PATH .'/core/Tracker.php';
-require_once PIWIK_INCLUDE_PATH .'/core/Config.php';
-require_once PIWIK_INCLUDE_PATH .'/core/Translate.php';
-require_once PIWIK_INCLUDE_PATH .'/core/Tracker/Cache.php';
-require_once PIWIK_INCLUDE_PATH .'/core/Tracker/Db.php';
-require_once PIWIK_INCLUDE_PATH .'/core/Tracker/Db/Exception.php';
-require_once PIWIK_INCLUDE_PATH .'/core/Tracker/IgnoreCookie.php';
-require_once PIWIK_INCLUDE_PATH .'/core/Tracker/Visit.php';
-require_once PIWIK_INCLUDE_PATH .'/core/Tracker/GoalManager.php';
-require_once PIWIK_INCLUDE_PATH .'/core/Tracker/Action.php';
-require_once PIWIK_INCLUDE_PATH .'/core/CacheFile.php';
-require_once PIWIK_INCLUDE_PATH .'/core/Cookie.php';
+require_once PIWIK_INCLUDE_PATH . '/libs/upgradephp/upgrade.php';
+require_once PIWIK_INCLUDE_PATH . '/libs/Event/Dispatcher.php';
+require_once PIWIK_INCLUDE_PATH . '/libs/Event/Notification.php';
+require_once PIWIK_INCLUDE_PATH . '/core/PluginsManager.php';
+require_once PIWIK_INCLUDE_PATH . '/core/Plugin.php';
+require_once PIWIK_INCLUDE_PATH . '/core/Common.php';
+require_once PIWIK_INCLUDE_PATH . '/core/IP.php';
+require_once PIWIK_INCLUDE_PATH . '/core/Tracker.php';
+require_once PIWIK_INCLUDE_PATH . '/core/Config.php';
+require_once PIWIK_INCLUDE_PATH . '/core/Translate.php';
+require_once PIWIK_INCLUDE_PATH . '/core/Tracker/Cache.php';
+require_once PIWIK_INCLUDE_PATH . '/core/Tracker/Db.php';
+require_once PIWIK_INCLUDE_PATH . '/core/Tracker/Db/Exception.php';
+require_once PIWIK_INCLUDE_PATH . '/core/Tracker/IgnoreCookie.php';
+require_once PIWIK_INCLUDE_PATH . '/core/Tracker/Visit.php';
+require_once PIWIK_INCLUDE_PATH . '/core/Tracker/GoalManager.php';
+require_once PIWIK_INCLUDE_PATH . '/core/Tracker/Action.php';
+require_once PIWIK_INCLUDE_PATH . '/core/CacheFile.php';
+require_once PIWIK_INCLUDE_PATH . '/core/Cookie.php';
 
 session_cache_limiter('nocache');
 @date_default_timezone_set('UTC');
 
-if(!defined('PIWIK_ENABLE_TRACKING') || PIWIK_ENABLE_TRACKING)
-{
-	ob_start();
+if (!defined('PIWIK_ENABLE_TRACKING') || PIWIK_ENABLE_TRACKING) {
+    ob_start();
 }
-if($GLOBALS['PIWIK_TRACKER_DEBUG'] === true)
-{	
-	require_once PIWIK_INCLUDE_PATH .'/core/Loader.php';
-	require_once PIWIK_INCLUDE_PATH .'/core/ErrorHandler.php';
-	require_once PIWIK_INCLUDE_PATH .'/core/ExceptionHandler.php';
-	$timer = new Piwik_Timer();
-	set_error_handler('Piwik_ErrorHandler');
-	set_exception_handler('Piwik_ExceptionHandler');
-	printDebug("Debug enabled - Input parameters: <br/>" . var_export($_GET, true));
-	Piwik_Tracker_Db::enableProfiling();
-	Piwik::createConfigObject();
-	Piwik::createLogObject();
+if ($GLOBALS['PIWIK_TRACKER_DEBUG'] === true) {
+    require_once PIWIK_INCLUDE_PATH . '/core/Loader.php';
+    require_once PIWIK_INCLUDE_PATH . '/core/ErrorHandler.php';
+    require_once PIWIK_INCLUDE_PATH . '/core/ExceptionHandler.php';
+    $timer = new Piwik_Timer();
+    set_error_handler('Piwik_ErrorHandler');
+    set_exception_handler('Piwik_ExceptionHandler');
+    printDebug("Debug enabled - Input parameters: <br/>" . var_export($_GET, true));
+    Piwik_Tracker_Db::enableProfiling();
+    Piwik::createConfigObject();
+    Piwik::createLogObject();
 }
 
-if(!defined('PIWIK_ENABLE_TRACKING') || PIWIK_ENABLE_TRACKING)
-{
-	$process = new Piwik_Tracker();
-	try {
-		$process->main();
-	} catch(Exception $e) {
-		echo "Error:" . $e->getMessage();
-	}
-	ob_end_flush();
-	if($GLOBALS['PIWIK_TRACKER_DEBUG'] === true)
-	{	
-		printDebug($_COOKIE);
-		printDebug($timer);
-	}
+if (!defined('PIWIK_ENABLE_TRACKING') || PIWIK_ENABLE_TRACKING) {
+    $process = new Piwik_Tracker();
+    try {
+        $process->main();
+    } catch (Exception $e) {
+        echo "Error:" . $e->getMessage();
+    }
+    ob_end_flush();
+    if ($GLOBALS['PIWIK_TRACKER_DEBUG'] === true) {
+        printDebug($_COOKIE);
+        printDebug($timer);
+    }
 }