From 5339b6766f92044e953a8913c4f34b17535555e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Steffen=20Schro=CC=88der?= <schteffens@gmail.com>
Date: Mon, 9 Dec 2013 13:07:03 +0100
Subject: [PATCH] Code Cleanup

---
 application/ManiaControl.php                          | 11 +++++------
 .../core/GbxDataFetcher/gbxdatafetcher.inc.php        |  2 +-
 application/core/ManiaExchange/mxinfofetcher.inc.php  |  2 +-
 application/core/ManiaExchange/mxinfosearcher.inc.php |  2 +-
 application/core/Maps/MapCommands.php                 |  1 +
 application/core/PhpRemote/GbxRemote.bem.php          |  1 -
 application/core/PhpRemote/GbxRemote.inc.php          |  2 +-
 application/plugins/Chatlog.php                       |  2 --
 application/plugins/Donations.php                     |  2 --
 application/plugins/Endurance.php                     |  2 --
 application/plugins/Karma.php                         |  2 --
 application/plugins/LocalRecords.php                  |  1 -
 application/plugins/Obstacle.php                      |  2 --
 13 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/application/ManiaControl.php b/application/ManiaControl.php
index 05f300d7..926cab9c 100644
--- a/application/ManiaControl.php
+++ b/application/ManiaControl.php
@@ -1,5 +1,4 @@
 <?php
-use ManiaControl\ManiaControl;
 
 // Define base dir
 define('ManiaControlDir', __DIR__);
@@ -11,8 +10,10 @@ if (function_exists('date_default_timezone_get') && function_exists('date_defaul
 }
 
 // Error handling
-ini_set('log_errors', 1);
+ini_set('log_errors', true);
+ini_set('display_errors', '1');
 ini_set('error_reporting', -1);
+ini_set('display_startup_errors', true);
 if (!is_dir('logs')) {
 	mkdir('logs');
 }
@@ -22,9 +23,7 @@ ini_set('error_log', 'logs/ManiaControl_' . getmypid() . '.log');
 require_once __DIR__ . '/core/ManiaControl.php';
 
 // Start ManiaControl
-error_log('Loading ManiaControl v' . ManiaControl::VERSION . '...');
+error_log('Loading ManiaControl v' . ManiaControl\ManiaControl::VERSION . '...');
 
-$maniaControl = new ManiaControl();
+$maniaControl = new ManiaControl\ManiaControl();
 $maniaControl->run();
-
-?>
diff --git a/application/core/GbxDataFetcher/gbxdatafetcher.inc.php b/application/core/GbxDataFetcher/gbxdatafetcher.inc.php
index 4585d239..c43bb74f 100644
--- a/application/core/GbxDataFetcher/gbxdatafetcher.inc.php
+++ b/application/core/GbxDataFetcher/gbxdatafetcher.inc.php
@@ -1428,4 +1428,4 @@ class GBXPackFetcher extends GBXBaseFetcher
 	}  // processGBX
 
 }  // class GBXPackFetcher
-?>
+
diff --git a/application/core/ManiaExchange/mxinfofetcher.inc.php b/application/core/ManiaExchange/mxinfofetcher.inc.php
index 49944d5d..0251a910 100644
--- a/application/core/ManiaExchange/mxinfofetcher.inc.php
+++ b/application/core/ManiaExchange/mxinfofetcher.inc.php
@@ -303,4 +303,4 @@ class MXInfoFetcher {
 		}
 	}  // get_file
 }  // class MXInfoFetcher
-?>
+
diff --git a/application/core/ManiaExchange/mxinfosearcher.inc.php b/application/core/ManiaExchange/mxinfosearcher.inc.php
index fb9666a6..19216423 100644
--- a/application/core/ManiaExchange/mxinfosearcher.inc.php
+++ b/application/core/ManiaExchange/mxinfosearcher.inc.php
@@ -322,4 +322,4 @@ class MXInfo {
 		}
 	}  // MXInfo
 }  // class MXInfo
