fix many PHP 8.4 compatibility issues

ManiaControl.php

@@ -28,6 +28,11 @@ if (!ini_get('date.timezone') && function_exists('date_default_timezone_set')) {
 // Make sure garbage collection is enabled
 gc_enable();
 
+// Listen process signals
+if (extension_loaded('pcntl')) {
+	pcntl_async_signals(true);
+}
+
 // Register AutoLoader
 require_once MANIACONTROL_PATH . 'core' . DIRECTORY_SEPARATOR . 'AutoLoader.php';
 \ManiaControl\AutoLoader::register();

changelog.txt

@@ -1,3 +1,10 @@
+###v0.258###
+#Changes
+- MC compatibility with MX v2 api
+###v0.257###
+#Changes
+- MC now supports php 8.0 and 8.1
+
 ###v0.255###
 #Additions
 - added optional descriptions to Settings (but no MC-settings have descriptions yet)

core/Admin/AdminLists.php

@@ -243,7 +243,7 @@ class AdminLists implements ManialinkPageAnswerListener, CallbackListener, Usage
 	 */
 	public function getPlayersPerPage() {
 		$pageheight = $this->maniaControl->getManialinkManager()->getStyleManager()->getListWidgetsHeight();
-		return floor($pageheight * 0.82 / 4);
+		return floor(($pageheight - 16) / 4);
 	}
 
 	/**

core/Admin/AuthCommands.php

@@ -56,7 +56,7 @@ class AuthCommands implements CommandListener, UsageInformationAble {
 
 		$text         = $chatCallback[1][2];
 		$commandParts = explode(' ', $text);
-		if (!array_key_exists(1, $commandParts)) {
+		if (!array_key_exists(1, $commandParts) || $commandParts[1] === "") {
 			$message = $this->maniaControl->getChat()->formatMessage(
 				'Usage Example: %s %s',
 				$commandParts[0],
@@ -68,12 +68,10 @@ class AuthCommands implements CommandListener, UsageInformationAble {
 
 		$target = $this->maniaControl->getPlayerManager()->getPlayer($commandParts[1]);
 		if (!$target) {
-			$message = $this->maniaControl->getChat()->formatMessage(
-				'Player %s not found!',
-				$commandParts[1]
-			);
-			$this->maniaControl->getChat()->sendError($message, $player);
-			return;
+			// It's not needed to save the player, it will be done by the grantAuthLevel function
+			$target = new Player($this->maniaControl, false);
+			$target->login = $commandParts[1];
+			$target->nickname = $commandParts[1];
 		}
 
 		$success = $this->maniaControl->getAuthenticationManager()->grantAuthLevel($target, $targetAuthLevel);

core/AutoLoader.php

@@ -15,7 +15,7 @@ abstract class AutoLoader {
 	 * Register the Auto Loader
 	 */
 	public static function register() {
-		spl_autoload_register(array(get_class(), 'autoload'));
+		spl_autoload_register(array(get_called_class(), 'autoload'));
 	}
 
 	/**

core/Callbacks/CallbackManager.php

@@ -176,7 +176,7 @@ class CallbackManager implements UsageInformationAble {
 	/**
 	 * Remove the Callback Listener from the given Listeners Array
 	 *
-	 * @param Listening[]      $listeningsArray
+	 * @param Listening[][]      $listeningsArray
 	 * @param CallbackListener $listener
 	 * @return bool
 	 */

core/Chat.php

@@ -351,6 +351,7 @@ class Chat implements CallbackListener, CommunicationListener, UsageInformationA
 	 */
 	public function sendMessageToAdmins($message, $minLevel = AuthenticationManager::AUTH_LEVEL_MODERATOR, $prefix = true) {
 		$admins = $this->maniaControl->getAuthenticationManager()->getConnectedAdmins($minLevel);
+		if (count($admins) === 0) return false;
 		return $this->sendChat($message, $admins, $prefix);
 	}
 

core/Commands/CommandManager.php

@@ -2,8 +2,10 @@
 
 namespace ManiaControl\Commands;
 
+use ManiaControl\Admin\AuthenticationManager;
 use ManiaControl\Callbacks\CallbackListener;
 use ManiaControl\Callbacks\CallbackManager;
+use ManiaControl\Callbacks\Callbacks;
 use ManiaControl\Callbacks\Listening;
 use ManiaControl\General\UsageInformationAble;
 use ManiaControl\General\UsageInformationTrait;
@@ -18,6 +20,10 @@ use ManiaControl\ManiaControl;
  */
 class CommandManager implements CallbackListener, UsageInformationAble {
 	use UsageInformationTrait;
+	/*
+	 * Constants
+	 */
+	const SETTING_PERMISSION_ADMIN_COMMANDS = "Minimum permissions level to use admin commands";
 	
 	/*
 	 * Private properties
@@ -48,6 +54,12 @@ class CommandManager implements CallbackListener, UsageInformationAble {
 
 		// Callbacks
 		$this->maniaControl->getCallbackManager()->registerCallbackListener(CallbackManager::CB_MP_PLAYERCHAT, $this, 'handleChatCallback');
+		$this->maniaControl->getCallbackManager()->registerCallbackListener(Callbacks::AFTERINIT, $this, 'handleAfterInit');
+	}
+
+	public function handleAfterInit() {
+		// Permissions
+		$this->maniaControl->getAuthenticationManager()->definePermissionLevel(self::SETTING_PERMISSION_ADMIN_COMMANDS, AuthenticationManager::AUTH_LEVEL_MODERATOR, AuthenticationManager::AUTH_LEVEL_PLAYER);
 	}
 
 	/**
@@ -327,6 +339,11 @@ class CommandManager implements CallbackListener, UsageInformationAble {
 			$isAdminCommand = true;
 			$commandListenings = $this->adminCommandListenings;
 
+			if (!$this->maniaControl->getAuthenticationManager()->checkPermission($player, self::SETTING_PERMISSION_ADMIN_COMMANDS)) {
+				$this->maniaControl->getAuthenticationManager()->sendNotAllowed($player);
+				return;
+			}
+
 			if ($command === 'admin') {
 				// Strip 'admin' keyword
 				if (isset($commandArray[1])) {

core/Commands/HelpManager.php

@@ -161,7 +161,7 @@ class HelpManager implements CommandListener, CallbackListener, ManialinkPageAns
 	 * @param Player $player
 	 * @return string
 	 */
-	private function parseHelpList(array $commands, $isHelpAll = false, Player $player = null) {
+	private function parseHelpList(array $commands, $isHelpAll = false, ?Player $player = null) {
 		$showCommands      = array();
 		$registeredMethods = array();
 		$message           = '';

core/Configurator/Configurator.php

@@ -188,7 +188,7 @@ class Configurator implements CallbackListener, CommandListener, ManialinkPageAn
 	 * @param Player $player
 	 * @return \FML\ManiaLink
 	 */
-	private function buildManialink($menuIdShown = 0, Player $player = null) {
+	private function buildManialink($menuIdShown = 0, ?Player $player = null) {
 		$menuPosX     = $this->maniaControl->getSettingManager()->getSettingValue($this, self::SETTING_MENU_POSX);
 		$menuPosY     = $this->maniaControl->getSettingManager()->getSettingValue($this, self::SETTING_MENU_POSY);
 		$menuWidth    = $this->maniaControl->getSettingManager()->getSettingValue($this, self::SETTING_MENU_WIDTH);

core/Configurator/GameModeSettings.php

@@ -333,21 +333,24 @@ class GameModeSettings implements ConfiguratorMenu, CallbackListener, Communicat
 		}
 
 		// Config
+		$innerWidth     = $width - 3;
+		$innerHeight   = $height - 10;
 		$pagerSize     = 9.;
 		$settingHeight = 5.;
+		$valueWidth    = $innerWidth * 0.3;
 		$labelTextSize = 2;
-		$pageMaxCount  = floor(($height * 0.85) / $settingHeight);
+		$pageMaxCount  = floor($innerHeight / $settingHeight);
 
 		// Pagers
 		$pagerPrev = new Quad_Icons64x64_1();
 		$frame->addChild($pagerPrev);
-		$pagerPrev->setPosition($width * 0.39, $height * -0.44, 2);
+		$pagerPrev->setPosition($width * 0.5 - 12, $height * -0.5 + 5, 2);
 		$pagerPrev->setSize($pagerSize, $pagerSize);
 		$pagerPrev->setSubStyle($pagerPrev::SUBSTYLE_ArrowPrev);
 
 		$pagerNext = new Quad_Icons64x64_1();
 		$frame->addChild($pagerNext);
-		$pagerNext->setPosition($width * 0.45, $height * -0.44, 2);
+		$pagerNext->setPosition($width * 0.5 - 5, $height * -0.5 + 5, 2);
 		$pagerNext->setSize($pagerSize, $pagerSize);
 		$pagerNext->setSubStyle($pagerNext::SUBSTYLE_ArrowNext);
 
@@ -357,7 +360,7 @@ class GameModeSettings implements ConfiguratorMenu, CallbackListener, Communicat
 		$pageCountLabel = new Label_Text();
 		$frame->addChild($pageCountLabel);
 		$pageCountLabel->setHorizontalAlign($pageCountLabel::RIGHT);
-		$pageCountLabel->setPosition($width * 0.35, $height * -0.44, 1);
+		$pageCountLabel->setPosition($width * 0.5 - 16, $height * -0.5 + 5, 1);
 		$pageCountLabel->setStyle($pageCountLabel::STYLE_TextTitle1);
 		$pageCountLabel->setTextSize(2);
 
@@ -367,17 +370,24 @@ class GameModeSettings implements ConfiguratorMenu, CallbackListener, Communicat
 			$descriptionLabel = new Label();
 			$frame->addChild($descriptionLabel);
 			$descriptionLabel->setHorizontalAlign($descriptionLabel::LEFT);
-			$descriptionLabel->setPosition($width * -0.45, $height * -0.44);
-			$descriptionLabel->setSize($width * 0.7, $settingHeight);
+			$descriptionLabel->setPosition($width * -0.5 + 3, $height * -0.5 + 5);
+			$descriptionLabel->setSize($width - 30, $settingHeight);
 			$descriptionLabel->setText('Changes only apply with map skip/restart');
 			$descriptionLabel->setTextColor('ff0');
-			$descriptionLabel->setTextSize($labelTextSize);
+			$descriptionLabel->setTextSize(1);
 			$descriptionLabel->setTranslate(true);
 		}
 
+		$repositionnedFrame = new Frame();
+        $frame->addChild($repositionnedFrame);
+        $repositionnedFrame->setPosition($width * -0.5, $height * 0.5);
+
+        $pagesFrame = new Frame();
+        $repositionnedFrame->addChild($pagesFrame);
+		$pagesFrame->setPosition(2, -1);
+
 		// Setting pages
 		$pageFrame = null;
-		$posY      = 0.;
 		$index     = 0;
 
 		foreach ($scriptParams as $key => $scriptParam) {
@@ -402,23 +412,23 @@ class GameModeSettings implements ConfiguratorMenu, CallbackListener, Communicat
 
 			if ($index % $pageMaxCount === 0) {
 				$pageFrame = new Frame();
-				$frame->addChild($pageFrame);
-				$posY = 0.41 * $height;
+				$pagesFrame->addChild($pageFrame);
 				$paging->addPageControl($pageFrame);
+				$index = 1;
 			}
 
 			$settingFrame = new Frame();
 			$pageFrame->addChild($settingFrame);
-			$settingFrame->setY($posY);
+			$settingFrame->setY($settingHeight * $index * -1);
 
 			$nameLabel = new Label_Text();
 			$settingFrame->addChild($nameLabel);
 			$nameLabel->setHorizontalAlign($nameLabel::LEFT);
-			$nameLabel->setSize(0.4 * $width, $settingHeight);
+			$nameLabel->setSize($innerWidth * 0.6, $settingHeight);
 			$nameLabel->setStyle($nameLabel::STYLE_TextCardSmall);
 			$nameLabel->setText($settingName);
 			$nameLabel->setTextSize($labelTextSize);
-			$nameLabel->setX(-0.46 * $width);
+			$nameLabel->setX(1);
 			if ($scriptParam->desc === self::DESCRIPTION_HIDDEN) {
 				$nameLabel->setTextColor("AAAAAA");
 			}
@@ -433,18 +443,18 @@ class GameModeSettings implements ConfiguratorMenu, CallbackListener, Communicat
 					} else {
 						$activeQuad->setSubStyle(Quad_Icons64x64_1::SUBSTYLE_LvlRed);
 					}
-					$activeQuad->setX(0.1 * $width);
+					$activeQuad->setX($innerWidth - $valueWidth - 2.5);
 				} else {
 					$currentLabel = new Label_Text();
 					$settingFrame->addChild($currentLabel);
 					$currentLabel->setHorizontalAlign(Label_Text::RIGHT);
-					$currentLabel->setSize(0.2 * $width, 0.9 * $settingHeight);
+					$currentLabel->setSize($innerWidth * 0.2, 0.9 * $settingHeight);
 					$currentLabel->setStyle(Label_Text::STYLE_TextValueSmall);
 					$currentLabel->setText($settingValue[0]);
 					$currentLabel->setTextColor('aaa');
 					$currentLabel->setTextPrefix('$i');
-					$currentLabel->setTextSize(1);
-					$currentLabel->setX(0.11 * $width);
+					$currentLabel->setTextSize(0.5);
+					$currentLabel->setX($innerWidth - $valueWidth);
 				}
 
 				$settingValue = $settingValue[1];
@@ -454,7 +464,7 @@ class GameModeSettings implements ConfiguratorMenu, CallbackListener, Communicat
 				// Boolean checkbox
 				$quad = new Quad();
 				$quad->setSize(4, 4);
-				$quad->setX(0.27 * $width);
+				$quad->setPosition($innerWidth - $valueWidth / 2, 0);
 				$checkBox = new CheckBox(self::ACTION_PREFIX_SETTING . $settingName, $settingValue, $quad);
 				$settingFrame->addChild($checkBox);
 			} else {
@@ -463,25 +473,24 @@ class GameModeSettings implements ConfiguratorMenu, CallbackListener, Communicat
 				$settingFrame->addChild($entry);
 				$entry->setDefault($settingValue);
 				$entry->setName(self::ACTION_PREFIX_SETTING . $settingName);
-				$entry->setSize(0.3 * $width, 0.9 * $settingHeight);
 				$entry->setStyle(Label_Text::STYLE_TextValueSmall);
 				$entry->setTextSize(1);
 				$entry->setMaxLength(1000);
-				$entry->setX(0.275 * $width);
+				$entry->setPosition($innerWidth - $valueWidth / 2, 0);
+				$entry->setSize($valueWidth, $settingHeight * 0.9);
 			}
 
 			if ($isScriptMode) {
 				$descriptionLabel = new Label();
 				$pageFrame->addChild($descriptionLabel);
 				$descriptionLabel->setHorizontalAlign($descriptionLabel::LEFT);
-				$descriptionLabel->setPosition(-0.45 * $width, -0.44 * $height);
-				$descriptionLabel->setSize(0.7 * $width, $settingHeight);
-				$descriptionLabel->setTextSize($labelTextSize);
+				$descriptionLabel->setPosition(3, $height * -1 + 5);
+				$descriptionLabel->setSize($width - 30, $settingHeight);
+				$descriptionLabel->setTextSize(1);
 				$descriptionLabel->setTranslate(true);
 				$nameLabel->addTooltipLabelFeature($descriptionLabel, $scriptParam->desc);
 			}
 
-			$posY -= $settingHeight;
 			$index++;
 		}
 

core/Configurator/ManiaControlSettings.php

@@ -113,13 +113,13 @@ class ManiaControlSettings implements ConfiguratorMenu, CallbackListener {
 		// Pagers
 		$pagerPrev = new Quad_Icons64x64_1();
 		$frame->addChild($pagerPrev);
-		$pagerPrev->setPosition($width * 0.39, $height * -0.44, 2);
+		$pagerPrev->setPosition($width * 0.5 - 12, $height * -0.5 + 5, 2);
 		$pagerPrev->setSize($pagerSize, $pagerSize);
 		$pagerPrev->setSubStyle($pagerPrev::SUBSTYLE_ArrowPrev);
 
 		$pagerNext = new Quad_Icons64x64_1();
 		$frame->addChild($pagerNext);
-		$pagerNext->setPosition($width * 0.45, $height * -0.44, 2);
+		$pagerNext->setPosition($width * 0.5 - 5, $height * -0.5 + 5, 2);
 		$pagerNext->setSize($pagerSize, $pagerSize);
 		$pagerNext->setSubStyle($pagerNext::SUBSTYLE_ArrowNext);
 
@@ -129,7 +129,7 @@ class ManiaControlSettings implements ConfiguratorMenu, CallbackListener {
 		$pageCountLabel = new Label_Text();
 		$frame->addChild($pageCountLabel);
 		$pageCountLabel->setHorizontalAlign($pageCountLabel::RIGHT);
-		$pageCountLabel->setPosition($width * 0.35, $height * -0.44);
+		$pageCountLabel->setPosition($width * 0.5 - 16, $height * -0.5 + 5, 1);
 		$pageCountLabel->setStyle($pageCountLabel::STYLE_TextTitle1);
 		$pageCountLabel->setTextSize(2);
 
@@ -275,13 +275,13 @@ class ManiaControlSettings implements ConfiguratorMenu, CallbackListener {
 		// Pagers
 		$pagerPrev = new Quad_Icons64x64_1();
 		$frame->addChild($pagerPrev);
-		$pagerPrev->setPosition($width * 0.39, $height * -0.44, 2);
+		$pagerPrev->setPosition($width * 0.5 - 12, $height * -0.5 + 5, 2);
 		$pagerPrev->setSize($pagerSize, $pagerSize);
 		$pagerPrev->setSubStyle($pagerPrev::SUBSTYLE_ArrowPrev);
 
 		$pagerNext = new Quad_Icons64x64_1();
 		$frame->addChild($pagerNext);
-		$pagerNext->setPosition($width * 0.45, $height * -0.44, 2);
+		$pagerNext->setPosition($width * 0.5 - 5, $height * -0.5 + 5, 2);
 		$pagerNext->setSize($pagerSize, $pagerSize);
 		$pagerNext->setSubStyle($pagerNext::SUBSTYLE_ArrowNext);
 
@@ -291,7 +291,7 @@ class ManiaControlSettings implements ConfiguratorMenu, CallbackListener {
 		$pageCountLabel = new Label_Text();
 		$frame->addChild($pageCountLabel);
 		$pageCountLabel->setHorizontalAlign($pageCountLabel::RIGHT);
-		$pageCountLabel->setPosition($width * 0.35, $height * -0.44);
+		$pageCountLabel->setPosition($width * 0.5 - 16, $height * -0.5 + 5, 1);
 		$pageCountLabel->setStyle($pageCountLabel::STYLE_TextTitle1);
 		$pageCountLabel->setTextSize(2);
 
@@ -387,19 +387,18 @@ class ManiaControlSettings implements ConfiguratorMenu, CallbackListener {
 		// Config
 		$pagerSize     = 9.;
 		$settingHeight = 5.;
-		$pageMaxCount  = floor(($height * 0.78) / $settingHeight);
-		$posY          = 0;
+		$pageMaxCount  = floor(($height - 10) / $settingHeight);
 
 		// Pagers
 		$pagerPrev = new Quad_Icons64x64_1();
 		$frame->addChild($pagerPrev);
-		$pagerPrev->setPosition($width * 0.39, $height * -0.44, 2);
+		$pagerPrev->setPosition($width * 0.5 - 12, $height * -0.5 + 5, 2);
 		$pagerPrev->setSize($pagerSize, $pagerSize);
 		$pagerPrev->setSubStyle($pagerPrev::SUBSTYLE_ArrowPrev);
 
 		$pagerNext = new Quad_Icons64x64_1();
 		$frame->addChild($pagerNext);
-		$pagerNext->setPosition($width * 0.45, $height * -0.44, 2);
+		$pagerNext->setPosition($width * 0.5 - 5, $height * -0.5 + 5, 2);
 		$pagerNext->setSize($pagerSize, $pagerSize);
 		$pagerNext->setSubStyle($pagerNext::SUBSTYLE_ArrowNext);
 
@@ -409,20 +408,24 @@ class ManiaControlSettings implements ConfiguratorMenu, CallbackListener {
 		$pageCountLabel = new Label_Text();
 		$frame->addChild($pageCountLabel);
 		$pageCountLabel->setHorizontalAlign($pageCountLabel::RIGHT);
-		$pageCountLabel->setPosition($width * 0.35, $height * -0.44, 1);
+		$pageCountLabel->setPosition($width * 0.5 - 16, $height * -0.5 + 5, 1);
 		$pageCountLabel->setStyle($pageCountLabel::STYLE_TextTitle1);
 		$pageCountLabel->setTextSize(2);
 
 		$paging->setLabel($pageCountLabel);
 
+		$repositionnedFrame = new Frame();
+        $frame->addChild($repositionnedFrame);
+        $repositionnedFrame->setPosition($width * -0.5, $height * 0.5);
+
 		$pageFrame = null;
 		$index     = 0;
 		foreach ($settingClasses as $settingClass) {
 			if ($index % $pageMaxCount === 0) {
 				$pageFrame = new Frame();
-				$frame->addChild($pageFrame);
-				$posY = $height * 0.41;
+				$repositionnedFrame->addChild($pageFrame);
 				$paging->addPageControl($pageFrame);
+				$index = 1;
 			}
 
 			$classLabel = new Label_Text();
@@ -436,15 +439,14 @@ class ManiaControlSettings implements ConfiguratorMenu, CallbackListener {
 
 			$pageFrame->addChild($classLabel);
 			$classLabel->setHorizontalAlign($classLabel::LEFT);
-			$classLabel->setPosition($width * -0.45, $posY);
-			$classLabel->setSize($width * 0.9, $settingHeight * 0.9);
+			$classLabel->setPosition(2, $settingHeight * $index * -1);
+			$classLabel->setSize($width - 6, $settingHeight * 0.9);
 			$classLabel->setStyle($classLabel::STYLE_TextCardSmall);
 			$classLabel->setTextSize(2);
 			$classLabel->setText($className);
 			$classLabel->setTextColor('fff');
 			$classLabel->setAction(self::ACTION_PREFIX_SETTINGCLASS . $settingClass);
 
-			$posY -= $settingHeight;
 			$index++;
 		}
 

core/Database/Database.php

@@ -44,6 +44,9 @@ class Database implements TimerListener {
 		// Enable mysqli Reconnect
 		ini_set('mysqli.reconnect', 'on');
 
+		// Change error report mechanism -> used to set compatibility to php < 8.1
+		mysqli_report(MYSQLI_REPORT_OFF);
+
 		// Open database connection
 		$this->loadConfig();
 		$this->mysqli = @new \mysqli($this->config->host, $this->config->user, $this->config->pass, null, $this->config->port);
@@ -220,7 +223,7 @@ class Database implements TimerListener {
 	 * Check whether the Database Connection is still open
 	 */
 	public function checkConnection() {
-		if (!$this->getMysqli() || !@$this->getMysqli()->ping()) {
+		if (!$this->getMysqli() || !$this->getMysqli()->query('DO 1')) {
 			$this->maniaControl->quit('The MySQL Server has gone away!', true);
 		}
 	}

core/Files/AsyncHttpRequest.php

@@ -109,6 +109,59 @@ class AsyncHttpRequest implements UsageInformationAble {
 		$this->processRequest($request);
 	}
 
+
+	/**
+	 * Carry out a PatchData Request
+	 */
+	public function patchData() {
+		array_push($this->headers, 'Content-Type: ' . $this->contentType);
+		array_push($this->headers, 'Keep-Alive: timeout=600, max=2000');
+		array_push($this->headers, 'Connection: Keep-Alive');
+		array_push($this->headers, 'Expect:');
+		array_push($this->headers, 'Accept-Charset: utf-8');
+
+		$content = $this->content;
+		if ($this->compression) {
+			$content = gzencode($this->content);
+			array_push($this->headers, 'Content-Encoding: gzip');
+		}
+
+
+		$request = $this->newRequest($this->url, $this->timeout);
+		$request->getOptions()->set(CURLOPT_CUSTOMREQUEST, 'PATCH')// patch method
+		        ->set(CURLOPT_POSTFIELDS, $content)// post content field
+		        ->set(CURLOPT_HTTPHEADER, $this->headers) // headers
+		;
+
+		$this->processRequest($request);
+	}
+
+	/**
+	 * Carry out a PutData Request
+	 */
+	public function putData() {
+		array_push($this->headers, 'Content-Type: ' . $this->contentType);
+		array_push($this->headers, 'Keep-Alive: timeout=600, max=2000');
+		array_push($this->headers, 'Connection: Keep-Alive');
+		array_push($this->headers, 'Expect:');
+		array_push($this->headers, 'Accept-Charset: utf-8');
+
+		$content = $this->content;
+		if ($this->compression) {
+			$content = gzencode($this->content);
+			array_push($this->headers, 'Content-Encoding: gzip');
+		}
+
+
+		$request = $this->newRequest($this->url, $this->timeout);
+		$request->getOptions()->set(CURLOPT_CUSTOMREQUEST, 'PUT')// patch method
+		        ->set(CURLOPT_POSTFIELDS, $content)// put content field
+		        ->set(CURLOPT_HTTPHEADER, $this->headers) // headers
+		;
+
+		$this->processRequest($request);
+	}
+
 	/**
 	 * Processes the Request
 	 *

core/Files/FileUtil.php

@@ -59,6 +59,7 @@ abstract class FileUtil {
 		$fileName = Formatter::utf8($fileName);
 		$fileName = preg_replace('/[^0-9A-Za-z\-\+\.\_\ ]/', '', $fileName);
 		$fileName = preg_replace('/ /', '_', $fileName);
+		$fileName = str_replace(["'", "+"], '', $fileName);
 		return $fileName;
 	}
 

core/ManiaControl.php

@@ -56,7 +56,7 @@ class ManiaControl implements CallbackListener, CommandListener, TimerListener,
 	/*
 	 * Constants
 	 */
-	const VERSION                     = '0.256';
+	const VERSION                     = '0.258';
 	const ISTRACKMANIACONTROL         = True;
 	const API_VERSION                 = '2038-01-19';
 	const MIN_DEDIVERSION             = '2020-07-01_00_00';
@@ -299,7 +299,6 @@ class ManiaControl implements CallbackListener, CommandListener, TimerListener,
 			}
 
 			// Delete client
-			Connection::delete($this->getClient());
 			$this->client = null;
 		}
 
@@ -652,6 +651,13 @@ class ManiaControl implements CallbackListener, CommandListener, TimerListener,
 		Logger::log('Starting ManiaControl v' . self::VERSION . '!');
 
 		try {
+			// Manage SIGTERM signal
+			if (extension_loaded('pcntl')) {
+				pcntl_signal(SIGTERM, function() {
+					$this->quit("Stop signal received from the OS.", false);
+				});
+			}
+
 			// Connect to server
 			$this->connect();
 
@@ -715,7 +721,7 @@ class ManiaControl implements CallbackListener, CommandListener, TimerListener,
 		Logger::log("Connecting to Server at {$serverConfig->host}:{$serverConfig->port}...");
 
 		try {
-			$this->client = Connection::factory($serverConfig->host, $serverConfig->port, self::SCRIPT_TIMEOUT, $serverConfig->user, $serverConfig->pass, self::API_VERSION);
+			$this->client = new Connection($serverConfig->host, $serverConfig->port, self::SCRIPT_TIMEOUT, $serverConfig->user, $serverConfig->pass, self::API_VERSION);
 		} catch (TransportException $exception) {
 			$message = "Couldn't connect to the server: '{$exception->getMessage()}'";
 			$this->quit($message, true);

core/ManiaExchange/MXMapInfo.php

@@ -44,7 +44,7 @@ class MXMapInfo {
 		} else {
 			$this->dir = 'maps';
 			$this->id  = $mx->MapID;
-			$this->uid = isset($mx->MapUID) ? $mx->MapUID : '';
+			$this->uid = isset($mx->TrackUID) ? $mx->TrackUID : ''; // TODO: fix when migrating to new api; TrackUID is equal to MapUID
 		}
 
 		if (!isset($mx->GbxMapName) || $mx->GbxMapName === '?') {

core/ManiaExchange/ManiaExchangeManager.php

@@ -23,7 +23,7 @@ class ManiaExchangeManager implements UsageInformationAble {
 	 * Constants
 	 * @deprecated SEARCH Constants
 	 */
-	//Search orders (prior parameter) https://api.mania-exchange.com/documents/enums#orderings
+	//Search orders (prior parameter) https://api2.mania.exchange/documents/enums#orderings
 	const SEARCH_ORDER_NONE               = -1;
 	const SEARCH_ORDER_TRACK_NAME         = 0;
 	const SEARCH_ORDER_AUTHOR             = 1;
@@ -190,7 +190,7 @@ class ManiaExchangeManager implements UsageInformationAble {
 
 		}
 		// compile search URL
-		$url = "https://{$titlePrefix}/api/maps/get_map_info/multi/{$string}";
+		$url = 'https://' . $titlePrefix . "/api/maps/get_map_info/multi/{$string}";
 
 		/*if ($key = $this->maniaControl->getSettingManager()->getSettingValue($this, self::SETTING_MX_KEY)) {
 			$url .= "&key=" . $key;
@@ -300,7 +300,7 @@ class ManiaExchangeManager implements UsageInformationAble {
 
 		}
 		// compile search URL
-		$url = "https://{$titlePrefix}/api/maps/get_map_info/multi/{$mapId}";
+		$url = 'https://' . $titlePrefix . '/api/maps/get_map_info/multi/' . $mapId;
 
 		/*if ($key = $this->maniaControl->getSettingManager()->getSettingValue($this, self::SETTING_MX_KEY)) {
 			$url .= "&key=" . $key;

core/ManiaExchange/ManiaExchangeMapSearch.php

@@ -18,7 +18,7 @@ use Maniaplanet\DedicatedServer\Xmlrpc\GameModeException;
 class ManiaExchangeMapSearch implements UsageInformationAble {
 	use UsageInformationTrait;
 
-	//Search orders (prior parameter) https://api.mania-exchange.com/documents/enums#orderings
+	//Search orders (prior parameter) https://api2.mania.exchange/documents/enums#orderings
 	const SEARCH_ORDER_NONE               = -1;
 	const SEARCH_ORDER_TRACK_NAME         = 0;
 	const SEARCH_ORDER_AUTHOR             = 1;
@@ -41,7 +41,7 @@ class ManiaExchangeMapSearch implements UsageInformationAble {
 	const SEARCH_ORDER_ONLINE_RATING_LTH  = 26;
 	const SEARCH_ORDER_ONLINE_RATING_HTL  = 27;
 
-	//Special Search Orders (mode parameter): https://api.mania-exchange.com/documents/enums#modes
+	//Special Search Orders (mode parameter): https://api2.mania.exchange/documents/enums#modes
 	const SEARCH_ORDER_SPECIAL_DEFAULT                  = 0;
 	const SEARCH_ORDER_SPECIAL_USER_TRACKS              = 1;
 	const SEARCH_ORDER_SPECIAL_LATEST_TRACKS            = 2;

core/Manialinks/CustomUIManager.php

@@ -75,7 +75,7 @@ class CustomUIManager implements CallbackListener, TimerListener, UsageInformati
 	 *
 	 * @param Player $player
 	 */
-	public function updateManialink(Player $player = null) {
+	public function updateManialink(?Player $player = null) {
 		$this->maniaControl->getManialinkManager()->sendManialink($this->customUI, $player);
 	}
 

core/Manialinks/StyleManager.php

@@ -106,7 +106,7 @@ class StyleManager implements UsageInformationAble {
 
 		// Predefine Description Label
 		$descriptionLabel = new Label();
-		$descriptionLabel->setAlign($descriptionLabel::LEFT, $descriptionLabel::TOP)->setPosition($width * -0.5 + 10, $height * -0.5 + 5)->setZ(1)->setSize($width * 0.7, 4)->setTextSize(2)->setVisible(false);
+		$descriptionLabel->setAlign($descriptionLabel::LEFT, $descriptionLabel::TOP)->setPosition($width * -0.5 + 10, $height * -0.5 + 5)->setZ(1)->setSize($width * 0.7, 4)->setTextSize(1)->setVisible(false);
 
 		return $descriptionLabel;
 	}
@@ -245,18 +245,27 @@ class StyleManager implements UsageInformationAble {
 			$pagerSize = 6.;
 			$pagerPrev = new Quad_Icons64x64_1();
 			$frame->addChild($pagerPrev);
-			$pagerPrev->setPosition($width * 0.42, $height * -0.44, 2)->setSize($pagerSize, $pagerSize)->setSubStyle($pagerPrev::SUBSTYLE_ArrowPrev);
+			$pagerPrev->setPosition($width * 0.5 - 12, $height * -0.5 + 5, 2);
+			$pagerPrev->setSize($pagerSize, $pagerSize);
+			$pagerPrev->setSubStyle($pagerPrev::SUBSTYLE_ArrowPrev);
 
 			$pagerNext = new Quad_Icons64x64_1();
 			$frame->addChild($pagerNext);
-			$pagerNext->setPosition($width * 0.45, $height * -0.44, 2)->setSize($pagerSize, $pagerSize)->setSubStyle($pagerNext::SUBSTYLE_ArrowNext);
+			$pagerNext->setPosition($width * 0.5 - 5, $height * -0.5 + 5, 2);
+			$pagerNext->setSize($pagerSize, $pagerSize);
+			$pagerNext->setSubStyle($pagerNext::SUBSTYLE_ArrowNext);
 
 			$pageCountLabel = new Label_Text();
 			$frame->addChild($pageCountLabel);
-			$pageCountLabel->setHorizontalAlign($pageCountLabel::RIGHT)->setPosition($width * 0.40, $height * -0.44, 1)->setStyle($pageCountLabel::STYLE_TextTitle1)->setTextSize(1);
+			$pageCountLabel->setHorizontalAlign($pageCountLabel::RIGHT);
+			$pageCountLabel->setPosition($width * 0.5 - 16, $height * -0.5 + 5, 1);
+			$pageCountLabel->setStyle($pageCountLabel::STYLE_TextTitle1);
+			$pageCountLabel->setTextSize(1);
 
 			if ($paging) {
-				$paging->addButtonControl($pagerNext)->addButtonControl($pagerPrev)->setLabel($pageCountLabel);
+				$paging->addButtonControl($pagerNext);
+				$paging->addButtonControl($pagerPrev);
+				$paging->setLabel($pageCountLabel);
 			}
 		}
 

core/Maps/DirectoryBrowser.php

@@ -2,9 +2,12 @@
 
 namespace ManiaControl\Maps;
 
+use finfo;
+use ZipArchive;
 use FML\Controls\Frame;
 use FML\Controls\Label;
 use FML\Controls\Entry;
+use FML\Controls\Labels\Label_Button;
 use FML\Controls\Labels\Label_Text;
 use FML\Controls\Quads\Quad_BgsPlayerCard;
 use FML\Controls\Quads\Quad_Icons64x64_1;
@@ -41,6 +44,7 @@ class DirectoryBrowser implements ManialinkPageAnswerListener {
 	const ACTION_INSPECT_FILE  = 'MapsDirBrowser.InspectFile.';
 	const ACTION_ADD_FILE      = 'MapsDirBrowser.AddFile.';
 	const ACTION_ERASE_FILE    = 'MapsDirBrowser.EraseFile.';
+	const ACTION_CREATE_FOLDER = 'MapsDirBrowser.CreateFolder';
 	const ACTION_DOWNLOAD_FILE = 'MapsDirBrowser.DownloadFile';
 	const WIDGET_NAME          = 'MapsDirBrowser.Widget';
 	const CACHE_FOLDER_PATH    = 'FolderPath';
@@ -67,6 +71,7 @@ class DirectoryBrowser implements ManialinkPageAnswerListener {
 		$this->maniaControl->getManialinkManager()->registerManialinkPageAnswerRegexListener($this->buildActionRegex(self::ACTION_INSPECT_FILE), $this, 'handleInspectFile');
 		$this->maniaControl->getManialinkManager()->registerManialinkPageAnswerRegexListener($this->buildActionRegex(self::ACTION_ADD_FILE), $this, 'handleAddFile');
 		$this->maniaControl->getManialinkManager()->registerManialinkPageAnswerRegexListener($this->buildActionRegex(self::ACTION_ERASE_FILE), $this, 'handleEraseFile');
+		$this->maniaControl->getManialinkManager()->registerManialinkPageAnswerRegexListener($this->buildActionRegex(self::ACTION_CREATE_FOLDER), $this, 'handleCreateFolder');
 		$this->maniaControl->getManialinkManager()->registerManialinkPageAnswerRegexListener($this->buildActionRegex(self::ACTION_DOWNLOAD_FILE), $this, 'handleDownloadFile');
 	}
 
@@ -137,18 +142,31 @@ class DirectoryBrowser implements ManialinkPageAnswerListener {
 
 		$width     = $this->maniaControl->getManialinkManager()->getStyleManager()->getListWidgetsWidth();
 		$height    = $this->maniaControl->getManialinkManager()->getStyleManager()->getListWidgetsHeight();
+
+		$innerWidth = $width - 2;
+		$innerHeigth = $height - 27;
+
+		$lineHeight = 4.;
+
 		$index     = 0;
-		$posY      = $height / 2 - 10;
 		$pageFrame = null;
-		$pageMaxCount = floor(($height * 0.78) / 4);
+		$pageMaxCount = floor($innerHeigth / 4);
+
+		$repositionnedFrame = new Frame();
+        $frame->addChild($repositionnedFrame);
+        $repositionnedFrame->setPosition($width * -0.5, $height * 0.5);
 
 		$navigateRootQuad = new Quad_Icons64x64_1();
-		$frame->addChild($navigateRootQuad);
-		$navigateRootQuad->setPosition($width * -0.47, $height * 0.45)->setSize(4, 4)->setSubStyle($navigateRootQuad::SUBSTYLE_ToolRoot);
+		$repositionnedFrame->addChild($navigateRootQuad);
+		$navigateRootQuad->setPosition(5, -5);
+		$navigateRootQuad->setSize(4, 4);
+		$navigateRootQuad->setSubStyle($navigateRootQuad::SUBSTYLE_ToolRoot);
 
 		$navigateUpQuad = new Quad_Icons64x64_1();
-		$frame->addChild($navigateUpQuad);
-		$navigateUpQuad->setPosition($width * -0.44, $height * 0.45)->setSize(4, 4)->setSubStyle($navigateUpQuad::SUBSTYLE_ToolUp);
+		$repositionnedFrame->addChild($navigateUpQuad);
+		$navigateUpQuad->setPosition(9, -5);
+		$navigateUpQuad->setSize(4, 4);
+		$navigateUpQuad->setSubStyle($navigateUpQuad::SUBSTYLE_ToolUp);
 
 		if (!$isInMapsFolder) {
 			$navigateRootQuad->setAction(self::ACTION_NAVIGATE_ROOT);
@@ -156,117 +174,189 @@ class DirectoryBrowser implements ManialinkPageAnswerListener {
 		}
 
 		$directoryLabel = new Label_Text();
-		$frame->addChild($directoryLabel);
+		$repositionnedFrame->addChild($directoryLabel);
 		$dataFolder    = $this->maniaControl->getServer()->getDirectory()->getUserDataFolder();
 		$directoryText = substr($folderPath, strlen($dataFolder));
-		$directoryLabel->setPosition($width * -0.41, $height * 0.45)->setSize($width * 0.85, 4)->setHorizontalAlign($directoryLabel::LEFT)->setText($directoryText)->setTextSize(2);
+		$directoryLabel->setPosition(12, -5);
+		$directoryLabel->setSize($width * 0.85, 4);
+		$directoryLabel->setHorizontalAlign($directoryLabel::LEFT);
+		$directoryLabel->setText($directoryText);
+		$directoryLabel->setTextSize(2);
 
 		$tooltipLabel = new Label();
-		$frame->addChild($tooltipLabel);
-		$tooltipLabel->setPosition($width * -0.48, $height * -0.44)->setSize($width * 0.8, 5)->setHorizontalAlign($tooltipLabel::LEFT)->setTextSize(1);
+		$repositionnedFrame->addChild($tooltipLabel);
+		$tooltipLabel->setPosition(3, $height * -1 + 15);
+		$tooltipLabel->setSize($width * 0.8, 5);
+		$tooltipLabel->setHorizontalAlign($tooltipLabel::LEFT);
+		$tooltipLabel->setTextSize(1);
+
+		// Back button
+		$backButton = new Label_Button();
+		$repositionnedFrame->addChild($backButton);
+		$backButton->setStyle($backButton::STYLE_CardMain_Quit);
+		$backButton->setHorizontalAlign($backButton::LEFT);
+		$backButton->setScale(0.5);
+		$backButton->setText('Back');
+        $backButton->setPosition(3, $height * -1 + 5);
+		$backButton->setSize(5, 10);
+		$backButton->setAction(MapCommands::ACTION_OPEN_MAPLIST);
+
+		// Create folder button
+		$label = new Label_Text();
+		$repositionnedFrame->addChild($label);
+		$label->setPosition($width - 113, $height * -1 + 10);
+		$label->setSize(25, 5);
+		$label->setHorizontalAlign($label::LEFT);
+		$label->setTextSize(1);
+		$label->setText('Create folder: ');
+		$label->setAreaFocusColor("00000000");
+		$label->setAreaColor("00000000");
+			
+		$entry = new Entry();
+		$repositionnedFrame->addChild($entry);
+		$entry->setStyle(Label_Text::STYLE_TextValueSmall);
+		$entry->setHorizontalAlign($entry::LEFT);
+		$entry->setPosition($width - 95, $height * -1 + 10);
+		$entry->setTextSize(1);
+		$entry->setSize(50, 4);
+		$entry->setName("Name");
+
+		//Search for Map-Name
+		$createFolderButton = $this->maniaControl->getManialinkManager()->getElementBuilder()->buildRoundTextButton(
+			'Create',
+			18,
+			5,
+			self::ACTION_CREATE_FOLDER
+		);
+		$repositionnedFrame->addChild($createFolderButton);
+		$createFolderButton->setPosition($width - 27 - 18/2, $height * -1 + 10);
+
+		// Download button
+		$label = new Label_Text();
+		$repositionnedFrame->addChild($label);
+		$label->setPosition($width - 122, $height * -1 + 5);
+		$label->setSize(27, 5);
+		$label->setHorizontalAlign($label::LEFT);
+		$label->setTextSize(1);
+		$label->setText('Download from URL: ');
+		$label->setAreaFocusColor("00000000");
+		$label->setAreaColor("00000000");
+		$label->addTooltipLabelFeature($tooltipLabel, 'Support Map.Gbx and Zip files');
+			
+		$entry = new Entry();
+		$repositionnedFrame->addChild($entry);
+		$entry->setStyle(Label_Text::STYLE_TextValueSmall);
+		$entry->setHorizontalAlign($entry::LEFT);
+		$entry->setPosition($width - 95, $height * -1 + 5);
+		$entry->setTextSize(1);
+		$entry->setSize(50, 4);
+		$entry->setName("URL");
+
+		//Search for Map-Name
+		$downloadButton = $this->maniaControl->getManialinkManager()->getElementBuilder()->buildRoundTextButton(
+			'Download',
+			18,
+			5,
+			self::ACTION_DOWNLOAD_FILE
+		);
+		$repositionnedFrame->addChild($downloadButton);
+		$downloadButton->setPosition($width - 27 - 18/2, $height * -1 + 5);
 
 		$mapFiles = $this->scanMapFiles($folderPath);
 
 		if (is_array($mapFiles)) {
 			if (empty($mapFiles)) {
 				$emptyLabel = new Label();
-				$frame->addChild($emptyLabel);
-				$emptyLabel->setY(20)->setTextColor('aaa')->setText('No files found.')->setTranslate(true);
+				$repositionnedFrame->addChild($emptyLabel);
+				$emptyLabel->setPosition($innerWidth * 0.5, $innerHeigth * -0.5);
+				$emptyLabel->setTextColor('aaa');
+				$emptyLabel->setText('No files found.');
+				$emptyLabel->setTranslate(true);
 			} else {
 				$canAddMaps   = $this->maniaControl->getAuthenticationManager()->checkPermission($player, MapManager::SETTING_PERMISSION_ADD_MAP);
 				$canEraseMaps = $this->maniaControl->getAuthenticationManager()->checkPermission($player, MapManager::SETTING_PERMISSION_ERASE_MAP);
 
+				$pagesFrame = new Frame();
+				$repositionnedFrame->addChild($pagesFrame);
+				$pagesFrame->setPosition(1, -10);
+
 				foreach ($mapFiles as $filePath => $fileName) {
 					$shortFilePath = substr($filePath, strlen($folderPath));
 
 					if ($index % $pageMaxCount === 0) {
 						// New Page
 						$pageFrame = new Frame();
-						$frame->addChild($pageFrame);
-						$posY = $height / 2 - 10;
+						$pagesFrame->addChild($pageFrame);
 						$paging->addPageControl($pageFrame);
+						$index = 1;
 					}
 
 					// Map Frame
 					$mapFrame = new Frame();
 					$pageFrame->addChild($mapFrame);
-					$mapFrame->setY($posY);
+					$mapFrame->setY($lineHeight * $index * -1);
 
 					if ($index % 2 === 0) {
 						// Striped background line
 						$lineQuad = new Quad_BgsPlayerCard();
 						$mapFrame->addChild($lineQuad);
-						$lineQuad->setZ(-1)->setSize($width, 4)->setSubStyle($lineQuad::SUBSTYLE_BgPlayerCardBig);
+						$lineQuad->setX($innerWidth / 2);
+						$lineQuad->setZ(-1);
+						$lineQuad->setSize($width, $lineHeight);
+						$lineQuad->setSubStyle($lineQuad::SUBSTYLE_BgPlayerCardBig);
 					}
 
 					// File name Label
 					$nameLabel = new Label_Text();
 					$mapFrame->addChild($nameLabel);
-					$nameLabel->setX($width * -0.48)->setSize($width * 0.79, 4)->setHorizontalAlign($nameLabel::LEFT)->setStyle($nameLabel::STYLE_TextCardRaceRank)->setTextSize(1)->setText($fileName);
+					$nameLabel->setX(2);
+					$nameLabel->setSize($innerWidth - 20, $lineHeight);
+					$nameLabel->setHorizontalAlign($nameLabel::LEFT);
+					$nameLabel->setStyle($nameLabel::STYLE_TextCardRaceRank);
+					$nameLabel->setTextSize(1);
+					$nameLabel->setText($fileName);
+					if (substr($fileName, -1) === DIRECTORY_SEPARATOR) $nameLabel->setTextPrefix(' ');
 
 					if (is_dir($filePath)) {
 						// Folder
 						$nameLabel->setAction(self::ACTION_OPEN_FOLDER . substr($shortFilePath, 0, -1))->addTooltipLabelFeature($tooltipLabel, 'Open folder ' . $fileName);
 					} else {
 						// File
-						$nameLabel->setAction(self::ACTION_INSPECT_FILE . $fileName)->addTooltipLabelFeature($tooltipLabel, 'Inspect file ' . $fileName);
+						$nameLabel->setAction(self::ACTION_INSPECT_FILE . base64_encode($fileName))->addTooltipLabelFeature($tooltipLabel, 'Inspect file ' . $fileName);
 
 						if ($canAddMaps) {
 							// 'Add' button
 							$addButton = new Quad_UIConstructionBullet_Buttons();
 							$mapFrame->addChild($addButton);
-							$addButton->setX($width * 0.42)->setSize(4, 4)->setSubStyle($addButton::SUBSTYLE_NewBullet)->setAction(self::ACTION_ADD_FILE . $fileName)->addTooltipLabelFeature($tooltipLabel, 'Add map ' . $fileName);
+							$addButton->setX($width - 5);
+							$addButton->setSize(4, 4);
+							$addButton->setSubStyle($addButton::SUBSTYLE_NewBullet);
+							$addButton->setAction(self::ACTION_ADD_FILE . base64_encode($fileName));
+							$addButton->addTooltipLabelFeature($tooltipLabel, 'Add map ' . $fileName);
 						}
 
 						if ($canEraseMaps) {
 							// 'Erase' button
 							$eraseButton = new Quad_UIConstruction_Buttons();
 							$mapFrame->addChild($eraseButton);
-							$eraseButton->setX($width * 0.46)->setSize(4, 4)->setSubStyle($eraseButton::SUBSTYLE_Erase)->setAction(self::ACTION_ERASE_FILE . $fileName)->addTooltipLabelFeature($tooltipLabel, 'Erase file ' . $fileName);
+							$eraseButton->setX($width - 10);
+							$eraseButton->setSize(4, 4);
+							$eraseButton->setSubStyle($eraseButton::SUBSTYLE_Erase);
+							$eraseButton->setAction(self::ACTION_ERASE_FILE . base64_encode($fileName));
+							$eraseButton->addTooltipLabelFeature($tooltipLabel, 'Erase file ' . $fileName);
 						}
 					}
 
-					$posY -= 4;
 					$index++;
 				}
 			}
-
-			$downloadPosX = -$width / 2 + 5;
-
-			$label = new Label_Text();
-			$frame->addChild($label);
-			$label->setPosition($downloadPosX, $height * -0.39);
-			$label->setHorizontalAlign($label::LEFT);
-			$label->setTextSize(1);
-			$label->setText('Download from URL: ');
-
-			$downloadPosX += 30;
-	
-			$entry = new Entry();
-			$frame->addChild($entry);
-			$entry->setStyle(Label_Text::STYLE_TextValueSmall);
-			$entry->setHorizontalAlign($entry::LEFT);
-			$entry->setPosition($downloadPosX, $height * -0.39);
-			$entry->setTextSize(1);
-			$entry->setSize($width * 0.35, 4);
-			$entry->setName("Value");
-
-			$downloadPosX += $width * 0.35 + 10;
-
-			//Search for Map-Name
-			$mapNameButton = $this->maniaControl->getManialinkManager()->getElementBuilder()->buildRoundTextButton(
-				'Download',
-				18,
-				5,
-				self::ACTION_DOWNLOAD_FILE
-			);
-			$frame->addChild($mapNameButton);
-			$mapNameButton->setPosition($downloadPosX, $height * -0.39);
-
 		} else {
 			$errorLabel = new Label();
-			$frame->addChild($errorLabel);
-			$errorLabel->setY(20)->setTextColor('f30')->setText('No access to the directory.')->setTranslate(true);
+			$repositionnedFrame->addChild($errorLabel);
+			$errorLabel->setPosition($innerWidth * 0.5, $innerHeigth * -0.5);
+			$errorLabel->setTextColor('f30');
+			$errorLabel->setText('No access to the directory.');
+			$errorLabel->setTranslate(true);
 		}
 
 		$this->maniaControl->getManialinkManager()->displayWidget($maniaLink, $player, self::WIDGET_NAME);
@@ -302,6 +392,15 @@ class DirectoryBrowser implements ManialinkPageAnswerListener {
 				}
 			}
 		}
+
+		uasort($mapFiles, function ($a, $b) {
+			$aIsDir = (substr($a, -1) === DIRECTORY_SEPARATOR);
+			$bIsDir = (substr($b, -1) === DIRECTORY_SEPARATOR);
+
+			if ($aIsDir && !$bIsDir) return -1;
+			else if (!$aIsDir && $bIsDir) return 1;
+			return 0;
+		});
 		return $mapFiles;
 	}
 
@@ -358,9 +457,23 @@ class DirectoryBrowser implements ManialinkPageAnswerListener {
 	 */
 	public function handleInspectFile(array $actionCallback, Player $player) {
 		$actionName = $actionCallback[1][2];
-		$fileName   = substr($actionName, strlen(self::ACTION_INSPECT_FILE));
-		// TODO: show inspect file view
-		var_dump($fileName);
+		$fileName   = base64_decode(substr($actionName, strlen(self::ACTION_INSPECT_FILE)));
+		$folderPath = $player->getCache($this, self::CACHE_FOLDER_PATH);
+		$filePath   = $folderPath . $fileName;
+
+		$mapsFolder       = $this->maniaControl->getServer()->getDirectory()->getMapsFolder();
+		$relativeFilePath = substr($filePath, strlen($mapsFolder));
+
+		try {
+			$message = '';
+			$infos = $this->maniaControl->getClient()->getMapInfo($relativeFilePath);
+			foreach ($infos as $key => $value) {
+				$message .= '$<$0c0' . $key .':$> '. $value . PHP_EOL;
+			}
+			$this->maniaControl->getChat()->sendChat($message, $player->login, false);
+		} catch (\Throwable $th) {
+			$this->maniaControl->getChat()->sendError("can't fetch map info: ". $th->getMessage(), $player->login);
+		}
 	}
 
 	/**
@@ -371,7 +484,7 @@ class DirectoryBrowser implements ManialinkPageAnswerListener {
 	 */
 	public function handleAddFile(array $actionCallback, Player $player) {
 		$actionName = $actionCallback[1][2];
-		$fileName   = substr($actionName, strlen(self::ACTION_ADD_FILE));
+		$fileName   = base64_decode(substr($actionName, strlen(self::ACTION_ADD_FILE)));
 		$folderPath = $player->getCache($this, self::CACHE_FOLDER_PATH);
 		$filePath   = $folderPath . $fileName;
 
@@ -430,7 +543,7 @@ class DirectoryBrowser implements ManialinkPageAnswerListener {
 	 */
 	public function handleEraseFile(array $actionCallback, Player $player) {
 		$actionName = $actionCallback[1][2];
-		$fileName   = substr($actionName, strlen(self::ACTION_ERASE_FILE));
+		$fileName   = base64_decode(substr($actionName, strlen(self::ACTION_ERASE_FILE)));
 		$folderPath = $player->getCache($this, self::CACHE_FOLDER_PATH);
 		$filePath   = $folderPath . $fileName;
 		if (@unlink($filePath)) {
@@ -449,7 +562,33 @@ class DirectoryBrowser implements ManialinkPageAnswerListener {
 		}
 	}
 
+	/**
+	 * Handle 'CreateFolder' page action
+	 *
+	 * @param array  $actionCallback
+	 * @param Player $player
+	 */
+	public function handleCreateFolder(array $actionCallback, Player $player) {
+		$name = trim($actionCallback[1][3][0]["Value"]);
 
+		var_dump($actionCallback);
+		if ($name === "") return;
+
+		$folderPath = $player->getCache($this, self::CACHE_FOLDER_PATH);
+		if (mkdir($folderPath . $name, 755, true)) {
+			$message = "Successfully created directory ".  $name;
+			$this->maniaControl->getChat()->sendSuccess($message, $player);
+			Logger::log($message . " by " . $player->nickname);
+
+			$this->showManiaLink($player, $name);
+		} else {
+			$message = "Failed to create directory ".  $name;
+			$this->maniaControl->getChat()->sendError($message, $player);
+			Logger::logError($message . " by " . $player->nickname);
+
+			$this->showManiaLink($player);
+		}
+	}
 
 	/**
 	 * Handle 'handleDownloadFile' page action
@@ -458,7 +597,8 @@ class DirectoryBrowser implements ManialinkPageAnswerListener {
 	 * @param Player $player
 	 */
 	public function handleDownloadFile(array $actionCallback, Player $player) {
-		$url = trim($actionCallback[1][3][0]["Value"]);
+		$url = trim($actionCallback[1][3][1]["Value"]);
+		if ($url === "") return;
 		$folderPath = $player->getCache($this, self::CACHE_FOLDER_PATH);
 		if (filter_var($url, FILTER_VALIDATE_URL)) {
 			
@@ -471,92 +611,124 @@ class DirectoryBrowser implements ManialinkPageAnswerListener {
 					return;
 				}
 				$filePath = "";
-				
-				$contentdispositionheader = "";
-				foreach ($headers as $key => $value) {
-					if (strtolower($key) === "content-disposition") {
-						$contentdispositionheader = urldecode($value);
-						break;
-					}
-				}
 
-				if ($contentdispositionheader !== "") {
-					$value = $contentdispositionheader;
+				$finfo = new finfo(FILEINFO_MIME_TYPE);
+				if ($finfo->buffer($file) === "application/zip") {
+					$zip = new ZipArchive();
 
-					if (strpos($value, ';') !== false) {
-						
-						list($type, $attr_parts) = explode(';', $value, 2);
-				
-						$attr_parts = explode(';', $attr_parts);
-						$attributes = array();
-				
-						foreach ($attr_parts as $part) {
-							if (strpos($part, '=') === false) {
-								continue;
-							}
-				
-							list($key, $value) = explode('=', $part, 2);
-				
-							$attributes[trim($key)] = trim($value);
-						}
-				
-						$attrNames = ['filename*' => true, 'filename' => false];
-						$filename = null;
-						$isUtf8 = false;
-						foreach ($attrNames as $attrName => $utf8) {
-							if (!empty($attributes[$attrName])) {
-								$filename = trim($attributes[$attrName]);
-								$isUtf8 = $utf8;
-								break;
-							}
-						}
+					// Create a temporary file
+					$tempFile = tempnam(sys_get_temp_dir(), 'zip');
+					file_put_contents($tempFile, $file);
 
-						if ($filename !== null) {
-							if ($isUtf8 && strpos($filename, "utf-8''") === 0 && $filename = substr($filename, strlen("utf-8''"))) {
-								$filePath = $folderPath . FileUtil::getClearedFileName(rawurldecode($filename));
-							}
-							if (substr($filename, 0, 1) === '"' && substr($filename, -1, 1) === '"') {
-								$filePath = $folderPath . substr($filename, 1, -1);
-							} else {
-								$filePath = $folderPath . $filename;
-							}
-						}
-					}
+					$open = $zip->open($tempFile);
 
-					if (!$this->isMapFileName($filePath)) {
-						$message = "File is not a map: " . $filename;
+					if ($open === true) {
+						$zip->extractTo($folderPath);
+						$zip->close();
+						$message = "Succesfully extracted zip archive from ". $url;
+						$this->maniaControl->getChat()->sendSuccess($message, $player);
+						Logger::log($message . " by " . $player->nickname);
+					} else {
+						$message = "Cannot extract archive from ". $url;
 						$this->maniaControl->getChat()->sendError($message, $player);
-						Logger::logError($message);
-						return;
+						Logger::logError($message . " by " . $player->nickname);
 					}
+					// Clean up the temporary file
+					unlink($tempFile);
 				} else {
-					$path = parse_url($url, PHP_URL_PATH);
+					$fileName = "";
 
-					// extracted basename
-					$filePath = $folderPath . basename($path);
-
-					if (!$this->isMapFileName($filePath)) {
-						$filePath .= ".Map.Gbx";
-					}
-				}
-
-				if ($filePath != "") {
-					if (file_exists($filePath)) {
-						$index = 1;
-						while (file_exists(substr($filePath, 0, -8) . "-" . $index . ".Map.Gbx")) {
-							$index++;
+					$contentdispositionheader = "";
+					foreach ($headers as $key => $value) {
+						if (strtolower($key) === "content-disposition") {
+							$contentdispositionheader = urldecode($value);
+							break;
 						}
-						$filePath = substr($filePath, 0, -8) . "-" . $index . ".Map.Gbx";
 					}
-					$bytes = file_put_contents($filePath, $file);
-					if (!$bytes || $bytes <= 0) {
-						$message = "Impossible to determine filename";
-						$this->maniaControl->getChat()->sendError($message, $player);
-						Logger::logError($message);
-						return;
+	
+					if ($contentdispositionheader !== "") {
+						$value = $contentdispositionheader;
+	
+						if (strpos($value, ';') !== false) {
+							
+							list($type, $attr_parts) = explode(';', $value, 2);
+					
+							$attr_parts = explode(';', $attr_parts);
+							$attributes = array();
+					
+							foreach ($attr_parts as $part) {
+								if (strpos($part, '=') === false) {
+									continue;
+								}
+					
+								list($key, $value) = explode('=', $part, 2);
+					
+								$attributes[trim($key)] = trim($value);
+							}
+					
+							$fileName = null;
+
+							if (array_key_exists('filename*', $attributes)) {
+								$fileName = trim($attributes['filename*']);
+
+								// remove prefix if needed
+								if (strpos(strtolower($fileName), "utf-8''") === 0) {
+									$fileName = substr($fileName, strlen("utf-8''"));
+								}
+							} else if (array_key_exists('filename', $attributes)) {
+								$fileName = trim($attributes['filename']);
+							}
+
+							if ($fileName !== null) {
+								if (substr($fileName, 0, 1) === '"' && substr($fileName, -1, 1) === '"') {
+									$fileName = substr($fileName, 1, -1);
+								}
+
+								$filePath = $folderPath . FileUtil::getClearedFileName($fileName);
+							}
+						}
+	
+						if (!$this->isMapFileName($filePath)) {
+							$message = "File is not a map: " . $fileName;
+							$this->maniaControl->getChat()->sendError($message, $player);
+							Logger::logError($message);
+							return;
+						}
+					} else {
+						$path = parse_url($url, PHP_URL_PATH);
+	
+						// extracted basename
+						$fileName = basename($path);
+	
+						if (!$this->isMapFileName($fileName)) {
+							$fileName .= ".Map.Gbx";
+						}
+						$filePath = $folderPath . $fileName;
+					}
+	
+					if ($filePath != "") {
+						if (file_exists($filePath)) {
+							$index = 1;
+							while (file_exists(substr($filePath, 0, -8) . "-" . $index . ".Map.Gbx")) {
+								$index++;
+							}
+							$filePath = substr($filePath, 0, -8) . "-" . $index . ".Map.Gbx";
+						}
+						$bytes = file_put_contents($filePath, $file);
+						if (!$bytes || $bytes <= 0) {
+							$message = "Failed to write file " . $filePath;
+							$this->maniaControl->getChat()->sendError($message, $player);
+							Logger::logError($message . " by " . $player->nickname);
+							return;
+						}
+
+						$message = "Succesfully downloaded the map  ". $fileName;
+						$this->maniaControl->getChat()->sendSuccess($message, $player);
+						Logger::log($message . " by " . $player->nickname);
 					}
 				}
-				$this->showManiaLink($player, $folderPath);
+
+				$this->showManiaLink($player);
 			});
 
 			$asyncHttpRequest->getData();

core/Maps/MapCommands.php

@@ -214,7 +214,7 @@ class MapCommands implements CommandListener, ManialinkPageAnswerListener, Callb
 			return;
 		}
 
-		$params = explode(' ', $chatCallback[1][2], 2);
+		$params = explode(' ', trim($chatCallback[1][2]), 2);
 		if (count($params) < 2) {
 			$message = $this->maniaControl->getChat()->formatMessage(
 				'Usage example: %s',

core/Maps/MapList.php

@@ -135,7 +135,7 @@ class MapList implements ManialinkPageAnswerListener, CallbackListener {
 
 		$width   = $this->maniaControl->getManialinkManager()->getStyleManager()->getListWidgetsWidth();
 		$height  = $this->maniaControl->getManialinkManager()->getStyleManager()->getListWidgetsHeight();
-		$buttonY = $height * -0.39;
+		$buttonY = $height * -0.5 + 5;
 
 		if ($pageIndex < 0) {
 			$pageIndex = (int) $player->getCache($this, self::CACHE_CURRENT_PAGE);
@@ -178,7 +178,7 @@ class MapList implements ManialinkPageAnswerListener, CallbackListener {
 				self::ACTION_CLEAR_MAPQUEUE
 			);
 			$frame->addChild($clearMapQueueButton);
-			$clearMapQueueButton->setPosition($width/2 - 5 - 30/2, $buttonY);
+			$clearMapQueueButton->setPosition($width * 0.5 - 30/2 - 27, $buttonY);
 		}
 
 		if ($this->maniaControl->getAuthenticationManager()->checkPermission($player, MapManager::SETTING_PERMISSION_CHECK_UPDATE)) {
@@ -190,7 +190,7 @@ class MapList implements ManialinkPageAnswerListener, CallbackListener {
 				$this->maniaControl->getManialinkManager()->getIconManager()->getIcon(IconManager::MX_ICON_GREEN)
 			);
 			$frame->addChild($mxCheckForUpdatesButton);
-			$mxCheckForUpdatesButton->setPosition($width/2 - 5 - 30 - 5 - 36/2, $buttonY);
+			$mxCheckForUpdatesButton->setPosition($width * 0.5 - 36/2 - 57, $buttonY);
 		}
 
 		if ($this->maniaControl->getAuthenticationManager()->checkPermission($player, MapManager::SETTING_PERMISSION_ADD_MAP)) {
@@ -201,7 +201,7 @@ class MapList implements ManialinkPageAnswerListener, CallbackListener {
 				DirectoryBrowser::ACTION_SHOW
 			);
 			$frame->addChild($browserButton);
-			$browserButton->setPosition(-$width/2 + 5 + 36/2, $buttonY);
+			$browserButton->setPosition($width * -0.5 + 36 / 2 + 5, $buttonY);
 		}
 
 		// Headline
@@ -214,7 +214,7 @@ class MapList implements ManialinkPageAnswerListener, CallbackListener {
 		$labelLine->addLabelEntryText('Id', $posX + 5);
 		$labelLine->addLabelEntryText('Mx Id', $posX + 10);
 		$labelLine->addLabelEntryText('Map Name', $posX + 20);
-		$labelLine->addLabelEntryText('Author', $posX + 68);
+		$labelLine->addLabelEntryText('Author', $width / 2 - 56);
 		$labelLine->addLabelEntryText('Actions', $width / 2 - 16);
 		$labelLine->setY(-7);
 		$labelLine->render();
@@ -224,6 +224,7 @@ class MapList implements ManialinkPageAnswerListener, CallbackListener {
 
 		// Predefine description Label
 		$descriptionLabel = $this->maniaControl->getManialinkManager()->getStyleManager()->getDefaultDescriptionLabel();
+		$descriptionLabel->setY($height * -0.5 + 12);
 		$frame->addChild($descriptionLabel);
 
 		$queuedMaps = $this->maniaControl->getMapManager()->getMapQueue()->getQueuedMapsRanking();
@@ -284,7 +285,7 @@ class MapList implements ManialinkPageAnswerListener, CallbackListener {
 				$mxQuad->setSize(3, 3);
 				$mxQuad->setImageUrl($mxIcon);
 				$mxQuad->setImageFocusUrl($mxIconHover);
-				$mxQuad->setX($posX + 65);
+				$mxQuad->setX($width / 2 - 63);
 				$mxQuad->setUrl($map->mx->pageurl);
 				$mxQuad->setZ(0.01);
 				$description = 'View ' . $map->getEscapedName() . ' on Mania-Exchange';
@@ -296,7 +297,7 @@ class MapList implements ManialinkPageAnswerListener, CallbackListener {
 					$mxQuad->setSize(3, 3);
 					$mxQuad->setImageUrl($mxIconGreen);
 					$mxQuad->setImageFocusUrl($mxIconGreenHover);
-					$mxQuad->setX($posX + 62);
+					$mxQuad->setX($width / 2 - 60);
 					$mxQuad->setUrl($map->mx->pageurl);
 					$mxQuad->setZ(0.01);
 					$description = 'Update for ' . $map->getEscapedName() . ' available on Mania-Exchange!';
@@ -313,12 +314,12 @@ class MapList implements ManialinkPageAnswerListener, CallbackListener {
 			$labelLine = new LabelLine($mapFrame);
 			$labelLine->addLabelEntryText($mapListId, $posX + 5, 5);
 			$labelLine->addLabelEntryText($mxId, $posX + 10, 10);
-			$labelLine->addLabelEntryText(Formatter::stripDirtyCodes($map->name), $posX + 20, 42);
-
+			$labelLine->addLabelEntryText(Formatter::stripDirtyCodes($map->name), $posX + 20,  $width - 20 - 56 - 5);
+			
 			$label = new Label_Text();
 			$mapFrame->addChild($label);
 			$label->setText($map->authorNick);
-			$label->setX($posX + 68);
+			$label->setX($width / 2 - 56);
 			$label->setSize(47, 0);
 			$label->setAction(MapCommands::ACTION_SHOW_AUTHOR . $map->authorLogin);
 			$description = 'Click to checkout all maps by $<' . $map->authorLogin . '$>!';
@@ -461,7 +462,7 @@ class MapList implements ManialinkPageAnswerListener, CallbackListener {
 	 */
 	public function getMapPerPage() {
 		$pageheight = $this->maniaControl->getManialinkManager()->getStyleManager()->getListWidgetsHeight();
-		return floor(($pageheight - 16 - $pageheight * 0.11) / 4);
+		return floor(($pageheight - 26) / 4);
 	}
 
 	/**

core/Maps/MapManager.php

@@ -227,7 +227,7 @@ class MapManager implements CallbackListener, CommunicationListener, UsageInform
 	 *
 	 * @param ?Setting $setting
 	 */
-	public function updateSettings(Setting $setting = null) {
+	public function updateSettings(?Setting $setting = null) {
 		if (!isset($setting) || !$setting->belongsToClass($this)) return;
 
 		if ($setting->setting === self::SETTING_ENABLE_MX) {
@@ -378,7 +378,7 @@ class MapManager implements CallbackListener, CommunicationListener, UsageInform
 	public function addMapFromMx($mapId, $login, $update = false) {
 		if (is_numeric($mapId)) {
 			// Check if map exists
-			$this->maniaControl->getMapManager()->getMXManager()->fetchMapInfo($mapId, function (MXMapInfo $mapInfo = null) use (
+			$this->maniaControl->getMapManager()->getMXManager()->fetchMapInfo($mapId, function (?MXMapInfo $mapInfo = null) use (
 				&$login, &$update
 			) {
 				if (!$mapInfo || !isset($mapInfo->uploaded)) {

core/Maps/MapQueue.php

@@ -115,7 +115,7 @@ class MapQueue implements CallbackListener, CommandListener, UsageInformationAbl
 	 *
 	 * @param Player $admin |null
 	 */
-	public function clearMapQueue(Player $admin = null) {
+	public function clearMapQueue(?Player $admin = null) {
 		if ($admin && !$this->maniaControl->getAuthenticationManager()->checkPermission($admin, self::SETTING_PERMISSION_CLEAR_MAPQUEUE)) {
 			$this->maniaControl->getAuthenticationManager()->sendNotAllowed($admin);
 			return;

core/Players/Player.php

@@ -196,6 +196,23 @@ class Player implements Dumpable, UsageInformationAble {
 		return ($this->pid <= 0 || substr($this->login, 0, 1) === '*');
 	}
 
+	/**
+	 * Get AccountId from Login
+	 *
+	 * @api
+	 * @return string
+	 */
+	public function getAccountId() {
+		if (strlen($this->login) !== 22) return $this->login;
+
+		$login = str_pad($this->login, 24, "=", STR_PAD_RIGHT);
+
+		$login = str_replace("_","/", str_replace("-","+", $login));
+		$login = base64_decode($login);
+
+		return vsprintf("%s%s-%s-%s-%s-%s%s%s", str_split(bin2hex($login), 4));
+	}
+
 	/**
 	 * Get province
 	 *

core/Plugins/InstallMenu.php

@@ -79,8 +79,9 @@ class InstallMenu implements ConfiguratorMenu, ManialinkPageAnswerListener {
 		// Config
 		$pagerSize   = 9.;
 		$entryHeight = 5.;
-		$pageMaxCount = floor(($height * 0.85) / $entryHeight);
-		$posY        = 0.;
+		$innerWidth = $width - 4;
+		$innerHeight = $height - 16;
+		$pageMaxCount = floor($innerHeight / $entryHeight);
 		$pageFrame   = null;
 
 		$url = ManiaControl::URL_WEBSERVICE . 'plugins';
@@ -106,24 +107,42 @@ class InstallMenu implements ConfiguratorMenu, ManialinkPageAnswerListener {
 			// Pagers
 			$pagerPrev = new Quad_Icons64x64_1();
 			$frame->addChild($pagerPrev);
-			$pagerPrev->setPosition($width * 0.39, $height * -0.44, 2)->setSize($pagerSize, $pagerSize)->setSubStyle($pagerPrev::SUBSTYLE_ArrowPrev);
+			$pagerPrev->setPosition($width * 0.5 - 12, $height * -0.5 + 5, 2);
+			$pagerPrev->setSize($pagerSize, $pagerSize);
+			$pagerPrev->setSubStyle($pagerPrev::SUBSTYLE_ArrowPrev);
 
 			$pagerNext = clone $pagerPrev;
 			$frame->addChild($pagerNext);
-			$pagerNext->setX($width * 0.45);
+			$pagerNext->setPosition($width * 0.5 - 5, $height * -0.5 + 5, 2);
 			$pagerNext->setSubStyle($pagerPrev::SUBSTYLE_ArrowNext);
 
 			$pageCountLabel = new Label_Text();
 			$frame->addChild($pageCountLabel);
-			$pageCountLabel->setHorizontalAlign($pageCountLabel::RIGHT)->setPosition($width * 0.35, $height * -0.44, 1)->setStyle($pageCountLabel::STYLE_TextTitle1)->setTextSize(2);
+			$pageCountLabel->setHorizontalAlign($pageCountLabel::RIGHT);
+			$pageCountLabel->setPosition($width * 0.5 - 16, $height * -0.5 + 5, 1);
+			$pageCountLabel->setStyle($pageCountLabel::STYLE_TextTitle1);
+			$pageCountLabel->setTextSize(2);
 
-			$paging->addButtonControl($pagerNext)->addButtonControl($pagerPrev)->setLabel($pageCountLabel);
+			$paging->addButtonControl($pagerNext);
+			$paging->addButtonControl($pagerPrev);
+			$paging->setLabel($pageCountLabel);
+
+			$repositionnedFrame = new Frame();
+			$frame->addChild($repositionnedFrame);
+			$repositionnedFrame->setPosition($width * -0.5, $height * 0.5);
 
 			// Info tooltip
 			$infoTooltipLabel = new Label();
-			$frame->addChild($infoTooltipLabel);
-			$infoTooltipLabel->setAlign($infoTooltipLabel::LEFT, $infoTooltipLabel::TOP)->setPosition($width * -0.45, $height * -0.22)->setSize($width * 0.7, $entryHeight)->setTextSize(1)->setTranslate(true)->setVisible(false)->setAutoNewLine(true)->setMaxLines(5);
-
+			$repositionnedFrame->addChild($infoTooltipLabel);
+			$infoTooltipLabel->setAlign($infoTooltipLabel::LEFT, $infoTooltipLabel::TOP);
+			$infoTooltipLabel->setPosition(3, $height * -1 + 16);
+			$infoTooltipLabel->setSize($width - 30, 20);
+			$infoTooltipLabel->setTextSize(1);
+			$infoTooltipLabel->setTranslate(true);
+			$infoTooltipLabel->setVisible(false);
+			$infoTooltipLabel->setAutoNewLine(true);
+			$infoTooltipLabel->setMaxLines(5);
+			
 			// List plugins
 			foreach ($pluginList as $plugin) {
 				if ($this->maniaControl->getPluginManager()->isPluginIdInstalled($plugin->id)) {
@@ -139,18 +158,23 @@ class InstallMenu implements ConfiguratorMenu, ManialinkPageAnswerListener {
 				if ($index % $pageMaxCount === 0) {
 					// New page
 					$pageFrame = new Frame();
-					$frame->addChild($pageFrame);
+					$repositionnedFrame->addChild($pageFrame);
 					$paging->addPageControl($pageFrame);
-					$posY = $height * 0.41;
+					$index = 1;
 				}
 
 				$pluginFrame = new Frame();
 				$pageFrame->addChild($pluginFrame);
-				$pluginFrame->setY($posY);
+				$pluginFrame->setY($entryHeight * $index * -1);
 
 				$nameLabel = new Label_Text();
 				$pluginFrame->addChild($nameLabel);
-				$nameLabel->setHorizontalAlign($nameLabel::LEFT)->setX($width * -0.46)->setSize($width * 0.62, $entryHeight)->setStyle($nameLabel::STYLE_TextCardSmall)->setTextSize(2)->setText($plugin->name);
+				$nameLabel->setHorizontalAlign($nameLabel::LEFT);
+				$nameLabel->setX(2);
+				$nameLabel->setSize($innerWidth * 0.6, $entryHeight);
+				$nameLabel->setStyle($nameLabel::STYLE_TextCardSmall);
+				$nameLabel->setTextSize(2);
+				$nameLabel->setText($plugin->name);
 
 				$description = "Author: {$plugin->author}\nVersion: {$plugin->currentVersion->version}\nDesc: {$plugin->description}";
 				$infoTooltipLabel->setLineSpacing(1);
@@ -160,7 +184,7 @@ class InstallMenu implements ConfiguratorMenu, ManialinkPageAnswerListener {
 					// Incompatibility label
 					$infoLabel = new Label_Text();
 					$pluginFrame->addChild($infoLabel);
-					$infoLabel->setHorizontalAlign($infoLabel::RIGHT)->setX($width * 0.47)->setSize($width * 0.33, $entryHeight)->setTextSize(1)->setTextColor('f30');
+					$infoLabel->setHorizontalAlign($infoLabel::RIGHT)->setX($innerWidth * 0.47)->setSize($innerWidth * 0.33, $entryHeight)->setTextSize(1)->setTextColor('f30');
 					if ($plugin->currentVersion->min_mc_version > ManiaControl::VERSION) {
 						$infoLabel->setText("Needs at least MC-Version '{$plugin->currentVersion->min_mc_version}'");
 					} else {
@@ -170,17 +194,24 @@ class InstallMenu implements ConfiguratorMenu, ManialinkPageAnswerListener {
 					// Install button
 					$installButton = new Label_Button();
 					$pluginFrame->addChild($installButton);
-					$installButton->setHorizontalAlign($installButton::RIGHT)->setX($width * 0.47)->setStyle($installButton::STYLE_CardButtonSmall)->setText('Install')->setTranslate(true)->setAction(self::ACTION_PREFIX_INSTALL_PLUGIN . $plugin->id);
+					$installButton->setHorizontalAlign($installButton::RIGHT);
+					$installButton->setSize($innerWidth * 0.3, $entryHeight);
+					$installButton->setX($innerWidth - 4);
+					$installButton->setStyle($installButton::STYLE_CardButtonSmall);
+					$installButton->setText('Install');
+					$installButton->setTranslate(true);
+					$installButton->setAction(self::ACTION_PREFIX_INSTALL_PLUGIN . $plugin->id);
 
 					if ($plugin->currentVersion->verified > 0) {
 						// Suggested quad
 						$suggestedQuad = new Quad_Icons64x64_1();
 						$pluginFrame->addChild($suggestedQuad);
-						$suggestedQuad->setPosition($width * 0.45, $entryHeight * 0.12, 2)->setSize(4, 4)->setSubStyle($suggestedQuad::SUBSTYLE_StateSuggested);
+						$suggestedQuad->setPosition($innerWidth - 2, $entryHeight * 0.12, 2);
+						$suggestedQuad->setSize(4, 4);
+						$suggestedQuad->setSubStyle($suggestedQuad::SUBSTYLE_StateSuggested);
 					}
 				}
 
-				$posY -= $entryHeight;
 				$index++;
 			}
 		}

core/Plugins/PluginManager.php

@@ -400,7 +400,7 @@ class PluginManager {
 			return false;
 		}
 		array_push($this->pluginClasses, $pluginClass);
-		sort($this->pluginClasses);
+		natcasesort($this->pluginClasses);
 		return true;
 	}
 

core/Plugins/PluginMenu.php

@@ -107,18 +107,18 @@ class PluginMenu implements CallbackListener, ConfiguratorMenu, ManialinkPageAns
 		// Config
 		$pagerSize    = 9.;
 		$entryHeight  = 5.;
-		$pageMaxCount = floor(($height * 0.70) / $entryHeight);
+		$pageMaxCount = floor(($height - 16) / $entryHeight);
 
 		// Pagers
 		$pagerPrev = new Quad_Icons64x64_1();
 		$frame->addChild($pagerPrev);
-		$pagerPrev->setPosition($width * 0.39, $height * -0.44, 2);
+		$pagerPrev->setPosition($width * 0.5 - 12, $height * -0.5 + 5, 2);
 		$pagerPrev->setSize($pagerSize, $pagerSize);
 		$pagerPrev->setSubStyle(Quad_Icons64x64_1::SUBSTYLE_ArrowPrev);
 
 		$pagerNext = new Quad_Icons64x64_1();
 		$frame->addChild($pagerNext);
-		$pagerNext->setPosition($width * 0.45, $height * -0.44, 2);
+		$pagerNext->setPosition($width * 0.5 - 5, $height * -0.5 + 5, 2);
 		$pagerNext->setSize($pagerSize, $pagerSize);
 		$pagerNext->setSubStyle(Quad_Icons64x64_1::SUBSTYLE_ArrowNext);
 
@@ -128,7 +128,7 @@ class PluginMenu implements CallbackListener, ConfiguratorMenu, ManialinkPageAns
 		$pageCountLabel = new Label_Text();
 		$frame->addChild($pageCountLabel);
 		$pageCountLabel->setHorizontalAlign($pageCountLabel::RIGHT);
-		$pageCountLabel->setPosition($width * 0.35, $height * -0.44, 1);
+		$pageCountLabel->setPosition($width * 0.5 - 16, $height * -0.5 + 5, 1);
 		$pageCountLabel->setStyle($pageCountLabel::STYLE_TextTitle1);
 		$pageCountLabel->setTextSize(2);
 
@@ -158,28 +158,57 @@ class PluginMenu implements CallbackListener, ConfiguratorMenu, ManialinkPageAns
 		usort($pluginClasses, function ($pluginClassA, $pluginClassB) {
 			/** @var Plugin $pluginClassA */
 			/** @var Plugin $pluginClassB */
-			return strcmp($pluginClassA::getName(), $pluginClassB::getName());
+			return strcasecmp($pluginClassA::getName(), $pluginClassB::getName());
 		});
 
+        $repositionnedFrame = new Frame();
+        $frame->addChild($repositionnedFrame);
+        $repositionnedFrame->setPosition($width * -0.5, $height * 0.5);
+
+        $pagesFrame = new Frame();
+        $repositionnedFrame->addChild($pagesFrame);
+        $pagesFrame->setY(-1);
+
+		$descriptionLabel = new Label();
+		$repositionnedFrame->addChild($descriptionLabel);
+		$descriptionLabel->setAlign($descriptionLabel::LEFT, $descriptionLabel::TOP);
+		$descriptionLabel->setPosition(3, $height * -1 + 16);
+		$descriptionLabel->setSize($width - 30, 20);
+		$descriptionLabel->setTextSize(1);
+		$descriptionLabel->setTranslate(true);
+		$descriptionLabel->setVisible(false);
+		$descriptionLabel->setMaxLines(5);
+		$descriptionLabel->setLineSpacing(1);
+
+		$tooltip = new Label();
+		$repositionnedFrame->addChild($tooltip);
+		$tooltip->setAlign($descriptionLabel::LEFT, $descriptionLabel::TOP);
+		$tooltip->setPosition(3, $height * -1 + 5);
+		$tooltip->setSize($width - 30, 5);
+		$tooltip->setTextSize(1);
+		$tooltip->setTranslate(true);
+		$tooltip->setVisible(false);
+
+        $index = 0;
 		$pageFrame = null;
-		foreach ($pluginClasses as $index => $pluginClass) {
+		foreach ($pluginClasses as $pluginClass) {
 			/** @var Plugin $pluginClass */
 			if ($index % $pageMaxCount === 0) {
 				$pageFrame = new Frame();
-				$frame->addChild($pageFrame);
+				$pagesFrame->addChild($pageFrame);
 				$paging->addPageControl($pageFrame);
-				$posY = $height * 0.41;
+				$index = 1;
 			}
 
 			$active = $this->maniaControl->getPluginManager()->isPluginActive($pluginClass);
 
 			$pluginFrame = new Frame();
 			$pageFrame->addChild($pluginFrame);
-			$pluginFrame->setY($posY);
+			$pluginFrame->setY($entryHeight * $index * -1);
 
 			$activeQuad = new Quad_Icons64x64_1();
 			$pluginFrame->addChild($activeQuad);
-			$activeQuad->setPosition($width * -0.45, -0.1, 1);
+			$activeQuad->setPosition(5, 0, 1);
 			$activeQuad->setSize($entryHeight * 0.9, $entryHeight * 0.9);
 			if ($active) {
 				$activeQuad->setSubStyle($activeQuad::SUBSTYLE_LvlGreen);
@@ -190,59 +219,51 @@ class PluginMenu implements CallbackListener, ConfiguratorMenu, ManialinkPageAns
 			$nameLabel = new Label_Text();
 			$pluginFrame->addChild($nameLabel);
 			$nameLabel->setHorizontalAlign($nameLabel::LEFT);
-			$nameLabel->setX($width * -0.4);
-			$nameLabel->setSize($width * 0.5, $entryHeight);
+			$nameLabel->setX(7.5);
+			$nameLabel->setSize($width - 50, $entryHeight);
 			$nameLabel->setStyle($nameLabel::STYLE_TextCardSmall);
 			$nameLabel->setTextSize(2);
 			$nameLabel->setText($pluginClass::getName());
 
-			$descriptionLabel = new Label();
-			$pageFrame->addChild($descriptionLabel);
-			$descriptionLabel->setAlign($descriptionLabel::LEFT, $descriptionLabel::BOTTOM);
-			$descriptionLabel->setPosition($width * -0.45, $height * -0.45);
-			$descriptionLabel->setSize($width * 0.7, $entryHeight);
-			$descriptionLabel->setTextSize(2);
-			$descriptionLabel->setTranslate(true);
-			$descriptionLabel->setVisible(false);
-			$descriptionLabel->setMaxLines(5);
-			$descriptionLabel->setLineSpacing(1);
 			$description = "Author: {$pluginClass::getAuthor()}\nVersion: {$pluginClass::getVersion()}\nDesc: {$pluginClass::getDescription()}";
-			$nameLabel->addTooltipLabelFeature($descriptionLabel,$description);
+			$nameLabel->addTooltipLabelFeature($descriptionLabel, $description);
 
 			$quad = new Quad_Icons128x32_1();
 			$pluginFrame->addChild($quad);
 			$quad->setSubStyle($quad::SUBSTYLE_Settings);
-			$quad->setX(15);
+			$quad->setX($width - 37);
 			$quad->setZ(1);
 			$quad->setSize(5, 5);
 			$quad->setAction(self::ACTION_PREFIX_SETTINGS . $pluginClass);
+			$quad->addTooltipLabelFeature($tooltip, "Open settings of ". $pluginClass::getName());
 
 			$statusChangeButton = new Label_Button();
 			$pluginFrame->addChild($statusChangeButton);
 			$statusChangeButton->setHorizontalAlign($statusChangeButton::RIGHT);
-			$statusChangeButton->setX($width * 0.45);
-			$statusChangeButton->setStyle($statusChangeButton::STYLE_CardButtonSmall);
+			$statusChangeButton->setX($width - 6);
+			$statusChangeButton->setStyle($statusChangeButton::STYLE_CardButtonSmallS);
 			if ($active) {
-				$statusChangeButton->setTextPrefix('$f00');
 				$statusChangeButton->setText('Deactivate');
 				$statusChangeButton->setAction(self::ACTION_PREFIX_DISABLEPLUGIN . $pluginClass);
+				$statusChangeButton->addTooltipLabelFeature($tooltip, "Deactivate plugin ". $pluginClass::getName());
+
 			} else {
-				$statusChangeButton->setTextPrefix('a');
 				$statusChangeButton->setText('Activate');
 				$statusChangeButton->setAction(self::ACTION_PREFIX_ENABLEPLUGIN . $pluginClass);
+				$statusChangeButton->addTooltipLabelFeature($tooltip, "Activate plugin ". $pluginClass::getName());
 			}
 
 			if ($pluginUpdates && array_key_exists($pluginClass::getId(), $pluginUpdates)) {
 				$quadUpdate = new Quad_Icons128x128_1();
 				$pluginFrame->addChild($quadUpdate);
 				$quadUpdate->setSubStyle($quadUpdate::SUBSTYLE_ProfileVehicle);
-				$quadUpdate->setX($width / 2 - 3);
+				$quadUpdate->setX($width - 3.5);
 				$quadUpdate->setZ(2);
 				$quadUpdate->setSize(5, 5);
 				$quadUpdate->setAction(self::ACTION_PREFIX_UPDATEPLUGIN . $pluginClass);
 			}
 
-			$posY -= $entryHeight;
+			$index++;
 		}
 
 		if ($pluginUpdates) {
@@ -275,18 +296,36 @@ class PluginMenu implements CallbackListener, ConfiguratorMenu, ManialinkPageAns
 		$settings = $this->maniaControl->getSettingManager()->getSettingsByClass($settingClass);
 		$isunlinkable = $this->maniaControl->getSettingManager()->getSettingValue($this->maniaControl->getSettingManager(), SettingManager::SETTING_ALLOW_UNLINK_SERVER);
 
-		$posY                 = 0;
-		$index                = 0;
-		$settingHeight        = 5.;
-		$pageSettingsMaxCount = floor(($height * 0.70) / $settingHeight);
-		$pageFrame            = null;
+        $repositionnedFrame = new Frame();
+        $frame->addChild($repositionnedFrame);
+        $repositionnedFrame->setPosition($width * -0.5, $height * 0.5);
+
+        $pagesFrame = new Frame();
+        $repositionnedFrame->addChild($pagesFrame);
+        $pagesFrame->setY(-8.);
+
+        if ($isunlinkable) {
+            $pagesFrame->setX(5.); // move a bit the settings to diplay the padlocks
+            $innerWidth         = $width - 6;
+        } else {
+            $pagesFrame->setX(2.);
+            $innerWidth         = $width - 3;
+        } 
+
+		$innerHeight 			= $height - 8 - 10;
+		$settingHeight          = 5.;
+        $valueWidth         	= $innerWidth * 0.3;
+		$pageSettingsMaxCount   = floor($innerHeight / $settingHeight);
+		$index                  = 0;
+
+		$pageFrame              = null;
 
 		//Headline Label
 		$headLabel = new Label_Text();
-		$frame->addChild($headLabel);
+		$repositionnedFrame->addChild($headLabel);
 		$headLabel->setHorizontalAlign($headLabel::LEFT);
-		$headLabel->setPosition($width * -0.46, $height * 0.41);
-		$headLabel->setSize($width * 0.6, $settingHeight);
+		$headLabel->setPosition(3, -6);
+		$headLabel->setSize($width - 6, $settingHeight);
 		$headLabel->setStyle($headLabel::STYLE_TextCardSmall);
 		$headLabel->setTextSize(3);
 		$headLabel->setText($settingClass);
@@ -300,38 +339,37 @@ class PluginMenu implements CallbackListener, ConfiguratorMenu, ManialinkPageAns
 		foreach ($settings as $setting) {
 			if ($index % $pageSettingsMaxCount === 0) {
 				$pageFrame = new Frame();
-				$frame->addChild($pageFrame);
+				$pagesFrame->addChild($pageFrame);
 				$paging->addPageControl($pageFrame);
-				$posY = $height * 0.41 - $settingHeight * 1.5;
+                $index = 1;
 			}
 
 			$settingFrame = new Frame();
 			$pageFrame->addChild($settingFrame);
-			$settingFrame->setY($posY);
+			$settingFrame->setY($settingHeight * $index * -1);
 
 			$nameLabel = new Label_Text();
 			$settingFrame->addChild($nameLabel);
 			$nameLabel->setHorizontalAlign($nameLabel::LEFT);
-			$nameLabel->setX($width * -0.46);
-			$nameLabel->setSize($width * 0.6, $settingHeight);
+			$nameLabel->setSize($innerWidth * 0.6, $settingHeight);
 			$nameLabel->setStyle($nameLabel::STYLE_TextCardSmall);
 			$nameLabel->setTextSize(2);
 			$nameLabel->setText($setting->setting);
 			$nameLabel->setTextColor('fff');
 
 			$descriptionLabel = new Label_Text();
-			$pageFrame->addChild($descriptionLabel);
+			$repositionnedFrame->addChild($descriptionLabel);
 			$descriptionLabel->setHorizontalAlign($descriptionLabel::LEFT);
-			$descriptionLabel->setPosition(-0.45 * $width, $height * -0.38);
-			$descriptionLabel->setSize(0.9 * $width, $settingHeight);
-			$descriptionLabel->setTextSize(2);
+			$descriptionLabel->setPosition(3, $height * -1 + 10);
+			$descriptionLabel->setSize($innerWidth - 6, $settingHeight);
+			$descriptionLabel->setTextSize(1);
 			$descriptionLabel->setTranslate(true);
 			$nameLabel->addTooltipLabelFeature($descriptionLabel, $setting->description);
 
 			if ($isunlinkable) {
 				$quadlink = new Quad();
 				$settingFrame->addChild($quadlink);
-				$quadlink->setPosition(-0.48 * $width, 0.2, -0.01);
+				$quadlink->setPosition(-2, 0.2);
 				$quadlink->setSize(4, 4);
 				$quadlink->setColorize("ccccccaa");
 				$quadlink->setStyle("UICommon64_1");
@@ -342,15 +380,15 @@ class PluginMenu implements CallbackListener, ConfiguratorMenu, ManialinkPageAns
 			if ($setting->type === Setting::TYPE_BOOL) {
 				// Boolean checkbox
 				$quad = new Quad();
-				$quad->setPosition($width * 0.33, 0, -0.01);
+				$quad->setPosition($innerWidth - $valueWidth / 2, 0);
 				$quad->setSize(4, 4);
 				$checkBox = new CheckBox(self::ACTION_PREFIX_SETTING . $setting->index, $setting->value, $quad);
 				$settingFrame->addChild($checkBox);
 			} else if ($setting->type === Setting::TYPE_SET) {
 				// SET value picker
 				$label = new Label_Text();
-				$label->setX($width * 0.33);
-				$label->setSize($width * 0.3, $settingHeight * 0.9);
+				$label->setPosition($innerWidth - $valueWidth / 2, 0);
+				$label->setSize($valueWidth, $settingHeight * 0.9);
 				$label->setStyle($label::STYLE_TextValueSmall);
 				$label->setTextSize(1);
 				$valuePicker = new ValuePicker(self::ACTION_PREFIX_SETTING . $setting->index, $setting->set, $setting->value, $label);
@@ -359,27 +397,25 @@ class PluginMenu implements CallbackListener, ConfiguratorMenu, ManialinkPageAns
 				// Value entry
 				$entry = new Entry();
 				$settingFrame->addChild($entry);
-				$entry->setX($width * 0.33);
-				$entry->setSize($width * 0.3, $settingHeight * 0.9);
+				$entry->setPosition($innerWidth - $valueWidth / 2, 0);
+				$entry->setSize($valueWidth, $settingHeight * 0.9);
 				$entry->setTextSize(1);
-				$entry->setMaxLength(1000);
+				$entry->setMaxLength(1000); // Actions are limited to 1024 chars per field
 				$entry->setStyle(Label_Text::STYLE_TextValueSmall);
 				$entry->setName(self::ACTION_PREFIX_SETTING . $setting->index);
 				$entry->setDefault($setting->value);
 			}
 
-			$posY -= $settingHeight;
-
 			$index++;
 		}
 
 		$backButton = new Label_Button();
-		$frame->addChild($backButton);
+		$repositionnedFrame->addChild($backButton);
 		$backButton->setStyle($backButton::STYLE_CardMain_Quit);
 		$backButton->setHorizontalAlign($backButton::LEFT);
 		$backButton->setScale(0.5);
 		$backButton->setText('Back');
-		$backButton->setPosition(-$width / 2 + 5, -$height / 2 + 5);
+        $backButton->setPosition(5 , $height * -1 + 5);
 		$backButton->setAction(self::ACTION_BACK_TO_PLUGINS);
 
 		if ($isunlinkable) {
@@ -389,8 +425,8 @@ class PluginMenu implements CallbackListener, ConfiguratorMenu, ManialinkPageAns
 				5,
 				self::ACTION_PREFIX_MANAGE_SETTING_LINK . $settingClass
 			);
-			$frame->addChild($mapNameButton);
-			$mapNameButton->setPosition(-$width / 2 + 60, $height * -0.45);
+			$repositionnedFrame->addChild($mapNameButton);
+			$mapNameButton->setPosition(60, $height * -1 + 5);
 		}
 
 		return $frame;
@@ -410,10 +446,21 @@ class PluginMenu implements CallbackListener, ConfiguratorMenu, ManialinkPageAns
 	public function getManageSettingsLink(Frame $frame, $width, $height, Paging $paging, Player $player, $settingClass) {
 		$settings = $this->maniaControl->getSettingManager()->getSettingsByClass($settingClass);
 
-		$posY                 = 0;
-		$index                = 0;
-		$settingHeight        = 5.;
-		$pageSettingsMaxCount = floor(($height * 0.78) / $settingHeight);
+        $repositionnedFrame = new Frame();
+        $frame->addChild($repositionnedFrame);
+        $repositionnedFrame->setPosition($width * -0.5, $height * 0.5);
+
+        $pagesFrame = new Frame();
+        $repositionnedFrame->addChild($pagesFrame);
+        $pagesFrame->setY(-8.);
+        $pagesFrame->setX(5.);
+
+        $innerWidth         = $width - 6;
+        $innerHeight 			= $height - 8 - 10;
+		$settingHeight          = 5.;
+		$pageSettingsMaxCount   = floor($innerHeight / $settingHeight);
+		$index                  = 0;
+
 		$pageFrame            = null;
 
 		if (count($settings) > 64) {
@@ -423,10 +470,10 @@ class PluginMenu implements CallbackListener, ConfiguratorMenu, ManialinkPageAns
 
 		//Headline Label
 		$headLabel = new Label_Text();
-		$frame->addChild($headLabel);
+		$repositionnedFrame->addChild($headLabel);
 		$headLabel->setHorizontalAlign($headLabel::LEFT);
-		$headLabel->setPosition($width * -0.46, $height * 0.41);
-		$headLabel->setSize($width * 0.6, $settingHeight);
+		$headLabel->setPosition(3, -6);
+		$headLabel->setSize($width - 6, $settingHeight);
 		$headLabel->setStyle($headLabel::STYLE_TextCardSmall);
 		$headLabel->setTextSize(3);
 		$headLabel->setText($settingClass);
@@ -435,54 +482,51 @@ class PluginMenu implements CallbackListener, ConfiguratorMenu, ManialinkPageAns
 		foreach ($settings as $setting) {
 			if ($index % $pageSettingsMaxCount === 0) {
 				$pageFrame = new Frame();
-				$frame->addChild($pageFrame);
+				$pagesFrame->addChild($pageFrame);
 				$paging->addPageControl($pageFrame);
-				$posY = $height * 0.41 - $settingHeight * 1.5;
+                $index = 1;
 			}
 
 			$settingFrame = new Frame();
 			$pageFrame->addChild($settingFrame);
-			$settingFrame->setY($posY);
+			$settingFrame->setY($settingHeight * $index * -1);
 
 			$nameLabel = new Label_Text();
 			$settingFrame->addChild($nameLabel);
 			$nameLabel->setHorizontalAlign($nameLabel::LEFT);
-			$nameLabel->setX($width * -0.46);
-			$nameLabel->setSize($width * 0.6, $settingHeight);
+            $nameLabel->setSize($innerWidth * 0.6, $settingHeight);
 			$nameLabel->setStyle($nameLabel::STYLE_TextCardSmall);
 			$nameLabel->setTextSize(2);
 			$nameLabel->setText($setting->setting);
 			$nameLabel->setTextColor('fff');
 
 			$descriptionLabel = new Label_Text();
-			$pageFrame->addChild($descriptionLabel);
+			$repositionnedFrame->addChild($descriptionLabel);
 			$descriptionLabel->setHorizontalAlign($descriptionLabel::LEFT);
-			$descriptionLabel->setPosition(-0.45 * $width, $height * -0.40);
-			$descriptionLabel->setSize(0.9 * $width, $settingHeight);
-			$descriptionLabel->setTextSize(2);
+			$descriptionLabel->setPosition(3, $height * -1 + 10);
+			$descriptionLabel->setSize($innerWidth - 6, $settingHeight);
+			$descriptionLabel->setTextSize(1);
 			$descriptionLabel->setTranslate(true);
 			$nameLabel->addTooltipLabelFeature($descriptionLabel, $setting->description);
 
 			$quad = new Quad();
-			$quad->setPosition($width * 0.33, 0.2, -0.01);
+			$quad->setPosition($innerWidth - $innerWidth * 0.3 / 2, 0.2);
 			$quad->setSize(4, 4);
 			$checkBox = new CheckBox(self::ACTION_PREFIX_SETTING_LINK . $setting->index, $setting->linked, $quad);
 			$checkBox->setEnabledDesign("UICommon64_1", "Padlock_light");
 			$checkBox->setDisabledDesign("UICommon64_1", "Padlock_light");
 			$settingFrame->addChild($checkBox);
 
-			$posY -= $settingHeight;
-
 			$index++;
 		}
 
 		$backButton = new Label_Button();
-		$frame->addChild($backButton);
+		$repositionnedFrame->addChild($backButton);
 		$backButton->setStyle($backButton::STYLE_CardMain_Quit);
 		$backButton->setHorizontalAlign($backButton::LEFT);
 		$backButton->setScale(0.5);
 		$backButton->setText('Back');
-		$backButton->setPosition(-$width / 2 + 5, -$height / 2 + 5);
+        $backButton->setPosition(5 , $height * -1 + 5);
 		$backButton->setAction(self::ACTION_PREFIX_SETTINGS . $settingClass);
 
 		return $frame;

core/Server/ServerOptionsMenu.php

@@ -275,23 +275,40 @@ class ServerOptionsMenu implements CallbackListener, ConfiguratorMenu, TimerList
 		// Pagers
 		$pagerPrev = new Quad_Icons64x64_1();
 		$frame->addChild($pagerPrev);
-		$pagerPrev->setPosition($width * 0.39, $height * -0.44, 2)->setSize($pagerSize, $pagerSize)->setSubStyle($pagerPrev::SUBSTYLE_ArrowPrev);
+		$pagerPrev->setPosition($width * 0.5 - 12, $height * -0.5 + 5, 2);
+		$pagerPrev->setSize($pagerSize, $pagerSize);
+		$pagerPrev->setSubStyle($pagerPrev::SUBSTYLE_ArrowPrev);
 
 		$pagerNext = new Quad_Icons64x64_1();
 		$frame->addChild($pagerNext);
-		$pagerNext->setPosition($width * 0.45, $height * -0.44, 2)->setSize($pagerSize, $pagerSize)->setSubStyle($pagerNext::SUBSTYLE_ArrowNext);
+		$pagerNext->setPosition($width * 0.5 - 5, $height * -0.5 + 5, 2);
+		$pagerNext->setSize($pagerSize, $pagerSize);
+		$pagerNext->setSubStyle($pagerNext::SUBSTYLE_ArrowNext);
 
 		$pageCountLabel = new Label_Text();
 		$frame->addChild($pageCountLabel);
-		$pageCountLabel->setHorizontalAlign($pageCountLabel::RIGHT)->setPosition($width * 0.35, $height * -0.44, 1)->setStyle($pageCountLabel::STYLE_TextTitle1)->setTextSize(2);
+		$pageCountLabel->setHorizontalAlign($pageCountLabel::RIGHT);
+		$pageCountLabel->setPosition($width * 0.5 - 16, $height * -0.5 + 5, 1);
+		$pageCountLabel->setStyle($pageCountLabel::STYLE_TextTitle1);
+		$pageCountLabel->setTextSize(2);
 
-		$paging->addButtonControl($pagerNext)->addButtonControl($pagerPrev)->setLabel($pageCountLabel);
+		$paging->addButtonControl($pagerNext);
+		$paging->addButtonControl($pagerPrev);
+		$paging->setLabel($pageCountLabel);
+
+		$repositionnedFrame = new Frame();
+        $frame->addChild($repositionnedFrame);
+        $repositionnedFrame->setPosition($width * -0.5, $height * 0.5);
+
+        $pagesFrame = new Frame();
+        $repositionnedFrame->addChild($pagesFrame);
+        $pagesFrame->setY(-8.);
 
 		// Pages
 		$posY      = 0.;
 		$index     = 0;
 		$pageFrame = null;
-		$pageMaxCount = floor(($height * 0.8) / $optionHeight);
+		$pageMaxCount = floor(($height - 16) / $optionHeight);
 
 		foreach ($serverOptionsArray as $name => $value) {
 			// Continue on CurrentMaxPlayers...
@@ -299,9 +316,9 @@ class ServerOptionsMenu implements CallbackListener, ConfiguratorMenu, TimerList
 
 			if ($index % $pageMaxCount === 0) {
 				$pageFrame = new Frame();
-				$frame->addChild($pageFrame);
-				$posY = $height * 0.41;
+				$pagesFrame->addChild($pageFrame);
 				$paging->addPageControl($pageFrame);
+				$posY = 0.;
 			}
 
 			$optionsFrame = new Frame();
@@ -310,22 +327,36 @@ class ServerOptionsMenu implements CallbackListener, ConfiguratorMenu, TimerList
 
 			$nameLabel = new Label_Text();
 			$optionsFrame->addChild($nameLabel);
-			$nameLabel->setHorizontalAlign($nameLabel::LEFT)->setX($width * -0.46)->setSize($width * 0.4, $optionHeight)->setStyle($nameLabel::STYLE_TextCardSmall)->setTextSize($labelTextSize)->setText($name)->setTextColor('fff');
+			$nameLabel->setHorizontalAlign($nameLabel::LEFT);
+			$nameLabel->setX(2);
+			$nameLabel->setSize($width * 0.6, $optionHeight);
+			$nameLabel->setStyle($nameLabel::STYLE_TextCardSmall);
+			$nameLabel->setTextSize($labelTextSize)->setText($name);
+			$nameLabel->setTextColor('fff');
 
 			if (is_bool($value)) {
 				// Boolean checkbox
 				$quad = new Quad();
-				$quad->setPosition($width * 0.23, 0, -0.01)->setSize(4, 4);
+				$quad->setPosition($width - $width * 0.3 / 2 - 2, 0, -0.01);
+				$quad->setSize(4, 4);
 				$checkBox = new CheckBox(self::ACTION_PREFIX_OPTION . $name, $value, $quad);
 				$optionsFrame->addChild($checkBox);
 			} else {
 				// Other
 				$entry = new Entry();
 				$optionsFrame->addChild($entry);
-				$entry->setStyle(Label_Text::STYLE_TextValueSmall)->setX($width * 0.23)->setTextSize(1)->setSize($width * 0.48, $optionHeight * 0.9)->setName(self::ACTION_PREFIX_OPTION . $name)->setDefault($value);
+				$entry->setStyle(Label_Text::STYLE_TextValueSmall);
+				$entry->setX($width - $width *  0.3 / 2 - 2);
+				$entry->setTextSize(1);
+				$entry->setSize($width * 0.3, $optionHeight * 0.9);
+				$entry->setName(self::ACTION_PREFIX_OPTION . $name);
+				$entry->setDefault($value);
 
 				if ($name === 'Comment') {
-					$entry->setSize($width * 0.48, $optionHeight * 3. + $optionHeight * 0.9)->setAutoNewLine(true)->setVerticalAlign($entry::TOP)->setY($optionHeight * 1.5 + 2.5);
+					$entry->setSize($width * 0.3, $optionHeight * 3. + $optionHeight * 0.9);
+					$entry->setAutoNewLine(true);
+					$entry->setVerticalAlign($entry::TOP);
+					$entry->setY($optionHeight * 1.5 + 2.5);
 					$optionsFrame->setY($posY - $optionHeight * 1.5);
 					$posY -= $optionHeight * 3.;
 					$index += 3;
@@ -334,7 +365,8 @@ class ServerOptionsMenu implements CallbackListener, ConfiguratorMenu, TimerList
 					$entry->setId($name);
 
 					$quad = new Quad();
-					$quad->setPosition(-4, 0, -0.01)->setSize(4, 4);
+					$quad->setPosition($width - $width * 0.3 - 4, 0, -0.01);
+					$quad->setSize(4, 4);
 					$checkBox = new CheckBox(null, false, $quad);
 					$checkBox->setEnabledDesign("UICommon64_1", "Eye_light");
 					$checkBox->setDisabledDesign("UICommon64_1", "Eye_light");

core/Server/ServerUIPropertiesMenu.php

@@ -166,13 +166,13 @@ class ServerUIPropertiesMenu implements ConfiguratorMenu, CallbackListener, Time
 		// Pagers
 		$pagerPrev = new Quad_Icons64x64_1();
 		$frame->addChild($pagerPrev);
-		$pagerPrev->setPosition($width * 0.39, $height * -0.44, 2);
+		$pagerPrev->setPosition($width * 0.5 - 12, $height * -0.5 + 5, 2);
 		$pagerPrev->setSize($pagerSize, $pagerSize);
 		$pagerPrev->setSubStyle($pagerPrev::SUBSTYLE_ArrowPrev);
 
 		$pagerNext = new Quad_Icons64x64_1();
 		$frame->addChild($pagerNext);
-		$pagerNext->setPosition($width * 0.45, $height * -0.44, 2);
+		$pagerNext->setPosition($width * 0.5 - 5, $height * -0.5 + 5, 2);
 		$pagerNext->setSize($pagerSize, $pagerSize);
 		$pagerNext->setSubStyle($pagerNext::SUBSTYLE_ArrowNext);
 
@@ -182,7 +182,7 @@ class ServerUIPropertiesMenu implements ConfiguratorMenu, CallbackListener, Time
 		$pageCountLabel = new Label_Text();
 		$frame->addChild($pageCountLabel);
 		$pageCountLabel->setHorizontalAlign($pageCountLabel::RIGHT);
-		$pageCountLabel->setPosition($width * 0.35, $height * -0.44, 1);
+		$pageCountLabel->setPosition($width * 0.5 - 16, $height * -0.5 + 5, 1);
 		$pageCountLabel->setStyle($pageCountLabel::STYLE_TextTitle1);
 		$pageCountLabel->setTextSize(2);
 

core/Server/VoteRatiosMenu.php

@@ -71,11 +71,20 @@ class VoteRatiosMenu implements CallbackListener, ConfiguratorMenu, TimerListene
 
 			$nameLabel = new Label_Text();
 			$voteRatioFrame->addChild($nameLabel);
-			$nameLabel->setHorizontalAlign($nameLabel::LEFT)->setX($width * -0.46)->setSize($width * 0.7, $lineHeight)->setTextSize(2)->setTranslate(true)->setText($voteRatioDescription);
+			$nameLabel->setHorizontalAlign($nameLabel::LEFT);
+			$nameLabel->setX($width * -0.5 + 4);
+			$nameLabel->setSize($width * 0.7, $lineHeight);
+			$nameLabel->setTextSize(2);
+			$nameLabel->setTranslate(true);
+			$nameLabel->setText($voteRatioDescription);
 
 			$entry = new Entry();
 			$voteRatioFrame->addChild($entry);
-			$entry->setX($width * 0.35)->setSize($width * 0.14, $lineHeight * 0.9)->setStyle(Label_Text::STYLE_TextValueSmall)->setTextSize($index === 0 ? 2 : 1)->setName(self::ACTION_PREFIX_VOTE_RATIO . $voteRatioCommand);
+			$entry->setX($width * 0.5 - $width * 0.14 / 2 - 4);
+			$entry->setSize($width * 0.14, $lineHeight * 0.9);
+			$entry->setStyle(Label_Text::STYLE_TextValueSmall);
+			$entry->setTextSize($index === 0 ? 2 : 1);
+			$entry->setName(self::ACTION_PREFIX_VOTE_RATIO . $voteRatioCommand);
 
 			$voteRatio = $this->getVoteRatioForCommand($voteRatios, $voteRatioCommand);
 			if ($voteRatio) {

core/Settings/SettingManager.php

@@ -118,6 +118,15 @@ class SettingManager implements CallbackListener, UsageInformationAble {
 				trigger_error($mysqli->error, E_USER_ERROR);
 			}
 		}
+
+		// Grow the default value
+		$mysqli->query("ALTER TABLE `" . self::TABLE_SETTINGS . "` MODIFY `default` VARCHAR(1000);");
+		if ($mysqli->error) {
+			// If not Duplicate
+			if ($mysqli->errno !== 1060) {
+				trigger_error($mysqli->error, E_USER_ERROR);
+			}
+		}
 		return $result;
 	}
 
@@ -448,6 +457,10 @@ class SettingManager implements CallbackListener, UsageInformationAble {
 					$this->clearStorage();
 				}
 			}
+
+			if ($this->disableCache && $setting->linked && isset($this->storedSettings[$setting->class . $setting->setting])) {
+				unset($this->storedSettings[$setting->class . $setting->setting]);
+			}
 		}
 
 		return true;

core/Statistics/SimpleStatsList.php

@@ -314,17 +314,26 @@ class SimpleStatsList implements ManialinkPageAnswerListener, CallbackListener,
 		$pagerSize = 6.;
 		$pagerPrev = new Quad_Icons64x64_1();
 		$frame->addChild($pagerPrev);
-		$pagerPrev->setPosition($width * 0.42, $height * -0.44, 2)->setSize($pagerSize, $pagerSize)->setSubStyle($pagerPrev::SUBSTYLE_ArrowPrev);
+		$pagerPrev->setPosition($width * 0.5 - 12, $height * -0.5 + 5, 2);
+		$pagerPrev->setSize($pagerSize, $pagerSize);
+		$pagerPrev->setSubStyle($pagerPrev::SUBSTYLE_ArrowPrev);
 
 		$pagerNext = new Quad_Icons64x64_1();
 		$frame->addChild($pagerNext);
-		$pagerNext->setPosition($width * 0.45, $height * -0.44, 2)->setSize($pagerSize, $pagerSize)->setSubStyle($pagerNext::SUBSTYLE_ArrowNext);
+		$pagerNext->setPosition($width * 0.5 - 5, $height * -0.5 + 5, 2);
+		$pagerNext->setSize($pagerSize, $pagerSize);
+		$pagerNext->setSubStyle($pagerNext::SUBSTYLE_ArrowNext);
 
 		$pageCountLabel = new Label_Text();
 		$frame->addChild($pageCountLabel);
-		$pageCountLabel->setHorizontalAlign($pageCountLabel::RIGHT)->setPosition($width * 0.40, $height * -0.44, 1)->setStyle($pageCountLabel::STYLE_TextTitle1)->setTextSize(1);
+		$pageCountLabel->setHorizontalAlign($pageCountLabel::RIGHT);
+		$pageCountLabel->setPosition($width * 0.5 - 16, $height * -0.5 + 5, 1);
+		$pageCountLabel->setStyle($pageCountLabel::STYLE_TextTitle1);
+		$pageCountLabel->setTextSize(1);
 
-		$paging->addButtonControl($pagerNext)->addButtonControl($pagerPrev)->setLabel($pageCountLabel);
+		$paging->addButtonControl($pagerNext);
+		$paging->addButtonControl($pagerPrev);
+		$paging->setLabel($pageCountLabel);
 
 		$this->maniaControl->getManialinkManager()->displayWidget($maniaLink, $player, 'SimpleStatsList');
 	}

core/Update/PluginUpdateManager.php

@@ -68,7 +68,7 @@ class PluginUpdateManager implements CallbackListener, CommandListener, TimerLis
 	 *
 	 * @param Player $player
 	 */
-	public function checkPluginsUpdate(Player $player = null) {
+	public function checkPluginsUpdate(?Player $player = null) {
 		$message = 'Checking Plugins for newer Versions...';
 		if ($player) {
 			$this->maniaControl->getChat()->sendInformation($message, $player);
@@ -165,7 +165,7 @@ class PluginUpdateManager implements CallbackListener, CommandListener, TimerLis
 	 *
 	 * @param Player $player
 	 */
-	public function performPluginsUpdate(Player $player = null) {
+	public function performPluginsUpdate(?Player $player = null) {
 		$pluginsUpdates = $this->getPluginsUpdates();
 		if (empty($pluginsUpdates)) {
 			$message = 'There are no Plugin Updates available!';
@@ -241,7 +241,7 @@ class PluginUpdateManager implements CallbackListener, CommandListener, TimerLis
 	 * @param Player           $player
 	 * @param bool             $update
 	 */
-	private function installPlugin(PluginUpdateData $pluginUpdateData, Player $player = null, $update = false) {
+	private function installPlugin(PluginUpdateData $pluginUpdateData, ?Player $player = null, $update = false) {
 		if ($player && !$this->maniaControl->getAuthenticationManager()->checkPermission($player, InstallMenu::SETTING_PERMISSION_INSTALL_PLUGINS))
 		{
 			$this->maniaControl->getAuthenticationManager()->sendNotAllowed($player);

core/Update/UpdateManager.php

@@ -64,7 +64,7 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener,
 
 		// Settings
 		$this->maniaControl->getSettingManager()->initSetting($this, self::SETTING_ENABLE_UPDATECHECK, true);
-		$this->maniaControl->getSettingManager()->initSetting($this, self::SETTING_AUTO_UPDATE, true);
+		$this->maniaControl->getSettingManager()->initSetting($this, self::SETTING_AUTO_UPDATE, false);
 		$this->maniaControl->getSettingManager()->initSetting($this, self::SETTING_UPDATECHECK_INTERVAL, 1);
 		$this->maniaControl->getSettingManager()->initSetting($this, self::SETTING_UPDATECHECK_CHANNEL, $this->getUpdateChannels());
 		$this->maniaControl->getSettingManager()->initSetting($this, self::SETTING_PERFORM_BACKUPS, true);
@@ -130,7 +130,7 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener,
 	 *
 	 * @param UpdateData $coreUpdateData
 	 */
-	public function setCoreUpdateData(UpdateData $coreUpdateData = null) {
+	public function setCoreUpdateData(?UpdateData $coreUpdateData = null) {
 		$this->coreUpdateData = $coreUpdateData;
 	}
 
@@ -189,7 +189,7 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener,
 	 *
 	 * @param UpdateData $updateData
 	 */
-	public function handleUpdateCheck(UpdateData $updateData = null) {
+	public function handleUpdateCheck(?UpdateData $updateData = null) {
 		if (!$this->checkUpdateData($updateData)) {
 			// No new update available
 			return;
@@ -218,7 +218,7 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener,
 	 * @param UpdateData $updateData
 	 * @return bool
 	 */
-	public function checkUpdateData(UpdateData $updateData = null) {
+	public function checkUpdateData(?UpdateData $updateData = null) {
 		if (!$updateData || !$updateData->url) {
 			// Data corrupted
 			return false;
@@ -268,7 +268,7 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener,
 	 * @param UpdateData $updateData
 	 * @return bool
 	 */
-	public function checkUpdateDataBuildVersion(UpdateData $updateData = null) {
+	public function checkUpdateDataBuildVersion(?UpdateData $updateData = null) {
 		if (!$updateData) {
 			// Data corrupted
 			return false;
@@ -310,7 +310,7 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener,
 	 * @param Player $player
 	 * @return bool
 	 */
-	public function performCoreUpdate(Player $player = null) {
+	public function performCoreUpdate(?Player $player = null) {
 		if (!$this->coreUpdateData) {
 			$message = 'Update failed: No update Data available!';
 			if ($player) {
@@ -490,7 +490,7 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener,
 			return;
 		}
 
-		$this->checkCoreUpdateAsync(function (UpdateData $updateData = null) use (&$player) {
+		$this->checkCoreUpdateAsync(function (?UpdateData $updateData = null) use (&$player) {
 			if (!$this->checkUpdateData($updateData)) {
 				$this->maniaControl->getChat()->sendInformation('No Update available!', $player);
 				return;
@@ -516,7 +516,7 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener,
 						);
 						$this->maniaControl->getChat()->sendInformation($message, $player);
 					} else {
-						$message = $this->maniaControl->getChat()->formatMesssage(
+						$message = $this->maniaControl->getChat()->formatMessage(
 							'New Nightly Build (%s) available! (Current Build: %s)',
 							$updateData->releaseDate,
 							$buildDate
@@ -524,14 +524,14 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener,
 						$this->maniaControl->getChat()->sendSuccess($message, $player);
 					}
 				} else {
-					$message = $this->maniaControl->getChat()->formatMesssage(
+					$message = $this->maniaControl->getChat()->formatMessage(
 						'New Nightly Build (%s) available!',
 						$updateData->releaseDate
 					);
 					$this->maniaControl->getChat()->sendSuccess($message, $player);
 				}
 			} else {
-				$message = $this->maniaControl->getChat()->formatMesssage(
+				$message = $this->maniaControl->getChat()->formatMessage(
 					'Update for Version %s available!',
 					$updateData->version
 				);
@@ -563,7 +563,7 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener,
 	 * @param null $player
 	 */
 	private function checkAndHandleCoreUpdate($player = null) {
-		$this->checkCoreUpdateAsync(function (UpdateData $updateData = null) use (&$player) {
+		$this->checkCoreUpdateAsync(function (?UpdateData $updateData = null) use (&$player) {
 			if (!$updateData) {
 				if ($player) {
 					$this->maniaControl->getChat()->sendError('Update is currently not possible!', $player);

core/Utils/SystemUtil.php

@@ -107,6 +107,16 @@ class SystemUtil {
 			Logger::log($message . 'FOUND!');
 		}
 
+		// Check for Xml
+		$message = 'Checking for installed xml ... ';
+		if (!extension_loaded('SimpleXML')) {
+			Logger::log($message . 'NOT FOUND!');
+			Logger::log(" -- You don't have xml installed! Check: https://www.php.net/manual/en/xml.setup.php");
+			$success = false;
+		} else {
+			Logger::log($message . 'FOUND!');
+		}
+
 		if (!$success) {
 			// Missing requirements
 			self::quit();

core/Utils/WebReader.php

@@ -22,7 +22,7 @@ abstract class WebReader {
 	 * @param callable $function
 	 * @return Response
 	 */
-	public static function getUrl($url, callable $function = null) {
+	public static function getUrl($url, ?callable $function = null) {
 		$request  = static::newRequest($url);
 		$response = $request->send();
 		if ($function) {
@@ -73,7 +73,7 @@ abstract class WebReader {
 	 * @param callable $function
 	 * @return Response
 	 */
-	public static function postUrl($url, $content = null, callable $function = null) {
+	public static function postUrl($url, $content = null, ?callable $function = null) {
 		$request = static::newRequest($url);
 		$request->getOptions()->set(CURLOPT_POST, true); // post method
 		if ($content) {

libs/FML/Components/CheckBox.php

@@ -38,7 +38,7 @@ class CheckBox implements Renderable, ScriptFeatureable
      * @param bool   $default (optional) Default value
      * @param Quad   $quad    (optional) CheckBox quad
      */
-    public function __construct($name = null, $default = null, Quad $quad = null)
+    public function __construct($name = null, $default = null, ?Quad $quad = null)
     {
         $this->feature = new CheckBoxFeature();
         if ($name) {

libs/FML/Components/ValuePicker.php

@@ -39,7 +39,7 @@ class ValuePicker implements Renderable, ScriptFeatureable
      * @param string   $default (optional) Default value
      * @param Label    $label   (optional) ValuePicker label
      */
-    public function __construct($name = null, array $values = null, $default = null, Label $label = null)
+    public function __construct($name = null, ?array $values = null, $default = null, ?Label $label = null)
     {
         $this->feature = new ValuePickerFeature();
         if ($name) {

libs/FML/Controls/Audio.php

@@ -191,7 +191,7 @@ class Audio extends Control implements Playable, Scriptable
     /**
      * @see Scriptable::setScriptAction()
      */
-    public function setScriptAction($scriptAction, array $scriptActionParameters = null)
+    public function setScriptAction($scriptAction, ?array $scriptActionParameters = null)
     {
         $this->scriptAction = (string)$scriptAction;
         $this->setScriptActionParameters($scriptActionParameters);
@@ -209,7 +209,7 @@ class Audio extends Control implements Playable, Scriptable
     /**
      * @see Scriptable::setScriptActionParameters()
      */
-    public function setScriptActionParameters(array $scriptActionParameters = null)
+    public function setScriptActionParameters(?array $scriptActionParameters = null)
     {
         $this->scriptActionParameters = $scriptActionParameters;
         return $this;

libs/FML/Controls/Entry.php

@@ -273,7 +273,7 @@ class Entry extends Control implements NewLineable, Scriptable, Styleable, TextF
     /**
      * @see Scriptable::setScriptAction()
      */
-    public function setScriptAction($scriptAction, array $scriptActionParameters = null)
+    public function setScriptAction($scriptAction, ?array $scriptActionParameters = null)
     {
         $this->scriptAction = (string)$scriptAction;
         $this->setScriptActionParameters($scriptActionParameters);
@@ -291,7 +291,7 @@ class Entry extends Control implements NewLineable, Scriptable, Styleable, TextF
     /**
      * @see Scriptable::setScriptActionParameters()
      */
-    public function setScriptActionParameters(array $scriptActionParameters = null)
+    public function setScriptActionParameters(?array $scriptActionParameters = null)
     {
         $this->scriptActionParameters = $scriptActionParameters;
         return $this;

libs/FML/Controls/Frame.php

@@ -103,7 +103,7 @@ class Frame extends Control implements Container
      * @deprecated Use Style
      * @see        Style
      */
-    public function setFormat(Format $format = null)
+    public function setFormat(?Format $format = null)
     {
         $this->format = $format;
         return $this;

libs/FML/Controls/Frame3d.php

@@ -138,7 +138,7 @@ class Frame3d extends Frame implements Scriptable
     /**
      * @see Scriptable::setScriptAction()
      */
-    public function setScriptAction($scriptAction, array $scriptActionParameters = null)
+    public function setScriptAction($scriptAction, ?array $scriptActionParameters = null)
     {
         $this->scriptAction = (string)$scriptAction;
         $this->setScriptActionParameters($scriptActionParameters);
@@ -156,7 +156,7 @@ class Frame3d extends Frame implements Scriptable
     /**
      * @see Scriptable::setScriptActionParameters()
      */
-    public function setScriptActionParameters(array $scriptActionParameters = null)
+    public function setScriptActionParameters(?array $scriptActionParameters = null)
     {
         $this->scriptActionParameters = $scriptActionParameters;
         return $this;

libs/FML/Controls/Label.php

@@ -467,7 +467,7 @@ class Label extends Control implements Actionable, Linkable, NewLineable, MultiL
     /**
      * @see Scriptable::setScriptAction()
      */
-    public function setScriptAction($scriptAction, array $scriptActionParameters = null)
+    public function setScriptAction($scriptAction, ?array $scriptActionParameters = null)
     {
         $this->scriptAction = (string)$scriptAction;
         $this->setScriptActionParameters($scriptActionParameters);
@@ -485,7 +485,7 @@ class Label extends Control implements Actionable, Linkable, NewLineable, MultiL
     /**
      * @see Scriptable::setScriptActionParameters()
      */
-    public function setScriptActionParameters(array $scriptActionParameters = null)
+    public function setScriptActionParameters(?array $scriptActionParameters = null)
     {
         $this->scriptActionParameters = $scriptActionParameters;
         return $this;

libs/FML/Controls/Quad.php

@@ -579,7 +579,7 @@ class Quad extends Control implements Actionable, BackgroundColorable, BgColorab
     /**
      * @see Scriptable::setScriptAction()
      */
-    public function setScriptAction($scriptAction, array $scriptActionParameters = null)
+    public function setScriptAction($scriptAction, ?array $scriptActionParameters = null)
     {
         $this->scriptAction = (string)$scriptAction;
         $this->setScriptActionParameters($scriptActionParameters);
@@ -597,7 +597,7 @@ class Quad extends Control implements Actionable, BackgroundColorable, BgColorab
     /**
      * @see Scriptable::setScriptActionParameters()
      */
-    public function setScriptActionParameters(array $scriptActionParameters = null)
+    public function setScriptActionParameters(?array $scriptActionParameters = null)
     {
         $this->scriptActionParameters = $scriptActionParameters;
         return $this;

libs/FML/Controls/TextEdit.php

@@ -281,7 +281,7 @@ class TextEdit extends Control implements MultiLineable, Scriptable, Styleable,
     /**
      * @see Scriptable::setScriptAction()
      */
-    public function setScriptAction($scriptAction, array $scriptActionParameters = null)
+    public function setScriptAction($scriptAction, ?array $scriptActionParameters = null)
     {
         $this->scriptAction = (string)$scriptAction;
         $this->setScriptActionParameters($scriptActionParameters);
@@ -299,7 +299,7 @@ class TextEdit extends Control implements MultiLineable, Scriptable, Styleable,
     /**
      * @see Scriptable::setScriptActionParameters()
      */
-    public function setScriptActionParameters(array $scriptActionParameters = null)
+    public function setScriptActionParameters(?array $scriptActionParameters = null)
     {
         $this->scriptActionParameters = $scriptActionParameters;
         return $this;

libs/FML/Controls/Video.php

@@ -191,7 +191,7 @@ class Video extends Control implements Playable, Scriptable
     /**
      * @see Scriptable::setScriptAction()
      */
-    public function setScriptAction($scriptAction, array $scriptActionParameters = null)
+    public function setScriptAction($scriptAction, ?array $scriptActionParameters = null)
     {
         $this->scriptAction = (string)$scriptAction;
         $this->setScriptActionParameters($scriptActionParameters);
@@ -209,7 +209,7 @@ class Video extends Control implements Playable, Scriptable
     /**
      * @see Scriptable::setScriptActionParameters()
      */
-    public function setScriptActionParameters(array $scriptActionParameters = null)
+    public function setScriptActionParameters(?array $scriptActionParameters = null)
     {
         $this->scriptActionParameters = $scriptActionParameters;
         return $this;

libs/FML/Elements/FrameModel.php

@@ -41,7 +41,7 @@ class FrameModel implements Container, Identifiable, Renderable
      * @param Renderable[] $children Children
      * @return static
      */
-    public static function create($modelId = null, array $children = null)
+    public static function create($modelId = null, ?array $children = null)
     {
         return new static($modelId, $children);
     }
@@ -53,7 +53,7 @@ class FrameModel implements Container, Identifiable, Renderable
      * @param string       $modelId  Model id
      * @param Renderable[] $children Children
      */
-    public function __construct($modelId = null, array $children = null)
+    public function __construct($modelId = null, ?array $children = null)
     {
         if ($modelId) {
             $this->setId($modelId);
@@ -176,7 +176,7 @@ class FrameModel implements Container, Identifiable, Renderable
      * @deprecated Use Style
      * @see        Style
      */
-    public function setFormat(Format $format = null)
+    public function setFormat(?Format $format = null)
     {
         $this->format = $format;
         return $this;

libs/FML/ManiaLink.php

@@ -96,7 +96,7 @@ class ManiaLink
      * @param Renderable[] $children    (optional) Children
      * @return static
      */
-    public static function create($maniaLinkId = null, $version = null, $name = null, array $children = null)
+    public static function create($maniaLinkId = null, $version = null, $name = null, ?array $children = null)
     {
         return new static($maniaLinkId, $version, $name, $children);
     }
@@ -110,7 +110,7 @@ class ManiaLink
      * @param string       $name        (optional) Name
      * @param Renderable[] $children    (optional) Children
      */
-    public function __construct($maniaLinkId = null, $version = null, $name = null, array $children = null)
+    public function __construct($maniaLinkId = null, $version = null, $name = null, ?array $children = null)
     {
         if (is_string($version) && (!$name || is_array($name)) && !$children) {
             // backwards-compatibility (version has been introduced later, if it's a string it's supposed to be the name)
@@ -418,7 +418,7 @@ class ManiaLink
      * @param Dico $dico Dictionary
      * @return static
      */
-    public function setDico(Dico $dico = null)
+    public function setDico(?Dico $dico = null)
     {
         $this->dico = $dico;
         return $this;
@@ -445,7 +445,7 @@ class ManiaLink
      * @param Stylesheet $stylesheet Stylesheet
      * @return static
      */
-    public function setStylesheet(Stylesheet $stylesheet = null)
+    public function setStylesheet(?Stylesheet $stylesheet = null)
     {
         $this->stylesheet = $stylesheet;
         return $this;
@@ -489,7 +489,7 @@ class ManiaLink
      * @param Script $script Script
      * @return static
      */
-    public function setScript(Script $script = null)
+    public function setScript(?Script $script = null)
     {
         $this->script = $script;
         return $this;

libs/FML/ManiaLinks.php

@@ -29,7 +29,7 @@ class ManiaLinks
      * @param ManiaLink[] $children ManiaLink children
      * @return static
      */
-    public static function create(array $children = null)
+    public static function create(?array $children = null)
     {
         return new static($children);
     }
@@ -40,7 +40,7 @@ class ManiaLinks
      * @api
      * @param ManiaLink[] $children ManiaLink children
      */
-    public function __construct(array $children = null)
+    public function __construct(?array $children = null)
     {
         if ($children) {
             $this->setChildren($children);
@@ -162,7 +162,7 @@ class ManiaLinks
      * @param CustomUI $customUI CustomUI object
      * @return static
      */
-    public function setCustomUI(CustomUI $customUI = null)
+    public function setCustomUI(?CustomUI $customUI = null)
     {
         $this->customUI = $customUI;
         return $this;

libs/FML/Script/Features/ActionTrigger.php

@@ -41,7 +41,7 @@ class ActionTrigger extends ScriptFeature
      * @param Control $control    (optional) Action Control
      * @param string  $labelName  (optional) Script label name
      */
-    public function __construct($actionName = null, Control $control = null, $labelName = ScriptLabel::MOUSECLICK)
+    public function __construct($actionName = null, ?Control $control = null, $labelName = ScriptLabel::MOUSECLICK)
     {
         if ($actionName) {
             $this->setActionName($actionName);
@@ -96,7 +96,7 @@ class ActionTrigger extends ScriptFeature
      * @param Control $control Action Control
      * @return static
      */
-    public function setControl(Control $control = null)
+    public function setControl(?Control $control = null)
     {
         if ($control) {
             $control->checkId();

libs/FML/Script/Features/CheckBoxFeature.php

@@ -66,7 +66,7 @@ class CheckBoxFeature extends ScriptFeature
      * @param Entry $entry   (optional) Hidden Entry
      * @param bool  $default (optional) Default value
      */
-    public function __construct(Quad $quad = null, Entry $entry = null, $default = null)
+    public function __construct(?Quad $quad = null, ?Entry $entry = null, $default = null)
     {
         if ($quad) {
             $this->setQuad($quad);

libs/FML/Script/Features/Clock.php

@@ -41,7 +41,7 @@ class Clock extends ScriptFeature
      * @param bool  $showSeconds  (optional) Show the seconds
      * @param bool  $showFullDate (optional) Show the date
      */
-    public function __construct(Label $label = null, $showSeconds = true, $showFullDate = false)
+    public function __construct(?Label $label = null, $showSeconds = true, $showFullDate = false)
     {
         if ($label) {
             $this->setLabel($label);

libs/FML/Script/Features/ControlScript.php

@@ -41,7 +41,7 @@ class ControlScript extends ScriptFeature
      * @param string  $scriptText (optional) Script text
      * @param string  $labelName  (optional) Script Label name
      */
-    public function __construct(Control $control = null, $scriptText = null, $labelName = ScriptLabel::MOUSECLICK)
+    public function __construct(?Control $control = null, $scriptText = null, $labelName = ScriptLabel::MOUSECLICK)
     {
         if ($control) {
             $this->setControl($control);

libs/FML/Script/Features/EntrySubmit.php

@@ -35,7 +35,7 @@ class EntrySubmit extends ScriptFeature
      * @param Entry  $entry (optional) Entry Control
      * @param string $url   (optional) Submit url
      */
-    public function __construct(Entry $entry = null, $url = null)
+    public function __construct(?Entry $entry = null, $url = null)
     {
         if ($entry) {
             $this->setEntry($entry);

libs/FML/Script/Features/GraphCurve.php

@@ -54,7 +54,7 @@ class GraphCurve extends ScriptFeature
      * @param Graph   $graph  (optional) Graph
      * @param array[] $points (optional) Points
      */
-    public function __construct(Graph $graph = null, array $points = null)
+    public function __construct(?Graph $graph = null, ?array $points = null)
     {
         if ($graph) {
             $this->setGraph($graph);
@@ -200,7 +200,7 @@ class GraphCurve extends ScriptFeature
      * @param float[] $color (optional) Color
      * @return static
      */
-    public function setColor(array $color = null)
+    public function setColor(?array $color = null)
     {
         $this->color = $color;
         return $this;

libs/FML/Script/Features/GraphSettings.php

@@ -38,7 +38,7 @@ class GraphSettings extends ScriptFeature
      * @api
      * @param Graph $graph (optional) Graph
      */
-    public function __construct(Graph $graph = null)
+    public function __construct(?Graph $graph = null)
     {
         if ($graph) {
             $this->setGraph($graph);

libs/FML/Script/Features/MapInfo.php

@@ -35,7 +35,7 @@ class MapInfo extends ScriptFeature
      * @param Control $control   (optional) Map Info Control
      * @param string  $labelName (optional) Script Label name
      */
-    public function __construct(Control $control = null, $labelName = ScriptLabel::MOUSECLICK)
+    public function __construct(?Control $control = null, $labelName = ScriptLabel::MOUSECLICK)
     {
         if ($control) {
             $this->setControl($control);

libs/FML/Script/Features/Menu.php

@@ -40,7 +40,7 @@ class Menu extends ScriptFeature
      * @param Control $control        (optional) Toggled Menu Control
      * @param bool    $isStartElement (optional) Whether the Menu should start with the given Element
      */
-    public function __construct(Control $item = null, Control $control = null, $isStartElement = true)
+    public function __construct(?Control $item = null, ?Control $control = null, $isStartElement = true)
     {
         if ($item && $control) {
             $this->addItem($item, $control, $isStartElement);
@@ -116,7 +116,7 @@ class Menu extends ScriptFeature
      * @param MenuElement $startElement Start Element
      * @return static
      */
-    public function setStartElement(MenuElement $startElement = null)
+    public function setStartElement(?MenuElement $startElement = null)
     {
         $this->startElement = $startElement;
         if ($startElement && !in_array($startElement, $this->elements, true)) {

libs/FML/Script/Features/MenuElement.php

@@ -32,7 +32,7 @@ class MenuElement
      * @param Control $item    (optional) Item Control in the Menu bar
      * @param Control $control (optional) Toggled Menu Control
      */
-    public function __construct(Control $item = null, Control $control = null)
+    public function __construct(?Control $item = null, ?Control $control = null)
     {
         if ($item) {
             $this->setItem($item);

libs/FML/Script/Features/Paging.php

@@ -73,7 +73,7 @@ class Paging extends ScriptFeature
      * @param PagingPage[]   $pages   (optional) Pages
      * @param PagingButton[] $buttons (optional) Pageing Buttons
      */
-    public function __construct(Label $label = null, array $pages = null, array $buttons = null)
+    public function __construct(?Label $label = null, ?array $pages = null, ?array $buttons = null)
     {
         if ($label) {
             $this->setLabel($label);

libs/FML/Script/Features/PagingButton.php

@@ -32,7 +32,7 @@ class PagingButton
      * @param Control $control     (optional) Paging Control
      * @param int     $pagingCount (optional) Number of browsed pages per click
      */
-    public function __construct(Control $control = null, $pagingCount = 1)
+    public function __construct(?Control $control = null, $pagingCount = 1)
     {
         if ($control) {
             $this->setControl($control);

libs/FML/Script/Features/PagingPage.php

@@ -31,7 +31,7 @@ class PagingPage
      * @param Control $control    (optional) Page Control
      * @param int     $pageNumber (optional) Number of the Page
      */
-    public function __construct(Control $control = null, $pageNumber = null)
+    public function __construct(?Control $control = null, $pageNumber = null)
     {
         if ($control) {
             $this->setControl($control);

libs/FML/Script/Features/PlayerProfile.php

@@ -46,7 +46,7 @@ class PlayerProfile extends ScriptFeature
      * @param Control $control   (optional) Profile Control
      * @param string  $labelName (optional) Script Label name
      */
-    public function __construct($login = null, Control $control = null, $labelName = ScriptLabel::MOUSECLICK, $titleId = "Trackmania")
+    public function __construct($login = null, ?Control $control = null, $labelName = ScriptLabel::MOUSECLICK, $titleId = "Trackmania")
     {
         if ($login) {
             $this->setLogin($login);

libs/FML/Script/Features/Preload.php

@@ -27,7 +27,7 @@ class Preload extends ScriptFeature
      * @api
      * @param string[] $imageUrls (optional) Image urls
      */
-    public function __construct(array $imageUrls = null)
+    public function __construct(?array $imageUrls = null)
     {
         if ($imageUrls) {
             $this->setImageUrls($imageUrls);

libs/FML/Script/Features/RadioButtonGroupFeature.php

@@ -40,7 +40,7 @@ class RadioButtonGroupFeature extends ScriptFeature
      * @api
      * @param Entry $entry (optional) Hidden Entry
      */
-    public function __construct(Entry $entry = null)
+    public function __construct(?Entry $entry = null)
     {
         if ($entry) {
             $this->setEntry($entry);

libs/FML/Script/Features/Toggle.php

@@ -54,8 +54,8 @@ class Toggle extends ScriptFeature
      * @param bool    $onlyHide        (optional) If it should only hide the Control but not toggle
      */
     public function __construct(
-        Control $togglingControl = null,
-        Control $toggledControl = null,
+        ?Control $togglingControl = null,
+        ?Control $toggledControl = null,
         $labelName = ScriptLabel::MOUSECLICK,
         $onlyShow = false,
         $onlyHide = false

libs/FML/Script/Features/Tooltip.php

@@ -54,7 +54,7 @@ class Tooltip extends ScriptFeature
      * @param bool    $invert         (optional) If the visibility toggling should be inverted
      * @param string  $text           (optional) Text to display if the TooltipControl is a Label
      */
-    public function __construct(Control $hoverControl = null, Control $tooltipControl = null, $stayOnClick = null, $invert = null, $text = null)
+    public function __construct(?Control $hoverControl = null, ?Control $tooltipControl = null, $stayOnClick = null, $invert = null, $text = null)
     {
         if ($hoverControl) {
             $this->setHoverControl($hoverControl);

libs/FML/Script/Features/UISound.php

@@ -85,7 +85,7 @@ class UISound extends ScriptFeature
      * @param int     $variant   (optional) Sound variant
      * @param string  $labelName (optional) Script Label name
      */
-    public function __construct($soundName = null, Control $control = null, $variant = 0, $labelName = ScriptLabel::MOUSECLICK)
+    public function __construct($soundName = null, ?Control $control = null, $variant = 0, $labelName = ScriptLabel::MOUSECLICK)
     {
         if ($soundName) {
             $this->setSoundName($soundName);
@@ -143,7 +143,7 @@ class UISound extends ScriptFeature
      * @param Control $control (optional) Sound Control
      * @return static
      */
-    public function setControl(Control $control = null)
+    public function setControl(?Control $control = null)
     {
         if ($control) {
             $control->checkId();

libs/FML/Script/Features/ValuePickerFeature.php

@@ -56,7 +56,7 @@ class ValuePickerFeature extends ScriptFeature
      * @param string[] $values  (optional) Possible values
      * @param string   $default (optional) Default value
      */
-    public function __construct(Label $label = null, Entry $entry = null, array $values = null, $default = null)
+    public function __construct(?Label $label = null, ?Entry $entry = null, ?array $values = null, $default = null)
     {
         if ($label) {
             $this->setLabel($label);

libs/FML/Stylesheet/Stylesheet.php

@@ -150,7 +150,7 @@ class Stylesheet
      * @param Mood $mood Mood
      * @return static
      */
-    public function setMood(Mood $mood = null)
+    public function setMood(?Mood $mood = null)
     {
         $this->mood = $mood;
         return $this;

libs/FML/Types/Container.php

@@ -90,6 +90,6 @@ interface Container
      * @deprecated Use Style
      * @see        Style
      */
-    public function setFormat(Format $format = null);
+    public function setFormat(?Format $format = null);
 
 }

libs/FML/Types/Scriptable.php

@@ -45,7 +45,7 @@ interface Scriptable
      * @param string[] $scriptActionParameters (optional) Script action parameters
      * @return static
      */
-    public function setScriptAction($scriptAction, array $scriptActionParameters = null);
+    public function setScriptAction($scriptAction, ?array $scriptActionParameters = null);
 
     /**
      * Get script action parameters
@@ -62,6 +62,6 @@ interface Scriptable
      * @param string[] $scriptActionParameters (optional) Script action parameters
      * @return static
      */
-    public function setScriptActionParameters(array $scriptActionParameters = null);
+    public function setScriptActionParameters(?array $scriptActionParameters = null);
 
 }

libs/Maniaplanet/DedicatedServer/Structures/AbstractStructure.php

@@ -9,46 +9,52 @@ namespace Maniaplanet\DedicatedServer\Structures;
 
 abstract class AbstractStructure
 {
-	static public function fromArray($array)
+	public static function fromArrayOfArray($array)
 	{
-		if(!is_array($array))
+		if (!is_array($array)) {
 			return $array;
+		}
 
-		$object = new static;
-		foreach($array as $key => $value)
-			$object->{lcfirst($key)} = $value;
-		return $object;
-	}
-
-	static public function fromArrayOfArray($array)
-	{
-		if(!is_array($array))
-			return $array;
-
-		$result = array();
-		foreach($array as $key => $value)
+		$result = [];
+		foreach ($array as $key => $value) {
 			$result[$key] = static::fromArray($value);
+		}
 		return $result;
 	}
 
-	static public function getPropertyFromArray($array, $property)
+	public static function fromArray($array)
 	{
-		return array_map(get_called_class().'::extractProperty', $array, array_fill(0, count($array), $property));
+		if (!is_array($array)) {
+			return $array;
+		}
+
+		$object = new static;
+		foreach ($array as $key => $value) {
+			$object->{lcfirst($key)} = $value;
+		}
+		return $object;
 	}
 
-	static protected function extractProperty($element, $property)
+	public static function getPropertyFromArray($array, $property)
 	{
-		if(!is_a($element, get_called_class()) || !property_exists($element, $property))
-		throw new \InvalidArgumentException('property '.$property.' does not exists in class: '.get_called_class());
+		return array_map(get_called_class() . '::extractProperty', $array, array_fill(0, count($array), $property));
+	}
+
+	protected static function extractProperty($element, $property)
+	{
+		if (!is_a($element, get_called_class()) || !property_exists($element, $property)) {
+			throw new \InvalidArgumentException('property ' . $property . ' does not exists in class: ' . get_called_class());
+		}
 
 		return $element->$property;
 	}
 
 	function toArray()
 	{
-		$out = array();
-		foreach(get_object_vars($this) as $key => $value)
+		$out = [];
+		foreach (get_object_vars($this) as $key => $value) {
 			$out[ucfirst($key)] = $value;
+		}
 		return $out;
 	}
 }

libs/Maniaplanet/DedicatedServer/Structures/Bill.php

@@ -10,11 +10,11 @@ namespace Maniaplanet\DedicatedServer\Structures;
 class Bill extends AbstractStructure
 {
 	const STATE_CREATING_TRANSACTION = 1;
-	const STATE_ISSUED               = 2;
-	const STATE_VALIDATING_PAYMENT   = 3;
-	const STATE_PAYED                = 4;
-	const STATE_REFUSED              = 5;
-	const STATE_ERROR                = 6;
+	const STATE_ISSUED = 2;
+	const STATE_VALIDATING_PAYMENT = 3;
+	const STATE_PAYED = 4;
+	const STATE_REFUSED = 5;
+	const STATE_ERROR = 6;
 
 	/** @var int */
 	public $state;

libs/Maniaplanet/DedicatedServer/Structures/GameInfos.php

@@ -12,13 +12,13 @@ class GameInfos extends AbstractStructure
 	/**
 	 * Game Modes
 	 */
-	const GAMEMODE_SCRIPT     = 0;
-	const GAMEMODE_ROUNDS     = 1;
+	const GAMEMODE_SCRIPT = 0;
+	const GAMEMODE_ROUNDS = 1;
 	const GAMEMODE_TIMEATTACK = 2;
-	const GAMEMODE_TEAM       = 3;
-	const GAMEMODE_LAPS       = 4;
-	const GAMEMODE_CUP        = 5;
-	const GAMEMODE_STUNTS     = 6;
+	const GAMEMODE_TEAM = 3;
+	const GAMEMODE_LAPS = 4;
+	const GAMEMODE_CUP = 5;
+	const GAMEMODE_STUNTS = 6;
 
 	/** @var int */
 	public $gameMode;

libs/Maniaplanet/DedicatedServer/Structures/NetworkStats.php

@@ -28,7 +28,7 @@ class NetworkStats extends AbstractStructure
 	/** @var PlayerNetInfo[] */
 	public $playerNetInfos;
 
-	static public function fromArray($array)
+	public static function fromArray($array)
 	{
 		$object = parent::fromArray($array);
 		$object->playerNetInfos = PlayerNetInfo::fromArrayOfArray($object->playerNetInfos);

libs/Maniaplanet/DedicatedServer/Structures/Player.php

@@ -4,6 +4,7 @@
  *
  * @license     http://www.gnu.org/licenses/lgpl.html LGPL License 3
  */
+
 namespace Maniaplanet\DedicatedServer\Structures;
 
 class Player extends AbstractStructure

libs/Maniaplanet/DedicatedServer/Structures/PlayerDetailedInfo.php

@@ -46,10 +46,22 @@ class PlayerDetailedInfo extends Player
 	/** @var string */
 	public $broadcasterLogin;
 	/** @var string[] */
-	public $allies = array();
+	public $allies = [];
 	/** @var string */
 	public $clubLink;
 
+	/**
+	 * @return PlayerDetailedInfo
+	 */
+	public static function fromArray($array)
+	{
+		$object = parent::fromArray($array);
+		$object->avatar = FileDesc::fromArray($object->avatar);
+		$object->skins = Skin::fromArrayOfArray($object->skins);
+		$object->ladderStats = LadderStats::fromArray($object->ladderStats);
+		return $object;
+	}
+
 	/**
 	 * @return string[]
 	 */
@@ -57,16 +69,4 @@ class PlayerDetailedInfo extends Player
 	{
 		return explode('|', $this->path);
 	}
-
-	/**
-	 * @return PlayerDetailedInfo
-	 */
-	static public function fromArray($array)
-	{
-		$object = parent::fromArray($array);
-		$object->avatar = FileDesc::fromArray($object->avatar);
-		$object->skins = Skin::fromArrayOfArray($object->skins);
-		$object->ladderStats = LadderStats::fromArray($object->ladderStats);
-		return $object;
-	}
 }

libs/Maniaplanet/DedicatedServer/Structures/PlayerInfo.php

@@ -20,7 +20,7 @@ class PlayerInfo extends Player
 	/** @var bool */
 	public $isInOfficialMode;
 	/** @var int */
-	public $ladderScore;
+	public $ladderScore; // TODO CHECK IF EXISTS
 	/** @var int */
 	public $ladderRanking;
 	/** @var int */
@@ -63,26 +63,26 @@ class PlayerInfo extends Player
 	/**
 	 * @return PlayerInfo
 	 */
-	static public function fromArray($array)
+	public static function fromArray($array)
 	{
 		$object = parent::fromArray($array);
 
 		//Detail flags
-		$object->forceSpectator           = $object->flags % 10; // 0, 1 or 2
-		$object->isReferee                = (bool) (intval($object->flags / 10) % 10);
-		$object->isPodiumReady            = (bool) (intval($object->flags / 100) % 10);
-		$object->isUsingStereoscopy       = (bool) (intval($object->flags / 1000) % 10);
-		$object->isManagedByAnOtherServer = (bool) (intval($object->flags / 10000) % 10);
-		$object->isServer                 = (bool) (intval($object->flags / 100000) % 10);
-		$object->hasPlayerSlot            = (bool) (intval($object->flags / 1000000) % 10);
-		$object->isBroadcasting           = (bool) (intval($object->flags / 10000000) % 10);
-		$object->hasJoinedGame            = (bool) (intval($object->flags / 100000000) % 10);
+		$object->forceSpectator = $object->flags % 10; // 0, 1 or 2
+		$object->isReferee = (bool)(intval($object->flags / 10) % 10);
+		$object->isPodiumReady = (bool)(intval($object->flags / 100) % 10);
+		$object->isUsingStereoscopy = (bool)(intval($object->flags / 1000) % 10);
+		$object->isManagedByAnOtherServer = (bool)(intval($object->flags / 10000) % 10);
+		$object->isServer = (bool)(intval($object->flags / 100000) % 10);
+		$object->hasPlayerSlot = (bool)(intval($object->flags / 1000000) % 10);
+		$object->isBroadcasting = (bool)(intval($object->flags / 10000000) % 10);
+		$object->hasJoinedGame = (bool)(intval($object->flags / 100000000) % 10);
 		//Details spectatorStatus
-		$object->spectator                = (bool) ($object->spectatorStatus % 10);
-		$object->temporarySpectator       = (bool) (intval($object->spectatorStatus / 10) % 10);
-		$object->pureSpectator            = (bool) (intval($object->spectatorStatus / 100) % 10);
-		$object->autoTarget               = (bool) (intval($object->spectatorStatus / 1000) % 10);
-		$object->currentTargetId          = intval($object->spectatorStatus / 10000);
+		$object->spectator = (bool)($object->spectatorStatus % 10);
+		$object->temporarySpectator = (bool)(intval($object->spectatorStatus / 10) % 10);
+		$object->pureSpectator = (bool)(intval($object->spectatorStatus / 100) % 10);
+		$object->autoTarget = (bool)(intval($object->spectatorStatus / 1000) % 10);
+		$object->currentTargetId = intval($object->spectatorStatus / 10000);
 
 		return $object;
 	}

libs/Maniaplanet/DedicatedServer/Structures/ScriptInfo.php

@@ -18,9 +18,9 @@ class ScriptInfo extends AbstractStructure
 	/** @var string */
 	public $version;
 	/** @var ScriptSettings[] */
-	public $paramDescs = array();
+	public $paramDescs = [];
 	/** @var Command[] */
-	public $commandDescs = array();
+	public $commandDescs = [];
 
 	/**
 	 * @return ScriptInfo

libs/Maniaplanet/DedicatedServer/Structures/ServerOptions.php

@@ -27,7 +27,7 @@ class ServerOptions extends AbstractStructure
 	 * @internal
 	 * @return bool
 	 */
-	function isValid()
+	public function isValid(): bool
 	{
 		return is_string($this->name)
 			&& is_string($this->comment)
@@ -41,15 +41,16 @@ class ServerOptions extends AbstractStructure
 	 * @internal
 	 * @return mixed[]
 	 */
-	function toSetterArray()
+	public function toSetterArray()
 	{
-		$out = array();
-		foreach(get_object_vars($this) as $key => $value)
-		{
-			if(substr($key, 0, 7) == 'current' || $value === null)
+		$out = [];
+		foreach (get_object_vars($this) as $key => $value) {
+			if (str_starts_with($key, 'current') || $value === null) {
 				continue;
-			if($key == 'nextUseChangingValidationSeed')
+			}
+			if ($key === 'nextUseChangingValidationSeed') {
 				$key = 'useChangingValidationSeed';
+			}
 			$out[ucfirst($key)] = $value;
 		}
 		return $out;

libs/Maniaplanet/DedicatedServer/Structures/ServerPlugin.php

@@ -0,0 +1,28 @@
+<?php
+/**
+ * ManiaPlanet dedicated server Xml-RPC client
+ *
+ * @license     http://www.gnu.org/licenses/lgpl.html LGPL License 3
+ */
+
+namespace Maniaplanet\DedicatedServer\Structures;
+
+class ServerPlugin extends AbstractStructure
+{
+	/** @var string */
+	public $name;
+	/** @var string[] */
+	public $settingsValues;
+	/** @var ScriptSettings[] */
+	public $settingsDesc = array();
+
+	/**
+	 * @return ScriptInfo
+	 */
+	public static function fromArray($array)
+	{
+		$object = parent::fromArray($array);
+		$object->settingsDesc = ScriptSettings::fromArrayOfArray($object->paramDescs);
+		return $object;
+	}
+}

libs/Maniaplanet/DedicatedServer/Structures/Status.php

@@ -9,13 +9,13 @@ namespace Maniaplanet\DedicatedServer\Structures;
 
 class Status extends AbstractStructure
 {
-	const UNKNOWN         = 0;
-	const WAITING         = 1;
-	const LAUNCHING       = 2;
+	const UNKNOWN = 0;
+	const WAITING = 1;
+	const LAUNCHING = 2;
 	const SYNCHRONIZATION = 3;
-	const PLAY            = 4;
-	const EXITING         = 6;
-	const LOCAL           = 7;
+	const PLAY = 4;
+	const EXITING = 6;
+	const LOCAL = 7;
 
 	/** @var int */
 	public $code;

libs/Maniaplanet/DedicatedServer/Structures/Vote.php

@@ -27,7 +27,7 @@ class Vote extends AbstractStructure
 	 * @param string $cmdName
 	 * @param mixed[] $cmdParam
 	 */
-	function __construct($cmdName='', $cmdParam=array())
+	function __construct($cmdName = '', $cmdParam = [])
 	{
 		$this->cmdName = $cmdName;
 		$this->cmdParam = $cmdParam;

libs/Maniaplanet/DedicatedServer/Structures/VoteRatio.php

@@ -9,15 +9,15 @@ namespace Maniaplanet\DedicatedServer\Structures;
 
 class VoteRatio extends AbstractStructure
 {
-	const COMMAND_DEFAULT         = '*';
+	const COMMAND_DEFAULT = '*';
 	const COMMAND_SCRIPT_SETTINGS = 'SetModeScriptSettingsAndCommands';
-	const COMMAND_NEXT_MAP        = 'NextMap';
-	const COMMAND_JUMP_MAP        = 'JumpToMapIdent';
-	const COMMAND_SET_NEXT_MAP    = 'SetNextMapIdent';
-	const COMMAND_RESTART_MAP     = 'RestartMap';
-	const COMMAND_TEAM_BALANCE    = 'AutoTeamBalance';
-	const COMMAND_KICK            = 'Kick';
-	const COMMAND_BAN             = 'Ban';
+	const COMMAND_NEXT_MAP = 'NextMap';
+	const COMMAND_JUMP_MAP = 'JumpToMapIdent';
+	const COMMAND_SET_NEXT_MAP = 'SetNextMapIdent';
+	const COMMAND_RESTART_MAP = 'RestartMap';
+	const COMMAND_TEAM_BALANCE = 'AutoTeamBalance';
+	const COMMAND_KICK = 'Kick';
+	const COMMAND_BAN = 'Ban';
 
 	/** @var string '*' for default */
 	public $command;

libs/Maniaplanet/DedicatedServer/Xmlrpc/Exception.php

@@ -7,4 +7,6 @@
 
 namespace Maniaplanet\DedicatedServer\Xmlrpc;
 
-class Exception extends \Exception {}
+class Exception extends \Exception
+{
+}

libs/Maniaplanet/DedicatedServer/Xmlrpc/FaultException.php

@@ -7,8 +7,10 @@
 
 namespace Maniaplanet\DedicatedServer\Xmlrpc;
 
-class FaultException extends Exception {
-	static function create($faultString, $faultCode) {
+class FaultException extends Exception
+{
+	static function create($faultString, $faultCode)
+	{
 		switch ($faultString) {
 			case 'Password incorrect.':
 			case 'Permission denied.':
@@ -31,6 +33,7 @@ class FaultException extends Exception {
 			case 'Already waiting for a vote.':
 			case 'You must stop server first.':
 				return new LockedFeatureException($faultString, $faultCode);
+			case 'Can\'t kick server.':
 			case 'Login or Uid unknown.':
 			case 'Login unknown.':
 			case 'Payer login unknown.':
@@ -110,44 +113,58 @@ class FaultException extends Exception {
 	}
 }
 
-class AuthenticationException extends FaultException {
+class AuthenticationException extends FaultException
+{
 }
 
-class UnavailableFeatureException extends FaultException {
+class UnavailableFeatureException extends FaultException
+{
 }
 
-class LockedFeatureException extends FaultException {
+class LockedFeatureException extends FaultException
+{
 }
 
-class UnknownPlayerException extends FaultException {
+class UnknownPlayerException extends FaultException
+{
 }
 
-class PlayerStateException extends FaultException {
+class PlayerStateException extends FaultException
+{
 }
 
-class AlreadyInListException extends FaultException {
+class AlreadyInListException extends FaultException
+{
 }
 
-class NotInListException extends FaultException {
+class NotInListException extends FaultException
+{
 }
 
-class IndexOutOfBoundException extends FaultException {
+class IndexOutOfBoundException extends FaultException
+{
 }
 
-class NextMapException extends FaultException {
+class NextMapException extends FaultException
+{
 }
 
-class ChangeInProgressException extends FaultException {
+class ChangeInProgressException extends FaultException
+{
 }
 
-class InvalidMapException extends FaultException {
+class InvalidMapException extends FaultException
+{
 }
 
-class GameModeException extends FaultException {
+class GameModeException extends FaultException
+{
 }
 
-class ServerOptionsException extends FaultException {
+class ServerOptionsException extends FaultException
+{
 }
 
-class FileException extends FaultException {
+class FileException extends FaultException
+{
 }

libs/Maniaplanet/DedicatedServer/Xmlrpc/GbxRemote.php

@@ -9,18 +9,18 @@ namespace Maniaplanet\DedicatedServer\Xmlrpc;
 
 class GbxRemote
 {
-	const MAX_REQUEST_SIZE  = 0x200000; // 2MB
+	const MAX_REQUEST_SIZE = 0x400000; // 4MB
 	const MAX_RESPONSE_SIZE = 0x400000; // 4MB
 
 	public static $received;
 	public static $sent;
 
 	private $socket;
-	private $readTimeout = array('sec' => 30, 'usec' => 0);
-	private $writeTimeout = array('sec' => 30, 'usec' => 0);
+	private $readTimeout = ['sec' => 5, 'usec' => 0];
+	private $writeTimeout = ['sec' => 5, 'usec' => 0];
 	private $requestHandle;
-	private $callbacksBuffer = array();
-	private $multicallBuffer = array();
+	private $callbacksBuffer = [];
+	private $multicallBuffer = [];
 	private $lastNetworkActivity = 0;
 
 	/**
@@ -30,30 +30,104 @@ class GbxRemote
 	 */
 	function __construct($host, $port, $timeout = 5)
 	{
-		$this->requestHandle = (int) 0x80000000;
+		$this->requestHandle = (int)0x80000000;
 		$this->connect($host, $port, $timeout);
 	}
 
+	/**
+	 * @param string $host
+	 * @param int $port
+	 * @param int $timeout
+	 * @throws TransportException
+	 */
+	private function connect($host, $port, $timeout)
+	{
+		$this->socket = @fsockopen($host, $port, $errno, $errstr, $timeout);
+		if (!$this->socket) {
+			throw new TransportException('Cannot open socket', TransportException::NOT_INITIALIZED);
+		}
+
+		stream_set_read_buffer($this->socket, 0);
+		stream_set_write_buffer($this->socket, 0);
+
+		// handshake
+		$header = $this->read(15);
+		if ($header === false) {
+			if (!is_resource($this->socket)) {
+				$this->onIoFailure('socket closed during handshake');
+			}
+			$this->onIoFailure(sprintf('during handshake (%s)', socket_strerror(socket_last_error())));
+		}
+
+		extract(unpack('Vsize/a*protocol', $header));
+		/** @var $size int */
+		/** @var $protocol string */
+		if ($size != 11 || $protocol != 'GBXRemote 2') {
+			throw new TransportException('Wrong protocol header', TransportException::WRONG_PROTOCOL);
+		}
+		$this->lastNetworkActivity = time();
+	}
+
+	/**
+	 * @param int $size
+	 * @return boolean|string
+	 */
+	private function read($size)
+	{
+		@stream_set_timeout($this->socket, $this->readTimeout['sec'], $this->readTimeout['usec']);
+
+		$data = '';
+		while (strlen($data) < $size) {
+			$buf = @fread($this->socket, $size - strlen($data));
+			if ($buf === '' || $buf === false) {
+				return false;
+			}
+			$data .= $buf;
+		}
+
+		self::$received += $size;
+		return $data;
+	}
+
+	/**
+	 * @param string $when
+	 * @throws TransportException
+	 */
+	private function onIoFailure($when)
+	{
+		$meta = stream_get_meta_data($this->socket);
+		if ($meta['timed_out']) {
+			throw new TransportException('Connection timed out ' . $when, TransportException::TIMED_OUT);
+		}
+		throw new TransportException('Connection interrupted ' . $when, TransportException::INTERRUPTED);
+	}
+
 	function __destruct()
 	{
 		$this->terminate();
 	}
 
+	public function terminate()
+	{
+		if ($this->socket) {
+			fclose($this->socket);
+			$this->socket = null;
+		}
+	}
+
 	/**
 	 * Change timeouts
 	 * @param int $read read timeout (in ms), 0 to leave unchanged
 	 * @param int $write write timeout (in ms), 0 to leave unchanged
 	 */
-	function setTimeouts($read=0, $write=0)
+	public function setTimeouts($read = 0, $write = 0)
 	{
-		if($read)
-		{
-			$this->readTimeout['sec'] = (int) ($read / 1000);
+		if ($read) {
+			$this->readTimeout['sec'] = (int)($read / 1000);
 			$this->readTimeout['usec'] = ($read % 1000) * 1000;
 		}
-		if($write)
-		{
-			$this->writeTimeout['sec'] = (int) ($write / 1000);
+		if ($write) {
+			$this->writeTimeout['sec'] = (int)($write / 1000);
 			$this->writeTimeout['usec'] = ($write % 1000) * 1000;
 		}
 	}
@@ -68,39 +142,49 @@ class GbxRemote
 	}
 
 	/**
-	 * @param string $host
-	 * @param int $port
-	 * @param int $timeout
 	 * @throws TransportException
 	 */
-	private function connect($host, $port, $timeout)
+	private function assertConnected()
 	{
-		$this->socket = @fsockopen($host, $port, $errno, $errstr, $timeout);
-		if(!$this->socket)
-			throw new TransportException('Cannot open socket', TransportException::NOT_INITIALIZED);
-
-		stream_set_read_buffer($this->socket, 0);
-		stream_set_write_buffer($this->socket, 0);
-
-		// handshake
-		$header = $this->read(15);
-		if($header === false)
-			$this->onIoFailure(sprintf('during handshake (%s)', socket_strerror(socket_last_error($this->socket))));
-
-		extract(unpack('Vsize/a*protocol', $header));
-		/** @var $size int */
-		/** @var $protocol string */
-		if($size != 11 || $protocol != 'GBXRemote 2')
-			throw new TransportException('Wrong protocol header', TransportException::WRONG_PROTOCOL);
-		$this->lastNetworkActivity = time();
+		if (!$this->socket) {
+			throw new TransportException('Connection not initialized', TransportException::NOT_INITIALIZED);
+		}
 	}
 
-	function terminate()
+	/**
+	 * @param string $method
+	 * @param mixed[] $args
+	 */
+	function addCall($method, $args)
 	{
-		if($this->socket)
-		{
-			fclose($this->socket);
-			$this->socket = null;
+		$this->multicallBuffer[] = [
+			'methodName' => $method,
+			'params' => $args
+		];
+	}
+
+	/**
+	 * @return mixed
+	 */
+	function multiquery()
+	{
+		switch (count($this->multicallBuffer)) {
+			case 0:
+				return [];
+			case 1:
+				$call = array_shift($this->multicallBuffer);
+				return [$this->query($call['methodName'], $call['params'])];
+			default:
+				$result = $this->query('system.multicall', [$this->multicallBuffer]);
+				foreach ($result as &$value) {
+					if (isset($value['faultCode'])) {
+						$value = FaultException::create($value['faultString'], $value['faultCode']);
+					} else {
+						$value = $value[0];
+					}
+				}
+				$this->multicallBuffer = [];
+				return $result;
 		}
 	}
 
@@ -110,19 +194,19 @@ class GbxRemote
 	 * @return mixed
 	 * @throws MessageException
 	 */
-	function query($method, $args=array())
+	function query($method, $args = [])
 	{
 		$this->assertConnected();
 		$xml = Request::encode($method, $args);
 
-		if(strlen($xml) > self::MAX_REQUEST_SIZE-8)
-		{
-			if($method != 'system.multicall' || count($args[0]) < 2)
+		if (strlen($xml) > self::MAX_REQUEST_SIZE - 8) {
+			if ($method != 'system.multicall' || count($args[0]) < 2) {
 				throw new MessageException('Request too large', MessageException::REQUEST_TOO_LARGE);
+			}
 
 			$mid = count($args[0]) >> 1;
-			$res1 = $this->query('system.multicall', array(array_slice($args[0], 0, $mid)));
-			$res2 = $this->query('system.multicall', array(array_slice($args[0], $mid)));
+			$res1 = $this->query('system.multicall', [array_slice($args[0], 0, $mid)]);
+			$res2 = $this->query('system.multicall', [array_slice($args[0], $mid)]);
 			return array_merge($res1, $res2);
 		}
 
@@ -131,60 +215,40 @@ class GbxRemote
 	}
 
 	/**
-	 * @param string $method
-	 * @param mixed[] $args
-	 */
-	function addCall($method, $args)
-	{
-		$this->multicallBuffer[] = array(
-			'methodName' => $method,
-			'params' => $args
-		);
-	}
-
-	/**
-	 * @return mixed
-	 */
-	function multiquery()
-	{
-		switch(count($this->multicallBuffer))
-		{
-			case 0:
-				return array();
-			case 1:
-				$call = array_shift($this->multicallBuffer);
-				return array($this->query($call['methodName'], $call['params']));
-			default:
-				$result = $this->query('system.multicall', array($this->multicallBuffer));
-				foreach($result as &$value)
-					if(isset($value['faultCode']))
-						$value = FaultException::create($value['faultString'], $value['faultCode']);
-					else
-						$value = $value[0];
-				$this->multicallBuffer = array();
-				return $result;
-		}
-	}
-
-	/**
-	 * @return mixed[]
-	 */
-	function getCallbacks()
-	{
-		$this->assertConnected();
-		$this->flush();
-		$cb = $this->callbacksBuffer;
-		$this->callbacksBuffer = array();
-		return $cb;
-	}
-
-	/**
+	 * @param string $xml
 	 * @throws TransportException
 	 */
-	private function assertConnected()
+	private function writeMessage($xml)
 	{
-		if(!$this->socket)
-			throw new TransportException('Connection not initialized', TransportException::NOT_INITIALIZED);
+		if ($this->requestHandle == (int)0xffffffff) {
+			$this->requestHandle = (int)0x80000000;
+		}
+		$data = pack('V2', strlen($xml), ++$this->requestHandle) . $xml;
+		if (!$this->write($data)) {
+			$this->onIoFailure('while writing');
+		}
+		$this->lastNetworkActivity = time();
+	}
+
+	/**
+	 * @param string $data
+	 * @return boolean
+	 */
+	private function write($data)
+	{
+		@stream_set_timeout($this->socket, $this->writeTimeout['sec'], $this->writeTimeout['usec']);
+		self::$sent += strlen($data);
+
+		while (strlen($data) > 0) {
+			$written = @fwrite($this->socket, $data);
+			if ($written === 0 || $written === false) {
+				return false;
+			}
+
+			$data = substr($data, $written);
+		}
+
+		return true;
 	}
 
 	/**
@@ -192,20 +256,19 @@ class GbxRemote
 	 * @return mixed
 	 * @throws FaultException
 	 */
-	private function flush($waitResponse=false)
+	private function flush($waitResponse = false)
 	{
-		$r = array($this->socket);
-		while($waitResponse || @stream_select($r, $w, $e, 0) > 0)
-		{
+		$r = [$this->socket];
+		while ($waitResponse || @stream_select($r, $w, $e, 0) > 0) {
 			list($handle, $xml) = $this->readMessage();
 			list($type, $value) = Request::decode($xml);
-			switch($type)
-			{
+			switch ($type) {
 				case 'fault':
 					throw FaultException::create($value['faultString'], $value['faultCode']);
 				case 'response':
-					if($handle == $this->requestHandle)
+					if ($handle == $this->requestHandle) {
 						return $value;
+					}
 					break;
 				case 'call':
 					$this->callbacksBuffer[] = $value;
@@ -221,106 +284,54 @@ class GbxRemote
 	private function readMessage()
 	{
 		$header = $this->read(8);
-		if($header === false)
+		if ($header === false) {
 			$this->onIoFailure('while reading header');
+		}
 
 		extract(unpack('Vsize/Vhandle', $header));
 		/** @var $size int */
 		/** @var $handle int */
-		if($size == 0 || $handle == 0)
+		if ($size == 0 || $handle == 0) {
 			throw new TransportException('Incorrect header', TransportException::PROTOCOL_ERROR);
+		}
 
-		if($size > self::MAX_RESPONSE_SIZE)
+		if ($size > self::MAX_RESPONSE_SIZE) {
 			throw new MessageException('Response too large', MessageException::RESPONSE_TOO_LARGE);
+		}
 
 		$data = $this->read($size);
-		if($data === false)
+		if ($data === false) {
 			$this->onIoFailure('while reading data');
-
-		$this->lastNetworkActivity = time();
-		return array($handle, $data);
-	}
-
-	/**
-	 * @param string $xml
-	 * @throws TransportException
-	 */
-	private function writeMessage($xml)
-	{
-		if($this->requestHandle == (int) 0xffffffff)
-			$this->requestHandle = (int) 0x80000000;
-		$data = pack('V2', strlen($xml), ++$this->requestHandle).$xml;
-		if(!$this->write($data))
-			$this->onIoFailure('while writing');
-		$this->lastNetworkActivity = time();
-	}
-
-	/**
-	 * @param int $size
-	 * @return boolean|string
-	 */
-	private function read($size)
-	{
-		@stream_set_timeout($this->socket, $this->readTimeout['sec'], $this->readTimeout['usec']);
-
-		$data = '';
-		while(strlen($data) < $size)
-		{
-			$buf = @fread($this->socket, $size - strlen($data));
-			if($buf === '' || $buf === false)
-				return false;
-			$data .= $buf;
 		}
 
-		self::$received += $size;
-		return $data;
+		$this->lastNetworkActivity = time();
+		return [$handle, $data];
 	}
 
 	/**
-	 * @param string $data
-	 * @return boolean
+	 * @return mixed[]
 	 */
-	private function write($data)
+	function getCallbacks()
 	{
-		@stream_set_timeout($this->socket, $this->writeTimeout['sec'], $this->writeTimeout['usec']);
-		self::$sent += strlen($data);
-
-		while(strlen($data) > 0)
-		{
-			$written = @fwrite($this->socket, $data);
-			if($written === 0 || $written === false)
-				return false;
-
-			$data = substr($data, $written);
-		}
-
-		return true;
-	}
-
-	/**
-	 * @param string $when
-	 * @throws TransportException
-	 */
-	private function onIoFailure($when)
-	{
-		$meta = stream_get_meta_data($this->socket);
-		if($meta['timed_out'])
-			throw new TransportException('Connection timed out '.$when, TransportException::TIMED_OUT);
-		throw new TransportException('Connection interrupted '.$when, TransportException::INTERRUPTED);
+		$this->assertConnected();
+		$this->flush();
+		$cb = $this->callbacksBuffer;
+		$this->callbacksBuffer = [];
+		return $cb;
 	}
 }
 
 class TransportException extends Exception
 {
 	const NOT_INITIALIZED = 1;
-	const INTERRUPTED     = 2;
-	const TIMED_OUT       = 3;
-	const WRONG_PROTOCOL  = 4;
-	const PROTOCOL_ERROR  = 5;
+	const INTERRUPTED = 2;
+	const TIMED_OUT = 3;
+	const WRONG_PROTOCOL = 4;
+	const PROTOCOL_ERROR = 5;
 }
 
 class MessageException extends Exception
 {
-	const REQUEST_TOO_LARGE  = 1;
+	const REQUEST_TOO_LARGE = 1;
 	const RESPONSE_TOO_LARGE = 2;
 }

libs/Maniaplanet/DedicatedServer/Xmlrpc/Request.php

@@ -7,26 +7,26 @@
 
 namespace Maniaplanet\DedicatedServer\Xmlrpc;
 
-if(extension_loaded('xmlrpc'))
-{
+if (extension_loaded('xmlrpc')) {
 	abstract class Request
 	{
-		private static $options = array(
+		private static $options = [
 			'encoding' => 'utf-8',
 			'escaping' => 'markup',
 			'verbosity' => 'no_white_space'
-		);
+		];
 
 		/**
 		 * @param string $method
 		 * @param mixed[] $args
 		 * @return string
 		 */
-		static function encode($method, $args, $escape=true)
+		static function encode($method, $args, $escape = true)
 		{
 			$opts = self::$options;
-			if(!$escape)
-				$opts['escaping'] = array();
+			if (!$escape) {
+				$opts['escaping'] = [];
+			}
 			return xmlrpc_encode_request($method, $args, $opts);
 		}
 
@@ -38,21 +38,20 @@ if(extension_loaded('xmlrpc'))
 		static function decode($message)
 		{
 			$value = xmlrpc_decode_request($message, $method, 'utf-8');
-			if($value === null)
+			if ($value === null) {
 				throw new ParseException();
-
-			if($method === null)
-			{
-				if(is_array($value) && xmlrpc_is_fault($value))
-					return array('fault', $value);
-				return array('response', $value);
 			}
-			return array('call', array($method, $value));
+
+			if ($method === null) {
+				if (is_array($value) && xmlrpc_is_fault($value)) {
+					return ['fault', $value];
+				}
+				return ['response', $value];
+			}
+			return ['call', [$method, $value]];
 		}
 	}
-}
-else
-{
+} else {
 	abstract class Request
 	{
 		const DATE_FORMAT = 'Ymd\TH:i:s';
@@ -62,64 +61,70 @@ else
 		 * @param mixed[] $args
 		 * @return string
 		 */
-		static function encode($method, $args, $escape=true)
+		static function encode($method, $args, $escape = true)
 		{
-			$xml = '<?xml version="1.0" encoding="utf-8"?><methodCall><methodName>'.self::escape($method, $escape).'</methodName>';
-			if(!$args)
-				return $xml.'<params/></methodCall>';
+			$xml = '<?xml version="1.0" encoding="utf-8"?><methodCall><methodName>' . self::escape($method, $escape) . '</methodName>';
+			if (!$args) {
+				return $xml . '<params/></methodCall>';
+			}
 
 			$xml .= '<params>';
-			foreach($args as $arg)
-				$xml .= '<param><value>'.self::encodeValue($arg, $escape).'</value></param>';
-			return $xml.'</params></methodCall>';
+			foreach ($args as $arg) {
+				$xml .= '<param><value>' . self::encodeValue($arg, $escape) . '</value></param>';
+			}
+			return $xml . '</params></methodCall>';
 		}
 
 		/**
 		 * @param mixed $v
 		 * @return string
 		 */
-		private static function encodeValue($v, $escape=true)
+		private static function encodeValue($v, $escape = true)
 		{
-			switch(gettype($v))
-			{
+			switch (gettype($v)) {
 				case 'boolean':
-					return '<boolean>'.((int) $v).'</boolean>';
+					return '<boolean>' . ((int)$v) . '</boolean>';
 				case 'integer':
-					return '<int>'.$v.'</int>';
+					return '<int>' . $v . '</int>';
 				case 'double':
-					return '<double>'.$v.'</double>';
+					return '<double>' . $v . '</double>';
 				case 'string':
-				case 'NULL':
-					if(!$v)
+					if (strlen($v) === 0) {
 						return '<string/>';
-					return '<string>'.self::escape($v, $escape).'</string>';
-				case 'object':
-					if($v instanceof Base64)
-					{
-						if(!$v->scalar)
-							return '<base64/>';
-						return '<base64>'.base64_encode($v->scalar).'</base64>';
 					}
-					if($v instanceof \DateTime)
-						return '<dateTime.iso8601>'.$v->format(self::DATE_FORMAT).'</dateTime.iso8601>';
+					return '<string>' . self::escape($v, $escape) . '</string>';
+				case 'NULL':
+					return '<string/>';
+				case 'object':
+					if ($v instanceof Base64) {
+						if (!$v->scalar) {
+							return '<base64/>';
+						}
+						return '<base64>' . base64_encode($v->scalar) . '</base64>';
+					}
+					if ($v instanceof \DateTime) {
+						return '<dateTime.iso8601>' . $v->format(self::DATE_FORMAT) . '</dateTime.iso8601>';
+					}
 					$v = get_object_vars($v);
-					// fallthrough
+				// fallthrough
 				case 'array':
 					// empty array case
-					if(!$v)
+					if (!$v) {
 						return '<array><data/></array>';
+					}
 					$return = '';
 					// pure array case
-					if(array_keys($v) === range(0, count($v) - 1))
-					{
-						foreach($v as $item)
-							$return .= '<value>'.self::encodeValue($item, $escape).'</value>';
-						return '<array><data>'.$return.'</data></array>';
+					if (array_keys($v) === range(0, count($v) - 1)) {
+						foreach ($v as $item) {
+							$return .= '<value>' . self::encodeValue($item, $escape) . '</value>';
+						}
+						return '<array><data>' . $return . '</data></array>';
 					}
 					// else it's a struct
-					foreach($v as $name => $value)
-						$return .= '<member><name>'.self::escape($name, $escape).'</name><value>'.self::encodeValue($value, $escape).'</value></member>';
-					return '<struct>'.$return.'</struct>';
+					foreach ($v as $name => $value) {
+						$return .= '<member><name>' . self::escape($name, $escape) . '</name><value>' . self::encodeValue($value, $escape) . '</value></member>';
+					}
+					return '<struct>' . $return . '</struct>';
 			}
 			return '';
 		}
@@ -129,10 +134,11 @@ else
 		 * @param bool $escape
 		 * @return string
 		 */
-		private static function escape($str, $escape=true)
+		private static function escape($str, $escape = true)
 		{
-			if($escape)
-				return '<![CDATA['.str_replace(']]>', ']]]]><![CDATA[>', $str).']]>';
+			if ($escape) {
+				return '<![CDATA[' . str_replace(']]>', ']]]]><![CDATA[>', $str) . ']]>';
+			}
 			return $str;
 		}
 
@@ -144,19 +150,21 @@ else
 		static function decode($message)
 		{
 			$xml = @simplexml_load_string($message);
-			if(!$xml)
+			if (!$xml) {
 				throw new ParseException();
-
-			if($xml->getName() == 'methodResponse')
-			{
-				if($xml->fault)
-					return array('fault', self::decodeValue($xml->fault->value));
-				return array('response', self::decodeValue($xml->params->param->value));
 			}
-			$params = array();
-			foreach($xml->params->param as $param)
+
+			if ($xml->getName() == 'methodResponse') {
+				if ($xml->fault) {
+					return ['fault', self::decodeValue($xml->fault->value)];
+				}
+				return ['response', self::decodeValue($xml->params->param->value)];
+			}
+			$params = [];
+			foreach ($xml->params->param as $param) {
 				$params[] = self::decodeValue($param->value);
-			return array('call', array((string) $xml->methodName, $params));
+			}
+			return ['call', [(string)$xml->methodName, $params]];
 		}
 
 		/**
@@ -167,34 +175,37 @@ else
 		{
 			$elt = $elt->children();
 			$elt = $elt[0];
-			switch($elt->getName())
-			{
+			switch ($elt->getName()) {
 				case 'boolean':
-					return (bool) (int) $elt;
+					return (bool)(int)$elt;
 				case 'i4':
 				case 'int':
-					return (int) $elt;
+					return (int)$elt;
 				case 'double':
-					return (double) $elt;
+					return (double)$elt;
 				case 'string':
-					return (string) $elt;
+					return (string)$elt;
 				case 'base64':
 					return new Base64(base64_decode($elt));
 				case 'dateTime.iso8601':
-					return \DateTime::createFromFormat(self::DATE_FORMAT, (string) $elt);
+					return \DateTime::createFromFormat(self::DATE_FORMAT, (string)$elt);
 				case 'array':
-					$arr = array();
-					foreach($elt->data->value as $v)
+					$arr = [];
+					foreach ($elt->data->value as $v) {
 						$arr[] = self::decodeValue($v);
+					}
 					return $arr;
 				case 'struct':
-					$struct = array();
-					foreach($elt as $member)
-						$struct[(string) $member->name] = self::decodeValue($member->value);
+					$struct = [];
+					foreach ($elt as $member) {
+						$struct[(string)$member->name] = self::decodeValue($member->value);
+					}
 					return $struct;
 			}
 		}
 	}
 }
 
-class ParseException extends Exception {}
+class ParseException extends Exception
+{
+}

libs/React/EventLoop/ExtEventLoop.php

@@ -28,7 +28,7 @@ class ExtEventLoop implements LoopInterface
     private $writeListeners = [];
     private $running;
 
-    public function __construct(EventBaseConfig $config = null)
+    public function __construct(?EventBaseConfig $config = null)
     {
         $this->eventBase = new EventBase($config);
         $this->nextTickQueue = new NextTickQueue($this);

libs/Symfony/Component/EventDispatcher/ContainerAwareEventDispatcher.php

@@ -160,7 +160,7 @@ class ContainerAwareEventDispatcher extends EventDispatcher
      *
      * @throws \InvalidArgumentException if the service is not defined
      */
-    public function dispatch($eventName, Event $event = null)
+    public function dispatch($eventName, ?Event $event = null)
     {
         $this->lazyLoad($eventName);
 

libs/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php

@@ -40,7 +40,7 @@ class TraceableEventDispatcher implements TraceableEventDispatcherInterface
      * @param Stopwatch                $stopwatch  A Stopwatch instance
      * @param LoggerInterface          $logger     A LoggerInterface instance
      */
-    public function __construct(EventDispatcherInterface $dispatcher, Stopwatch $stopwatch, LoggerInterface $logger = null)
+    public function __construct(EventDispatcherInterface $dispatcher, Stopwatch $stopwatch, ?LoggerInterface $logger = null)
     {
         $this->dispatcher = $dispatcher;
         $this->stopwatch = $stopwatch;
@@ -110,7 +110,7 @@ class TraceableEventDispatcher implements TraceableEventDispatcherInterface
     /**
      * {@inheritdoc}
      */
-    public function dispatch($eventName, Event $event = null)
+    public function dispatch($eventName, ?Event $event = null)
     {
         if (null === $event) {
             $event = new Event();

libs/Symfony/Component/EventDispatcher/Debug/WrappedListener.php

@@ -27,7 +27,7 @@ class WrappedListener
     private $stopwatch;
     private $dispatcher;
 
-    public function __construct($listener, $name, Stopwatch $stopwatch, EventDispatcherInterface $dispatcher = null)
+    public function __construct($listener, $name, Stopwatch $stopwatch, ?EventDispatcherInterface $dispatcher = null)
     {
         $this->listener = $listener;
         $this->name = $name;

libs/Symfony/Component/EventDispatcher/EventDispatcher.php

@@ -37,7 +37,7 @@ class EventDispatcher implements EventDispatcherInterface
      *
      * @api
      */
-    public function dispatch($eventName, Event $event = null)
+    public function dispatch($eventName, ?Event $event = null)
     {
         if (null === $event) {
             $event = new Event();

libs/Symfony/Component/EventDispatcher/EventDispatcherInterface.php

@@ -35,7 +35,7 @@ interface EventDispatcherInterface
      *
      * @api
      */
-    public function dispatch($eventName, Event $event = null);
+    public function dispatch($eventName, ?Event $event = null);
 
     /**
      * Adds an event listener that listens on the specified events.

libs/Symfony/Component/EventDispatcher/ImmutableEventDispatcher.php

@@ -38,7 +38,7 @@ class ImmutableEventDispatcher implements EventDispatcherInterface
     /**
      * {@inheritdoc}
      */
-    public function dispatch($eventName, Event $event = null)
+    public function dispatch($eventName, ?Event $event = null)
     {
         return $this->dispatcher->dispatch($eventName, $event);
     }