-?>
+
diff --git a/application/core/Maps/MapCommands.php b/application/core/Maps/MapCommands.php
index c81159c9..11607de1 100644
--- a/application/core/Maps/MapCommands.php
+++ b/application/core/Maps/MapCommands.php
@@ -151,6 +151,7 @@ class MapCommands implements CommandListener {
 			return true;
 		}
 		// TODO: add local map by filename
+        return false;
 	}
 
 	/**
diff --git a/application/core/PhpRemote/GbxRemote.bem.php b/application/core/PhpRemote/GbxRemote.bem.php
index 20803cb0..a8c03bd2 100644
--- a/application/core/PhpRemote/GbxRemote.bem.php
+++ b/application/core/PhpRemote/GbxRemote.bem.php
@@ -889,4 +889,3 @@ function big_endian_unpack($format, $data) {
 	}
 	return $ar;
 }
-?>
diff --git a/application/core/PhpRemote/GbxRemote.inc.php b/application/core/PhpRemote/GbxRemote.inc.php
index a4e17724..2228311f 100644
--- a/application/core/PhpRemote/GbxRemote.inc.php
+++ b/application/core/PhpRemote/GbxRemote.inc.php
@@ -852,4 +852,4 @@ class IXR_ClientMulticall_Gbx extends IXR_Client_Gbx {
 		return $result;
 	}
 }
-?>
+
diff --git a/application/plugins/Chatlog.php b/application/plugins/Chatlog.php
index f5be13ea..143306fc 100644
--- a/application/plugins/Chatlog.php
+++ b/application/plugins/Chatlog.php
@@ -140,5 +140,3 @@ class ChatlogPlugin implements CallbackListener, Plugin {
 		file_put_contents($this->fileName, $message, FILE_APPEND);
 	}
 }
-
-?>
diff --git a/application/plugins/Donations.php b/application/plugins/Donations.php
index 45f1ee5e..0518c156 100644
--- a/application/plugins/Donations.php
+++ b/application/plugins/Donations.php
@@ -274,5 +274,3 @@ class DonationPlugin implements CallbackListener, CommandListener, Plugin {
 		return $this->maniaControl->chat->sendChat($message, $player->login);
 	}
 }
-
-?>
diff --git a/application/plugins/Endurance.php b/application/plugins/Endurance.php
index 615a3902..be4f93fe 100644
--- a/application/plugins/Endurance.php
+++ b/application/plugins/Endurance.php
@@ -125,5 +125,3 @@ class EndurancePlugin implements CallbackListener, Plugin {
 		$this->maniaControl->callbackManager->triggerCallback(CallbackManager::CB_TM_PLAYERFINISH, $finishCallback);
 	}
 }
-
-?>
diff --git a/application/plugins/Karma.php b/application/plugins/Karma.php
index 0a06dfff..dd5d0800 100644
--- a/application/plugins/Karma.php
+++ b/application/plugins/Karma.php
@@ -472,5 +472,3 @@ class KarmaPlugin implements CallbackListener, Plugin {
 		$this->manialink = $manialink;
 	}
 }
-
-?>
diff --git a/application/plugins/LocalRecords.php b/application/plugins/LocalRecords.php
index 28dae9aa..6dcf51f9 100644
--- a/application/plugins/LocalRecords.php
+++ b/application/plugins/LocalRecords.php
@@ -407,4 +407,3 @@ class LocalRecordsPlugin implements CallbackListener, Plugin {
 	}
 }
 
-?>
diff --git a/application/plugins/Obstacle.php b/application/plugins/Obstacle.php
index 5b60be64..33900834 100644
--- a/application/plugins/Obstacle.php
+++ b/application/plugins/Obstacle.php
@@ -139,5 +139,3 @@ class ObstaclePlugin implements CallbackListener, CommandListener, Plugin {
 		$this->maniaControl->callbackManager->triggerCallback(CallbackManager::CB_TM_PLAYERCHECKPOINT, $finishCallback);
 	}
 }
-
-?>