Compare commits

..

27 Commits

Author SHA1 Message Date
beu
6913609475 add php version in the /version 2025-06-22 22:45:23 +02:00
beu
a42c12ace8 remove map from the playlist when erasing map file 2025-06-22 11:47:22 +02:00
beu
a769fec577 improve logging 2025-06-22 11:45:44 +02:00
beu
271395edfa improve logging 2025-06-22 11:45:37 +02:00
beu
aefff423f7 check permission to prevent CustomEvent injection 2025-06-22 11:45:02 +02:00
beu
827e59ff93 fix error if admin is null 2025-06-22 11:10:12 +02:00
beu
f15fc201d2 Add logging when an admin change a setting 2025-06-22 10:41:45 +02:00
beu
7a8d9f2b0b fix many PHP 8.4 compatibility issues 2025-05-26 22:50:03 +02:00
beu
03a991cd50 sort plugins by natural order 2025-03-27 15:33:03 +01:00
beu
84e7e5fb17 fix small bug when disabling linked setting 2025-03-21 21:29:50 +01:00
beu
d8f93a3a31 increase default column size 2025-03-21 21:28:09 +01:00
beu
7ded2c6ffc fix php doc 2025-03-13 16:36:33 +01:00
beu
356cab4869 fix typo 2025-02-17 21:50:43 +01:00
beu
04a35dc47f disable auto update 2025-02-17 21:40:15 +01:00
beu
cfa42acd24 fix symbols in map name 2025-02-07 20:43:08 +01:00
beu
43cc088fa6 fix api url 2025-01-24 09:45:52 +01:00
beu
e6444a5a47 merge Maniacontrol official repository changes 2025-01-23 19:33:22 +01:00
beu
a6875cabc8 trim command before explode 2025-01-10 15:44:37 +01:00
beu
bfa3fdce60 fix add admin command 2024-11-13 16:21:39 +01:00
beu
9331e22a54 fix error with the setServerOptions method 2024-09-07 20:37:28 +02:00
beu
9c114cd13b allow to add admin without having them in the database 2024-08-28 18:26:55 +02:00
beu
c8bbb3d7c6 cherry pick maniaplanet lib 6.1 2024-08-25 22:30:06 +02:00
beu
3044e466b9 Add PUT method 2024-08-03 11:56:21 +02:00
beu
fb36146cf6 fix position on default widget size 2024-07-23 18:16:30 +02:00
beu
601e3d7431 improve button positions 2024-07-14 19:09:57 +02:00
beu
39db992394 Add support of Zip archive + Create folder button 2024-07-14 16:02:48 +02:00
beu
40c33de0c8 improve style of plugin menu 2024-07-14 15:25:20 +02:00
95 changed files with 2114 additions and 1937 deletions

View File

@ -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### ###v0.255###
#Additions #Additions
- added optional descriptions to Settings (but no MC-settings have descriptions yet) - added optional descriptions to Settings (but no MC-settings have descriptions yet)

View File

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

View File

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

View File

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

View File

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

View File

@ -188,7 +188,7 @@ class Configurator implements CallbackListener, CommandListener, ManialinkPageAn
* @param Player $player * @param Player $player
* @return \FML\ManiaLink * @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); $menuPosX = $this->maniaControl->getSettingManager()->getSettingValue($this, self::SETTING_MENU_POSX);
$menuPosY = $this->maniaControl->getSettingManager()->getSettingValue($this, self::SETTING_MENU_POSY); $menuPosY = $this->maniaControl->getSettingManager()->getSettingValue($this, self::SETTING_MENU_POSY);
$menuWidth = $this->maniaControl->getSettingManager()->getSettingValue($this, self::SETTING_MENU_WIDTH); $menuWidth = $this->maniaControl->getSettingManager()->getSettingValue($this, self::SETTING_MENU_WIDTH);

View File

@ -618,6 +618,7 @@ class GameModeSettings implements ConfiguratorMenu, CallbackListener, Communicat
// Trigger own callback // Trigger own callback
$this->maniaControl->getCallbackManager()->triggerCallback(self::CB_GAMEMODESETTING_CHANGED, $settingName, $settingValue); $this->maniaControl->getCallbackManager()->triggerCallback(self::CB_GAMEMODESETTING_CHANGED, $settingName, $settingValue);
Logger::log(AuthenticationManager::getAuthLevelName($player->authLevel) .' "'. $player->nickname . '" ('. $player->login .') changed the gamemode setting "'. $settingName .'" to "'. $settingValue .'"');
$settingIndex++; $settingIndex++;
} }
@ -627,7 +628,6 @@ class GameModeSettings implements ConfiguratorMenu, CallbackListener, Communicat
$chatMessage .= '!'; $chatMessage .= '!';
$this->maniaControl->getChat()->sendInformation($chatMessage); $this->maniaControl->getChat()->sendInformation($chatMessage);
Logger::logInfo($chatMessage, true);
return true; return true;
} }

View File

@ -15,6 +15,7 @@ use FML\Script\Script;
use ManiaControl\Admin\AuthenticationManager; use ManiaControl\Admin\AuthenticationManager;
use ManiaControl\Callbacks\CallbackListener; use ManiaControl\Callbacks\CallbackListener;
use ManiaControl\Callbacks\CallbackManager; use ManiaControl\Callbacks\CallbackManager;
use ManiaControl\Logger;
use ManiaControl\ManiaControl; use ManiaControl\ManiaControl;
use ManiaControl\Players\Player; use ManiaControl\Players\Player;
use ManiaControl\Settings\Setting; use ManiaControl\Settings\Setting;
@ -528,6 +529,7 @@ class ManiaControlSettings implements ConfiguratorMenu, CallbackListener {
$setting->value = $settingData['Value']; $setting->value = $settingData['Value'];
} }
$this->maniaControl->getSettingManager()->saveSetting($setting); $this->maniaControl->getSettingManager()->saveSetting($setting);
Logger::log(AuthenticationManager::getAuthLevelName($player->authLevel) .' "'. $player->nickname . '" ('. $player->login .') changed the setting "'. $setting->class . '\\\\' . $setting->setting .'" to "'. $setting->value .'"');
} }
$this->maniaControl->getChat()->sendSuccess('Settings saved!', $player); $this->maniaControl->getChat()->sendSuccess('Settings saved!', $player);

View File

@ -44,6 +44,9 @@ class Database implements TimerListener {
// Enable mysqli Reconnect // Enable mysqli Reconnect
ini_set('mysqli.reconnect', 'on'); 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 // Open database connection
$this->loadConfig(); $this->loadConfig();
$this->mysqli = @new \mysqli($this->config->host, $this->config->user, $this->config->pass, null, $this->config->port); $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 * Check whether the Database Connection is still open
*/ */
public function checkConnection() { 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); $this->maniaControl->quit('The MySQL Server has gone away!', true);
} }
} }

View File

@ -136,6 +136,31 @@ class AsyncHttpRequest implements UsageInformationAble {
$this->processRequest($request); $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 * Processes the Request

View File

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

View File

@ -56,7 +56,7 @@ class ManiaControl implements CallbackListener, CommandListener, TimerListener,
/* /*
* Constants * Constants
*/ */
const VERSION = '0.256'; const VERSION = '0.258';
const ISTRACKMANIACONTROL = True; const ISTRACKMANIACONTROL = True;
const API_VERSION = '2038-01-19'; const API_VERSION = '2038-01-19';
const MIN_DEDIVERSION = '2020-07-01_00_00'; const MIN_DEDIVERSION = '2020-07-01_00_00';
@ -299,7 +299,6 @@ class ManiaControl implements CallbackListener, CommandListener, TimerListener,
} }
// Delete client // Delete client
Connection::delete($this->getClient());
$this->client = null; $this->client = null;
} }
@ -548,7 +547,7 @@ class ManiaControl implements CallbackListener, CommandListener, TimerListener,
* @param Player $player * @param Player $player
*/ */
public function commandVersion(array $chatCallback, Player $player) { public function commandVersion(array $chatCallback, Player $player) {
$message = 'This server is using TrackManiaControl v' . ManiaControl::VERSION . '!'; $message = 'This server is using TrackManiaControl v' . ManiaControl::VERSION . ' with PHP '. phpversion() .'!';
$this->getChat()->sendInformation($message, $player); $this->getChat()->sendInformation($message, $player);
} }
@ -722,7 +721,7 @@ class ManiaControl implements CallbackListener, CommandListener, TimerListener,
Logger::log("Connecting to Server at {$serverConfig->host}:{$serverConfig->port}..."); Logger::log("Connecting to Server at {$serverConfig->host}:{$serverConfig->port}...");
try { 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) { } catch (TransportException $exception) {
$message = "Couldn't connect to the server: '{$exception->getMessage()}'"; $message = "Couldn't connect to the server: '{$exception->getMessage()}'";
$this->quit($message, true); $this->quit($message, true);

View File

@ -44,7 +44,7 @@ class MXMapInfo {
} else { } else {
$this->dir = 'maps'; $this->dir = 'maps';
$this->id = $mx->MapID; $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 === '?') { if (!isset($mx->GbxMapName) || $mx->GbxMapName === '?') {

View File

@ -23,7 +23,7 @@ class ManiaExchangeManager implements UsageInformationAble {
* Constants * Constants
* @deprecated SEARCH 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_NONE = -1;
const SEARCH_ORDER_TRACK_NAME = 0; const SEARCH_ORDER_TRACK_NAME = 0;
const SEARCH_ORDER_AUTHOR = 1; const SEARCH_ORDER_AUTHOR = 1;
@ -190,7 +190,7 @@ class ManiaExchangeManager implements UsageInformationAble {
} }
// compile search URL // 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)) { /*if ($key = $this->maniaControl->getSettingManager()->getSettingValue($this, self::SETTING_MX_KEY)) {
$url .= "&key=" . $key; $url .= "&key=" . $key;
@ -300,7 +300,7 @@ class ManiaExchangeManager implements UsageInformationAble {
} }
// compile search URL // 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)) { /*if ($key = $this->maniaControl->getSettingManager()->getSettingValue($this, self::SETTING_MX_KEY)) {
$url .= "&key=" . $key; $url .= "&key=" . $key;

View File

@ -18,7 +18,7 @@ use Maniaplanet\DedicatedServer\Xmlrpc\GameModeException;
class ManiaExchangeMapSearch implements UsageInformationAble { class ManiaExchangeMapSearch implements UsageInformationAble {
use UsageInformationTrait; 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_NONE = -1;
const SEARCH_ORDER_TRACK_NAME = 0; const SEARCH_ORDER_TRACK_NAME = 0;
const SEARCH_ORDER_AUTHOR = 1; 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_LTH = 26;
const SEARCH_ORDER_ONLINE_RATING_HTL = 27; 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_DEFAULT = 0;
const SEARCH_ORDER_SPECIAL_USER_TRACKS = 1; const SEARCH_ORDER_SPECIAL_USER_TRACKS = 1;
const SEARCH_ORDER_SPECIAL_LATEST_TRACKS = 2; const SEARCH_ORDER_SPECIAL_LATEST_TRACKS = 2;

View File

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

View File

@ -2,6 +2,8 @@
namespace ManiaControl\Maps; namespace ManiaControl\Maps;
use finfo;
use ZipArchive;
use FML\Controls\Frame; use FML\Controls\Frame;
use FML\Controls\Label; use FML\Controls\Label;
use FML\Controls\Entry; use FML\Controls\Entry;
@ -13,6 +15,7 @@ use FML\Controls\Quads\Quad_UIConstruction_Buttons;
use FML\Controls\Quads\Quad_UIConstructionBullet_Buttons; use FML\Controls\Quads\Quad_UIConstructionBullet_Buttons;
use FML\ManiaLink; use FML\ManiaLink;
use FML\Script\Features\Paging; use FML\Script\Features\Paging;
use ManiaControl\Admin\AuthenticationManager;
use ManiaControl\Files\AsyncHttpRequest; use ManiaControl\Files\AsyncHttpRequest;
use ManiaControl\Files\FileUtil; use ManiaControl\Files\FileUtil;
use ManiaControl\Logger; use ManiaControl\Logger;
@ -42,6 +45,7 @@ class DirectoryBrowser implements ManialinkPageAnswerListener {
const ACTION_INSPECT_FILE = 'MapsDirBrowser.InspectFile.'; const ACTION_INSPECT_FILE = 'MapsDirBrowser.InspectFile.';
const ACTION_ADD_FILE = 'MapsDirBrowser.AddFile.'; const ACTION_ADD_FILE = 'MapsDirBrowser.AddFile.';
const ACTION_ERASE_FILE = 'MapsDirBrowser.EraseFile.'; const ACTION_ERASE_FILE = 'MapsDirBrowser.EraseFile.';
const ACTION_CREATE_FOLDER = 'MapsDirBrowser.CreateFolder';
const ACTION_DOWNLOAD_FILE = 'MapsDirBrowser.DownloadFile'; const ACTION_DOWNLOAD_FILE = 'MapsDirBrowser.DownloadFile';
const WIDGET_NAME = 'MapsDirBrowser.Widget'; const WIDGET_NAME = 'MapsDirBrowser.Widget';
const CACHE_FOLDER_PATH = 'FolderPath'; const CACHE_FOLDER_PATH = 'FolderPath';
@ -68,6 +72,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_INSPECT_FILE), $this, 'handleInspectFile');
$this->maniaControl->getManialinkManager()->registerManialinkPageAnswerRegexListener($this->buildActionRegex(self::ACTION_ADD_FILE), $this, 'handleAddFile'); $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_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'); $this->maniaControl->getManialinkManager()->registerManialinkPageAnswerRegexListener($this->buildActionRegex(self::ACTION_DOWNLOAD_FILE), $this, 'handleDownloadFile');
} }
@ -140,7 +145,7 @@ class DirectoryBrowser implements ManialinkPageAnswerListener {
$height = $this->maniaControl->getManialinkManager()->getStyleManager()->getListWidgetsHeight(); $height = $this->maniaControl->getManialinkManager()->getStyleManager()->getListWidgetsHeight();
$innerWidth = $width - 2; $innerWidth = $width - 2;
$innerHeigth = $height - 22; $innerHeigth = $height - 27;
$lineHeight = 4.; $lineHeight = 4.;
@ -181,12 +186,12 @@ class DirectoryBrowser implements ManialinkPageAnswerListener {
$tooltipLabel = new Label(); $tooltipLabel = new Label();
$repositionnedFrame->addChild($tooltipLabel); $repositionnedFrame->addChild($tooltipLabel);
$tooltipLabel->setPosition(3, $height * -1 + 10); $tooltipLabel->setPosition(3, $height * -1 + 15);
$tooltipLabel->setSize($width * 0.8, 5); $tooltipLabel->setSize($width * 0.8, 5);
$tooltipLabel->setHorizontalAlign($tooltipLabel::LEFT); $tooltipLabel->setHorizontalAlign($tooltipLabel::LEFT);
$tooltipLabel->setTextSize(1); $tooltipLabel->setTextSize(1);
// Download button // Back button
$backButton = new Label_Button(); $backButton = new Label_Button();
$repositionnedFrame->addChild($backButton); $repositionnedFrame->addChild($backButton);
$backButton->setStyle($backButton::STYLE_CardMain_Quit); $backButton->setStyle($backButton::STYLE_CardMain_Quit);
@ -194,23 +199,59 @@ class DirectoryBrowser implements ManialinkPageAnswerListener {
$backButton->setScale(0.5); $backButton->setScale(0.5);
$backButton->setText('Back'); $backButton->setText('Back');
$backButton->setPosition(3, $height * -1 + 5); $backButton->setPosition(3, $height * -1 + 5);
$backButton->setSize(5, 10);
$backButton->setAction(MapCommands::ACTION_OPEN_MAPLIST); $backButton->setAction(MapCommands::ACTION_OPEN_MAPLIST);
// Create folder button
$label = new Label_Text(); $label = new Label_Text();
$repositionnedFrame->addChild($label); $repositionnedFrame->addChild($label);
$label->setPosition(25, $height * -1 + 5); $label->setPosition($width - 113, $height * -1 + 10);
$label->setSize(25, 5);
$label->setHorizontalAlign($label::LEFT); $label->setHorizontalAlign($label::LEFT);
$label->setTextSize(1); $label->setTextSize(1);
$label->setText('Download from URL: '); $label->setText('Create folder: ');
$label->setAreaFocusColor("00000000");
$label->setAreaColor("00000000");
$entry = new Entry(); $entry = new Entry();
$repositionnedFrame->addChild($entry); $repositionnedFrame->addChild($entry);
$entry->setStyle(Label_Text::STYLE_TextValueSmall); $entry->setStyle(Label_Text::STYLE_TextValueSmall);
$entry->setHorizontalAlign($entry::LEFT); $entry->setHorizontalAlign($entry::LEFT);
$entry->setPosition(53, $height * -1 + 5); $entry->setPosition($width - 95, $height * -1 + 10);
$entry->setTextSize(1); $entry->setTextSize(1);
$entry->setSize($width * 0.35, 4); $entry->setSize(50, 4);
$entry->setName("Value"); $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 //Search for Map-Name
$downloadButton = $this->maniaControl->getManialinkManager()->getElementBuilder()->buildRoundTextButton( $downloadButton = $this->maniaControl->getManialinkManager()->getElementBuilder()->buildRoundTextButton(
@ -220,7 +261,7 @@ class DirectoryBrowser implements ManialinkPageAnswerListener {
self::ACTION_DOWNLOAD_FILE self::ACTION_DOWNLOAD_FILE
); );
$repositionnedFrame->addChild($downloadButton); $repositionnedFrame->addChild($downloadButton);
$downloadButton->setPosition(53 + 18 / 2 + $width * 0.35, $height * -1 + 5); $downloadButton->setPosition($width - 27 - 18/2, $height * -1 + 5);
$mapFiles = $this->scanMapFiles($folderPath); $mapFiles = $this->scanMapFiles($folderPath);
@ -282,7 +323,7 @@ class DirectoryBrowser implements ManialinkPageAnswerListener {
$nameLabel->setAction(self::ACTION_OPEN_FOLDER . substr($shortFilePath, 0, -1))->addTooltipLabelFeature($tooltipLabel, 'Open folder ' . $fileName); $nameLabel->setAction(self::ACTION_OPEN_FOLDER . substr($shortFilePath, 0, -1))->addTooltipLabelFeature($tooltipLabel, 'Open folder ' . $fileName);
} else { } else {
// File // 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) { if ($canAddMaps) {
// 'Add' button // 'Add' button
@ -291,7 +332,7 @@ class DirectoryBrowser implements ManialinkPageAnswerListener {
$addButton->setX($width - 5); $addButton->setX($width - 5);
$addButton->setSize(4, 4); $addButton->setSize(4, 4);
$addButton->setSubStyle($addButton::SUBSTYLE_NewBullet); $addButton->setSubStyle($addButton::SUBSTYLE_NewBullet);
$addButton->setAction(self::ACTION_ADD_FILE . $fileName); $addButton->setAction(self::ACTION_ADD_FILE . base64_encode($fileName));
$addButton->addTooltipLabelFeature($tooltipLabel, 'Add map ' . $fileName); $addButton->addTooltipLabelFeature($tooltipLabel, 'Add map ' . $fileName);
} }
@ -302,7 +343,7 @@ class DirectoryBrowser implements ManialinkPageAnswerListener {
$eraseButton->setX($width - 10); $eraseButton->setX($width - 10);
$eraseButton->setSize(4, 4); $eraseButton->setSize(4, 4);
$eraseButton->setSubStyle($eraseButton::SUBSTYLE_Erase); $eraseButton->setSubStyle($eraseButton::SUBSTYLE_Erase);
$eraseButton->setAction(self::ACTION_ERASE_FILE . $fileName); $eraseButton->setAction(self::ACTION_ERASE_FILE . base64_encode($fileName));
$eraseButton->addTooltipLabelFeature($tooltipLabel, 'Erase file ' . $fileName); $eraseButton->addTooltipLabelFeature($tooltipLabel, 'Erase file ' . $fileName);
} }
} }
@ -417,9 +458,23 @@ class DirectoryBrowser implements ManialinkPageAnswerListener {
*/ */
public function handleInspectFile(array $actionCallback, Player $player) { public function handleInspectFile(array $actionCallback, Player $player) {
$actionName = $actionCallback[1][2]; $actionName = $actionCallback[1][2];
$fileName = substr($actionName, strlen(self::ACTION_INSPECT_FILE)); $fileName = base64_decode(substr($actionName, strlen(self::ACTION_INSPECT_FILE)));
// TODO: show inspect file view $folderPath = $player->getCache($this, self::CACHE_FOLDER_PATH);
var_dump($fileName); $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);
}
} }
/** /**
@ -429,8 +484,13 @@ class DirectoryBrowser implements ManialinkPageAnswerListener {
* @param Player $player * @param Player $player
*/ */
public function handleAddFile(array $actionCallback, Player $player) { public function handleAddFile(array $actionCallback, Player $player) {
if (!$this->maniaControl->getAuthenticationManager()->checkPermission($player, MapManager::SETTING_PERMISSION_ADD_MAP)) {
$this->maniaControl->getAuthenticationManager()->sendNotAllowed($player);
return;
}
$actionName = $actionCallback[1][2]; $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); $folderPath = $player->getCache($this, self::CACHE_FOLDER_PATH);
$filePath = $folderPath . $fileName; $filePath = $folderPath . $fileName;
@ -475,7 +535,7 @@ class DirectoryBrowser implements ManialinkPageAnswerListener {
$map $map
); );
$this->maniaControl->getChat()->sendSuccess($message); $this->maniaControl->getChat()->sendSuccess($message);
Logger::logInfo($message, true); Logger::log(AuthenticationManager::getAuthLevelName($player->authLevel) .' "'. $player->nickname . '" ('. $player->login .') added the map file "'. $filePath .'"');
// Queue requested Map // Queue requested Map
$this->maniaControl->getMapManager()->getMapQueue()->addMapToMapQueue($player, $map); $this->maniaControl->getMapManager()->getMapQueue()->addMapToMapQueue($player, $map);
@ -488,16 +548,33 @@ class DirectoryBrowser implements ManialinkPageAnswerListener {
* @param Player $player * @param Player $player
*/ */
public function handleEraseFile(array $actionCallback, Player $player) { public function handleEraseFile(array $actionCallback, Player $player) {
if (!$this->maniaControl->getAuthenticationManager()->checkPermission($player, MapManager::SETTING_PERMISSION_ERASE_MAP)) {
$this->maniaControl->getAuthenticationManager()->sendNotAllowed($player);
return;
}
$actionName = $actionCallback[1][2]; $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); $folderPath = $player->getCache($this, self::CACHE_FOLDER_PATH);
$filePath = $folderPath . $fileName; $filePath = $folderPath . $fileName;
$maps = $this->maniaControl->getMapManager()->getMaps();
$mapsFolder = $this->maniaControl->getServer()->getDirectory()->getMapsFolder();
$filteredMaps = array_filter($maps, function ($item) use ($mapsFolder, $filePath) {
return ($mapsFolder . $item->fileName === $filePath);
});
foreach ($filteredMaps as $map) {
Logger::log('Map "'. $filePath .'" loaded by the server, removing it from the playlist before erasing the file');
$this->maniaControl->getMapManager()->removeMap($player, $map->uid);
}
if (@unlink($filePath)) { if (@unlink($filePath)) {
$message = $this->maniaControl->getChat()->formatMessage( $message = $this->maniaControl->getChat()->formatMessage(
'Erased %s!', 'Erased %s!',
$fileName $fileName
); );
$this->maniaControl->getChat()->sendSuccess($message, $player); $this->maniaControl->getChat()->sendSuccess($message, $player);
Logger::log(AuthenticationManager::getAuthLevelName($player->authLevel) .' "'. $player->nickname . '" ('. $player->login .') erased the map file "'. $filePath .'"');
$this->showManiaLink($player); $this->showManiaLink($player);
} else { } else {
$message = $this->maniaControl->getChat()->formatMessage( $message = $this->maniaControl->getChat()->formatMessage(
@ -508,7 +585,38 @@ class DirectoryBrowser implements ManialinkPageAnswerListener {
} }
} }
/**
* Handle 'CreateFolder' page action
*
* @param array $actionCallback
* @param Player $player
*/
public function handleCreateFolder(array $actionCallback, Player $player) {
if (!$this->maniaControl->getAuthenticationManager()->checkPermission($player, MapManager::SETTING_PERMISSION_ADD_MAP)) {
$this->maniaControl->getAuthenticationManager()->sendNotAllowed($player);
return;
}
$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(AuthenticationManager::getAuthLevelName($player->authLevel) .' "'. $player->nickname . '" ('. $player->login .') created the folder "'. $folderPath .'"');
$this->showManiaLink($player, $name);
} else {
$message = "Failed to create directory ". $name;
$this->maniaControl->getChat()->sendError($message, $player);
Logger::logError(AuthenticationManager::getAuthLevelName($player->authLevel) .' "'. $player->nickname . '" ('. $player->login .') encountered an error when creating the folder "'. $folderPath .'".');
$this->showManiaLink($player);
}
}
/** /**
* Handle 'handleDownloadFile' page action * Handle 'handleDownloadFile' page action
@ -517,7 +625,8 @@ class DirectoryBrowser implements ManialinkPageAnswerListener {
* @param Player $player * @param Player $player
*/ */
public function handleDownloadFile(array $actionCallback, 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); $folderPath = $player->getCache($this, self::CACHE_FOLDER_PATH);
if (filter_var($url, FILTER_VALIDATE_URL)) { if (filter_var($url, FILTER_VALIDATE_URL)) {
@ -526,11 +635,37 @@ class DirectoryBrowser implements ManialinkPageAnswerListener {
if (!$file || $error) { if (!$file || $error) {
$message = "Impossible to download the file: " . $error; $message = "Impossible to download the file: " . $error;
$this->maniaControl->getChat()->sendError($message, $player); $this->maniaControl->getChat()->sendError($message, $player);
Logger::logError($message); Logger::logError(AuthenticationManager::getAuthLevelName($player->authLevel) .' "'. $player->nickname . '" ('. $player->login .') encountered an error during the download of the zip file "'. $url .'": '. $error);
return; return;
} }
$filePath = ""; $filePath = "";
$finfo = new finfo(FILEINFO_MIME_TYPE);
if ($finfo->buffer($file) === "application/zip") {
$zip = new ZipArchive();
// Create a temporary file
$tempFile = tempnam(sys_get_temp_dir(), 'zip');
file_put_contents($tempFile, $file);
$open = $zip->open($tempFile);
if ($open === true) {
$zip->extractTo($folderPath);
$zip->close();
$message = "Successfully extracted zip archive from ". $url;
$this->maniaControl->getChat()->sendSuccess($message, $player);
Logger::log(AuthenticationManager::getAuthLevelName($player->authLevel) .' "'. $player->nickname . '" ('. $player->login .') downloaded the zip file "'. $url .'"');
} else {
$message = "Cannot extract archive from ". $url;
$this->maniaControl->getChat()->sendError($message, $player);
Logger::logError(AuthenticationManager::getAuthLevelName($player->authLevel) .' "'. $player->nickname . '" ('. $player->login .') encountered an error when downloading the zip file "'. $url .'": Cannot extract the archive');
}
// Clean up the temporary file
unlink($tempFile);
} else {
$fileName = "";
$contentdispositionheader = ""; $contentdispositionheader = "";
foreach ($headers as $key => $value) { foreach ($headers as $key => $value) {
if (strtolower($key) === "content-disposition") { if (strtolower($key) === "content-disposition") {
@ -559,44 +694,44 @@ class DirectoryBrowser implements ManialinkPageAnswerListener {
$attributes[trim($key)] = trim($value); $attributes[trim($key)] = trim($value);
} }
$attrNames = ['filename*' => true, 'filename' => false]; $fileName = null;
$filename = null;
$isUtf8 = false; if (array_key_exists('filename*', $attributes)) {
foreach ($attrNames as $attrName => $utf8) { $fileName = trim($attributes['filename*']);
if (!empty($attributes[$attrName])) {
$filename = trim($attributes[$attrName]); // remove prefix if needed
$isUtf8 = $utf8; if (strpos(strtolower($fileName), "utf-8''") === 0) {
break; $fileName = substr($fileName, strlen("utf-8''"));
} }
} else if (array_key_exists('filename', $attributes)) {
$fileName = trim($attributes['filename']);
} }
if ($filename !== null) { if ($fileName !== null) {
if ($isUtf8 && strpos(strtolower($filename), "utf-8''") === 0 && $filename = substr($filename, strlen("utf-8''"))) { if (substr($fileName, 0, 1) === '"' && substr($fileName, -1, 1) === '"') {
$filePath = $folderPath . FileUtil::getClearedFileName(rawurldecode($filename)); $fileName = substr($fileName, 1, -1);
}
if (substr($filename, 0, 1) === '"' && substr($filename, -1, 1) === '"') {
$filePath = $folderPath . substr($filename, 1, -1);
} else {
$filePath = $folderPath . $filename;
} }
$filePath = $folderPath . FileUtil::getClearedFileName($fileName);
} }
} }
if (!$this->isMapFileName($filePath)) { if (!$this->isMapFileName($filePath)) {
$message = "File is not a map: " . $filename; $message = "File is not a map: " . $fileName;
$this->maniaControl->getChat()->sendError($message, $player); $this->maniaControl->getChat()->sendError($message, $player);
Logger::logError($message); Logger::logError(AuthenticationManager::getAuthLevelName($player->authLevel) .' "'. $player->nickname . '" ('. $player->login .') encountered an error when downloadeding the map file "'. $fileName .'": File is not a map');
return; return;
} }
} else { } else {
$path = parse_url($url, PHP_URL_PATH); $path = parse_url($url, PHP_URL_PATH);
// extracted basename // extracted basename
$filePath = $folderPath . basename($path); $fileName = basename($path);
if (!$this->isMapFileName($filePath)) { if (!$this->isMapFileName($fileName)) {
$filePath .= ".Map.Gbx"; $fileName .= ".Map.Gbx";
} }
$filePath = $folderPath . $fileName;
} }
if ($filePath != "") { if ($filePath != "") {
@ -609,13 +744,19 @@ class DirectoryBrowser implements ManialinkPageAnswerListener {
} }
$bytes = file_put_contents($filePath, $file); $bytes = file_put_contents($filePath, $file);
if (!$bytes || $bytes <= 0) { if (!$bytes || $bytes <= 0) {
$message = "Impossible to determine filename"; $message = "Failed to write file " . $filePath;
$this->maniaControl->getChat()->sendError($message, $player); $this->maniaControl->getChat()->sendError($message, $player);
Logger::logError($message); Logger::logError(AuthenticationManager::getAuthLevelName($player->authLevel) .' "'. $player->nickname . '" ('. $player->login .') encountered an error when downloadeding the map file "'. $fileName .'": Failed to write the file');
return; return;
} }
$message = "Successfully downloaded the map ". $fileName;
$this->maniaControl->getChat()->sendSuccess($message, $player);
Logger::log(AuthenticationManager::getAuthLevelName($player->authLevel) .' "'. $player->nickname . '" ('. $player->login .') downloaded the map file "'. $filePath .'"');
} }
$this->showManiaLink($player, $folderPath); }
$this->showManiaLink($player);
}); });
$asyncHttpRequest->getData(); $asyncHttpRequest->getData();

View File

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

View File

@ -135,7 +135,7 @@ class MapList implements ManialinkPageAnswerListener, CallbackListener {
$width = $this->maniaControl->getManialinkManager()->getStyleManager()->getListWidgetsWidth(); $width = $this->maniaControl->getManialinkManager()->getStyleManager()->getListWidgetsWidth();
$height = $this->maniaControl->getManialinkManager()->getStyleManager()->getListWidgetsHeight(); $height = $this->maniaControl->getManialinkManager()->getStyleManager()->getListWidgetsHeight();
$buttonY = $height * -0.5 + 10; $buttonY = $height * -0.5 + 5;
if ($pageIndex < 0) { if ($pageIndex < 0) {
$pageIndex = (int) $player->getCache($this, self::CACHE_CURRENT_PAGE); $pageIndex = (int) $player->getCache($this, self::CACHE_CURRENT_PAGE);
@ -178,7 +178,7 @@ class MapList implements ManialinkPageAnswerListener, CallbackListener {
self::ACTION_CLEAR_MAPQUEUE self::ACTION_CLEAR_MAPQUEUE
); );
$frame->addChild($clearMapQueueButton); $frame->addChild($clearMapQueueButton);
$clearMapQueueButton->setPosition($width * 0.5 - 5 - 30/2, $buttonY); $clearMapQueueButton->setPosition($width * 0.5 - 30/2 - 27, $buttonY);
} }
if ($this->maniaControl->getAuthenticationManager()->checkPermission($player, MapManager::SETTING_PERMISSION_CHECK_UPDATE)) { 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) $this->maniaControl->getManialinkManager()->getIconManager()->getIcon(IconManager::MX_ICON_GREEN)
); );
$frame->addChild($mxCheckForUpdatesButton); $frame->addChild($mxCheckForUpdatesButton);
$mxCheckForUpdatesButton->setPosition($width * 0.5 - 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)) { if ($this->maniaControl->getAuthenticationManager()->checkPermission($player, MapManager::SETTING_PERMISSION_ADD_MAP)) {
@ -201,7 +201,7 @@ class MapList implements ManialinkPageAnswerListener, CallbackListener {
DirectoryBrowser::ACTION_SHOW DirectoryBrowser::ACTION_SHOW
); );
$frame->addChild($browserButton); $frame->addChild($browserButton);
$browserButton->setPosition($width * -0.5 + 36 / 2, $buttonY); $browserButton->setPosition($width * -0.5 + 36 / 2 + 5, $buttonY);
} }
// Headline // Headline
@ -224,6 +224,7 @@ class MapList implements ManialinkPageAnswerListener, CallbackListener {
// Predefine description Label // Predefine description Label
$descriptionLabel = $this->maniaControl->getManialinkManager()->getStyleManager()->getDefaultDescriptionLabel(); $descriptionLabel = $this->maniaControl->getManialinkManager()->getStyleManager()->getDefaultDescriptionLabel();
$descriptionLabel->setY($height * -0.5 + 12);
$frame->addChild($descriptionLabel); $frame->addChild($descriptionLabel);
$queuedMaps = $this->maniaControl->getMapManager()->getMapQueue()->getQueuedMapsRanking(); $queuedMaps = $this->maniaControl->getMapManager()->getMapQueue()->getQueuedMapsRanking();

View File

@ -195,7 +195,7 @@ class MapManager implements CallbackListener, CommunicationListener, UsageInform
* @param string $uid * @param string $uid
*/ */
public function updateMap($admin, $uid) { public function updateMap($admin, $uid) {
if (!$this->maniaControl->getAuthenticationManager()->checkPermission($admin, self::SETTING_PERMISSION_ADD_MAP)) return; if ($admin !== null && !$this->maniaControl->getAuthenticationManager()->checkPermission($admin, self::SETTING_PERMISSION_ADD_MAP)) return;
$this->updateMapTimestamp($uid); $this->updateMapTimestamp($uid);
@ -227,7 +227,7 @@ class MapManager implements CallbackListener, CommunicationListener, UsageInform
* *
* @param ?Setting $setting * @param ?Setting $setting
*/ */
public function updateSettings(Setting $setting = null) { public function updateSettings(?Setting $setting = null) {
if (!isset($setting) || !$setting->belongsToClass($this)) return; if (!isset($setting) || !$setting->belongsToClass($this)) return;
if ($setting->setting === self::SETTING_ENABLE_MX) { if ($setting->setting === self::SETTING_ENABLE_MX) {
@ -274,7 +274,7 @@ class MapManager implements CallbackListener, CommunicationListener, UsageInform
* @return bool * @return bool
*/ */
public function removeMap($admin, $uid, $eraseFile = false, $message = true) { public function removeMap($admin, $uid, $eraseFile = false, $message = true) {
if (!$this->maniaControl->getAuthenticationManager()->checkPermission($admin, self::SETTING_PERMISSION_REMOVE_MAP)) return; if ($admin !== null && !$this->maniaControl->getAuthenticationManager()->checkPermission($admin, self::SETTING_PERMISSION_REMOVE_MAP)) return;
if (!isset($this->maps[$uid])) { if (!isset($this->maps[$uid])) {
if ($admin) { if ($admin) {
@ -378,7 +378,7 @@ class MapManager implements CallbackListener, CommunicationListener, UsageInform
public function addMapFromMx($mapId, $login, $update = false) { public function addMapFromMx($mapId, $login, $update = false) {
if (is_numeric($mapId)) { if (is_numeric($mapId)) {
// Check if map exists // 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 &$login, &$update
) { ) {
if (!$mapInfo || !isset($mapInfo->uploaded)) { if (!$mapInfo || !isset($mapInfo->uploaded)) {

View File

@ -115,7 +115,7 @@ class MapQueue implements CallbackListener, CommandListener, UsageInformationAbl
* *
* @param Player $admin |null * @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)) { if ($admin && !$this->maniaControl->getAuthenticationManager()->checkPermission($admin, self::SETTING_PERMISSION_CLEAR_MAPQUEUE)) {
$this->maniaControl->getAuthenticationManager()->sendNotAllowed($admin); $this->maniaControl->getAuthenticationManager()->sendNotAllowed($admin);
return; return;

View File

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

View File

@ -158,7 +158,7 @@ class PluginMenu implements CallbackListener, ConfiguratorMenu, ManialinkPageAns
usort($pluginClasses, function ($pluginClassA, $pluginClassB) { usort($pluginClasses, function ($pluginClassA, $pluginClassB) {
/** @var Plugin $pluginClassA */ /** @var Plugin $pluginClassA */
/** @var Plugin $pluginClassB */ /** @var Plugin $pluginClassB */
return strcmp($pluginClassA::getName(), $pluginClassB::getName()); return strcasecmp($pluginClassA::getName(), $pluginClassB::getName());
}); });
$repositionnedFrame = new Frame(); $repositionnedFrame = new Frame();
@ -169,6 +169,26 @@ class PluginMenu implements CallbackListener, ConfiguratorMenu, ManialinkPageAns
$repositionnedFrame->addChild($pagesFrame); $repositionnedFrame->addChild($pagesFrame);
$pagesFrame->setY(-1); $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; $index = 0;
$pageFrame = null; $pageFrame = null;
foreach ($pluginClasses as $pluginClass) { foreach ($pluginClasses as $pluginClass) {
@ -188,7 +208,7 @@ class PluginMenu implements CallbackListener, ConfiguratorMenu, ManialinkPageAns
$activeQuad = new Quad_Icons64x64_1(); $activeQuad = new Quad_Icons64x64_1();
$pluginFrame->addChild($activeQuad); $pluginFrame->addChild($activeQuad);
$activeQuad->setPosition(2.5, -0.1, 1); $activeQuad->setPosition(5, 0, 1);
$activeQuad->setSize($entryHeight * 0.9, $entryHeight * 0.9); $activeQuad->setSize($entryHeight * 0.9, $entryHeight * 0.9);
if ($active) { if ($active) {
$activeQuad->setSubStyle($activeQuad::SUBSTYLE_LvlGreen); $activeQuad->setSubStyle($activeQuad::SUBSTYLE_LvlGreen);
@ -199,44 +219,38 @@ class PluginMenu implements CallbackListener, ConfiguratorMenu, ManialinkPageAns
$nameLabel = new Label_Text(); $nameLabel = new Label_Text();
$pluginFrame->addChild($nameLabel); $pluginFrame->addChild($nameLabel);
$nameLabel->setHorizontalAlign($nameLabel::LEFT); $nameLabel->setHorizontalAlign($nameLabel::LEFT);
$nameLabel->setX(5); $nameLabel->setX(7.5);
$nameLabel->setSize($width - 50, $entryHeight); $nameLabel->setSize($width - 50, $entryHeight);
$nameLabel->setStyle($nameLabel::STYLE_TextCardSmall); $nameLabel->setStyle($nameLabel::STYLE_TextCardSmall);
$nameLabel->setTextSize(2); $nameLabel->setTextSize(2);
$nameLabel->setText($pluginClass::getName()); $nameLabel->setText($pluginClass::getName());
$descriptionLabel = new Label();
$pageFrame->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);
$description = "Author: {$pluginClass::getAuthor()}\nVersion: {$pluginClass::getVersion()}\nDesc: {$pluginClass::getDescription()}"; $description = "Author: {$pluginClass::getAuthor()}\nVersion: {$pluginClass::getVersion()}\nDesc: {$pluginClass::getDescription()}";
$nameLabel->addTooltipLabelFeature($descriptionLabel, $description); $nameLabel->addTooltipLabelFeature($descriptionLabel, $description);
$quad = new Quad_Icons128x32_1(); $quad = new Quad_Icons128x32_1();
$pluginFrame->addChild($quad); $pluginFrame->addChild($quad);
$quad->setSubStyle($quad::SUBSTYLE_Settings); $quad->setSubStyle($quad::SUBSTYLE_Settings);
$quad->setX($width - 45); $quad->setX($width - 37);
$quad->setZ(1); $quad->setZ(1);
$quad->setSize(5, 5); $quad->setSize(5, 5);
$quad->setAction(self::ACTION_PREFIX_SETTINGS . $pluginClass); $quad->setAction(self::ACTION_PREFIX_SETTINGS . $pluginClass);
$quad->addTooltipLabelFeature($tooltip, "Open settings of ". $pluginClass::getName());
$statusChangeButton = new Label_Button(); $statusChangeButton = new Label_Button();
$pluginFrame->addChild($statusChangeButton); $pluginFrame->addChild($statusChangeButton);
$statusChangeButton->setHorizontalAlign($statusChangeButton::RIGHT); $statusChangeButton->setHorizontalAlign($statusChangeButton::RIGHT);
$statusChangeButton->setX($width - 6); $statusChangeButton->setX($width - 6);
$statusChangeButton->setStyle($statusChangeButton::STYLE_CardButtonSmall); $statusChangeButton->setStyle($statusChangeButton::STYLE_CardButtonSmallS);
if ($active) { if ($active) {
$statusChangeButton->setText('Deactivate'); $statusChangeButton->setText('Deactivate');
$statusChangeButton->setAction(self::ACTION_PREFIX_DISABLEPLUGIN . $pluginClass); $statusChangeButton->setAction(self::ACTION_PREFIX_DISABLEPLUGIN . $pluginClass);
$statusChangeButton->addTooltipLabelFeature($tooltip, "Deactivate plugin ". $pluginClass::getName());
} else { } else {
$statusChangeButton->setText('Activate'); $statusChangeButton->setText('Activate');
$statusChangeButton->setAction(self::ACTION_PREFIX_ENABLEPLUGIN . $pluginClass); $statusChangeButton->setAction(self::ACTION_PREFIX_ENABLEPLUGIN . $pluginClass);
$statusChangeButton->addTooltipLabelFeature($tooltip, "Activate plugin ". $pluginClass::getName());
} }
if ($pluginUpdates && array_key_exists($pluginClass::getId(), $pluginUpdates)) { if ($pluginUpdates && array_key_exists($pluginClass::getId(), $pluginUpdates)) {
@ -386,7 +400,7 @@ class PluginMenu implements CallbackListener, ConfiguratorMenu, ManialinkPageAns
$entry->setPosition($innerWidth - $valueWidth / 2, 0); $entry->setPosition($innerWidth - $valueWidth / 2, 0);
$entry->setSize($valueWidth, $settingHeight * 0.9); $entry->setSize($valueWidth, $settingHeight * 0.9);
$entry->setTextSize(1); $entry->setTextSize(1);
$entry->setMaxLength(1000); $entry->setMaxLength(1000); // Actions are limited to 1024 chars per field
$entry->setStyle(Label_Text::STYLE_TextValueSmall); $entry->setStyle(Label_Text::STYLE_TextValueSmall);
$entry->setName(self::ACTION_PREFIX_SETTING . $setting->index); $entry->setName(self::ACTION_PREFIX_SETTING . $setting->index);
$entry->setDefault($setting->value); $entry->setDefault($setting->value);
@ -622,6 +636,8 @@ class PluginMenu implements CallbackListener, ConfiguratorMenu, ManialinkPageAns
$setting->value = $settingData['Value']; $setting->value = $settingData['Value'];
} }
$this->maniaControl->getSettingManager()->saveSetting($setting); $this->maniaControl->getSettingManager()->saveSetting($setting);
Logger::log(AuthenticationManager::getAuthLevelName($player->authLevel) .' "'. $player->nickname . '" ('. $player->login .') changed the setting "'. $setting->class . '\\\\' . $setting->setting .'" to "'. $setting->value .'"');
} }
$this->maniaControl->getChat()->sendSuccess('Plugin Settings saved!', $player); $this->maniaControl->getChat()->sendSuccess('Plugin Settings saved!', $player);

View File

@ -418,6 +418,7 @@ class ServerOptionsMenu implements CallbackListener, ConfiguratorMenu, TimerList
$success = $this->applyNewServerOptions($newServerOptions, $player); $success = $this->applyNewServerOptions($newServerOptions, $player);
if ($success) { if ($success) {
$this->maniaControl->getChat()->sendSuccess('Server Options saved!', $player); $this->maniaControl->getChat()->sendSuccess('Server Options saved!', $player);
Logger::log(AuthenticationManager::getAuthLevelName($player->authLevel) .' "'. $player->nickname . '" ('. $player->login .') changed Server Options');
} else { } else {
$this->maniaControl->getChat()->sendError('Server Options saving failed!', $player); $this->maniaControl->getChat()->sendError('Server Options saving failed!', $player);
} }

View File

@ -10,6 +10,7 @@ use ManiaControl\Admin\AuthenticationManager;
use ManiaControl\Callbacks\CallbackListener; use ManiaControl\Callbacks\CallbackListener;
use ManiaControl\Callbacks\TimerListener; use ManiaControl\Callbacks\TimerListener;
use ManiaControl\Configurator\ConfiguratorMenu; use ManiaControl\Configurator\ConfiguratorMenu;
use ManiaControl\Logger;
use ManiaControl\ManiaControl; use ManiaControl\ManiaControl;
use ManiaControl\Players\Player; use ManiaControl\Players\Player;
use Maniaplanet\DedicatedServer\Structures\VoteRatio; use Maniaplanet\DedicatedServer\Structures\VoteRatio;
@ -166,6 +167,7 @@ class VoteRatiosMenu implements CallbackListener, ConfiguratorMenu, TimerListene
$success = $this->maniaControl->getClient()->setCallVoteRatios($newVoteRatios); $success = $this->maniaControl->getClient()->setCallVoteRatios($newVoteRatios);
if ($success) { if ($success) {
$this->maniaControl->getChat()->sendSuccess('Vote Ratios saved!', $player); $this->maniaControl->getChat()->sendSuccess('Vote Ratios saved!', $player);
Logger::log(AuthenticationManager::getAuthLevelName($player->authLevel) .' "'. $player->nickname . '" ('. $player->login .') changed the Vote Ratios');
} else { } else {
$this->maniaControl->getChat()->sendError('Vote Ratios saving failed!', $player); $this->maniaControl->getChat()->sendError('Vote Ratios saving failed!', $player);
} }

View File

@ -118,6 +118,15 @@ class SettingManager implements CallbackListener, UsageInformationAble {
trigger_error($mysqli->error, E_USER_ERROR); 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; return $result;
} }
@ -448,6 +457,10 @@ class SettingManager implements CallbackListener, UsageInformationAble {
$this->clearStorage(); $this->clearStorage();
} }
} }
if ($this->disableCache && $setting->linked && isset($this->storedSettings[$setting->class . $setting->setting])) {
unset($this->storedSettings[$setting->class . $setting->setting]);
}
} }
return true; return true;

View File

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

View File

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

View File

@ -107,6 +107,16 @@ class SystemUtil {
Logger::log($message . 'FOUND!'); 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) { if (!$success) {
// Missing requirements // Missing requirements
self::quit(); self::quit();

View File

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

View File

@ -38,7 +38,7 @@ class CheckBox implements Renderable, ScriptFeatureable
* @param bool $default (optional) Default value * @param bool $default (optional) Default value
* @param Quad $quad (optional) CheckBox quad * @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(); $this->feature = new CheckBoxFeature();
if ($name) { if ($name) {

View File

@ -39,7 +39,7 @@ class ValuePicker implements Renderable, ScriptFeatureable
* @param string $default (optional) Default value * @param string $default (optional) Default value
* @param Label $label (optional) ValuePicker label * @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(); $this->feature = new ValuePickerFeature();
if ($name) { if ($name) {

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -96,7 +96,7 @@ class ManiaLink
* @param Renderable[] $children (optional) Children * @param Renderable[] $children (optional) Children
* @return static * @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); return new static($maniaLinkId, $version, $name, $children);
} }
@ -110,7 +110,7 @@ class ManiaLink
* @param string $name (optional) Name * @param string $name (optional) Name
* @param Renderable[] $children (optional) Children * @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) { 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) // 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 * @param Dico $dico Dictionary
* @return static * @return static
*/ */
public function setDico(Dico $dico = null) public function setDico(?Dico $dico = null)
{ {
$this->dico = $dico; $this->dico = $dico;
return $this; return $this;
@ -445,7 +445,7 @@ class ManiaLink
* @param Stylesheet $stylesheet Stylesheet * @param Stylesheet $stylesheet Stylesheet
* @return static * @return static
*/ */
public function setStylesheet(Stylesheet $stylesheet = null) public function setStylesheet(?Stylesheet $stylesheet = null)
{ {
$this->stylesheet = $stylesheet; $this->stylesheet = $stylesheet;
return $this; return $this;
@ -489,7 +489,7 @@ class ManiaLink
* @param Script $script Script * @param Script $script Script
* @return static * @return static
*/ */
public function setScript(Script $script = null) public function setScript(?Script $script = null)
{ {
$this->script = $script; $this->script = $script;
return $this; return $this;

View File

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

View File

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

View File

@ -66,7 +66,7 @@ class CheckBoxFeature extends ScriptFeature
* @param Entry $entry (optional) Hidden Entry * @param Entry $entry (optional) Hidden Entry
* @param bool $default (optional) Default value * @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) { if ($quad) {
$this->setQuad($quad); $this->setQuad($quad);

View File

@ -41,7 +41,7 @@ class Clock extends ScriptFeature
* @param bool $showSeconds (optional) Show the seconds * @param bool $showSeconds (optional) Show the seconds
* @param bool $showFullDate (optional) Show the date * @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) { if ($label) {
$this->setLabel($label); $this->setLabel($label);

View File

@ -41,7 +41,7 @@ class ControlScript extends ScriptFeature
* @param string $scriptText (optional) Script text * @param string $scriptText (optional) Script text
* @param string $labelName (optional) Script Label name * @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) { if ($control) {
$this->setControl($control); $this->setControl($control);

View File

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

View File

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

View File

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

View File

@ -35,7 +35,7 @@ class MapInfo extends ScriptFeature
* @param Control $control (optional) Map Info Control * @param Control $control (optional) Map Info Control
* @param string $labelName (optional) Script Label name * @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) { if ($control) {
$this->setControl($control); $this->setControl($control);

View File

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

View File

@ -32,7 +32,7 @@ class MenuElement
* @param Control $item (optional) Item Control in the Menu bar * @param Control $item (optional) Item Control in the Menu bar
* @param Control $control (optional) Toggled Menu Control * @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) { if ($item) {
$this->setItem($item); $this->setItem($item);

View File

@ -73,7 +73,7 @@ class Paging extends ScriptFeature
* @param PagingPage[] $pages (optional) Pages * @param PagingPage[] $pages (optional) Pages
* @param PagingButton[] $buttons (optional) Pageing Buttons * @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) { if ($label) {
$this->setLabel($label); $this->setLabel($label);

View File

@ -32,7 +32,7 @@ class PagingButton
* @param Control $control (optional) Paging Control * @param Control $control (optional) Paging Control
* @param int $pagingCount (optional) Number of browsed pages per click * @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) { if ($control) {
$this->setControl($control); $this->setControl($control);

View File

@ -31,7 +31,7 @@ class PagingPage
* @param Control $control (optional) Page Control * @param Control $control (optional) Page Control
* @param int $pageNumber (optional) Number of the Page * @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) { if ($control) {
$this->setControl($control); $this->setControl($control);

View File

@ -46,7 +46,7 @@ class PlayerProfile extends ScriptFeature
* @param Control $control (optional) Profile Control * @param Control $control (optional) Profile Control
* @param string $labelName (optional) Script Label name * @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) { if ($login) {
$this->setLogin($login); $this->setLogin($login);

View File

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

View File

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

View File

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

View File

@ -54,7 +54,7 @@ class Tooltip extends ScriptFeature
* @param bool $invert (optional) If the visibility toggling should be inverted * @param bool $invert (optional) If the visibility toggling should be inverted
* @param string $text (optional) Text to display if the TooltipControl is a Label * @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) { if ($hoverControl) {
$this->setHoverControl($hoverControl); $this->setHoverControl($hoverControl);

View File

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

View File

@ -56,7 +56,7 @@ class ValuePickerFeature extends ScriptFeature
* @param string[] $values (optional) Possible values * @param string[] $values (optional) Possible values
* @param string $default (optional) Default value * @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) { if ($label) {
$this->setLabel($label); $this->setLabel($label);

View File

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

View File

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

View File

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

2272
libs/Maniaplanet/DedicatedServer/Connection.php Executable file → Normal file

File diff suppressed because it is too large Load Diff

View File

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

View File

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

1
libs/Maniaplanet/DedicatedServer/Structures/Player.php Executable file → Normal file
View File

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

View File

@ -46,10 +46,22 @@ class PlayerDetailedInfo extends Player
/** @var string */ /** @var string */
public $broadcasterLogin; public $broadcasterLogin;
/** @var string[] */ /** @var string[] */
public $allies = array(); public $allies = [];
/** @var string */ /** @var string */
public $clubLink; 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[] * @return string[]
*/ */
@ -57,16 +69,4 @@ class PlayerDetailedInfo extends Player
{ {
return explode('|', $this->path); 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;
}
} }

View File

@ -20,7 +20,7 @@ class PlayerInfo extends Player
/** @var bool */ /** @var bool */
public $isInOfficialMode; public $isInOfficialMode;
/** @var int */ /** @var int */
public $ladderScore; public $ladderScore; // TODO CHECK IF EXISTS
/** @var int */ /** @var int */
public $ladderRanking; public $ladderRanking;
/** @var int */ /** @var int */
@ -63,7 +63,7 @@ class PlayerInfo extends Player
/** /**
* @return PlayerInfo * @return PlayerInfo
*/ */
static public function fromArray($array) public static function fromArray($array)
{ {
$object = parent::fromArray($array); $object = parent::fromArray($array);

View File

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

View File

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

View File

@ -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;
}
}

View File

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

View File

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

View File

@ -7,8 +7,10 @@
namespace Maniaplanet\DedicatedServer\Xmlrpc; namespace Maniaplanet\DedicatedServer\Xmlrpc;
class FaultException extends Exception { class FaultException extends Exception
static function create($faultString, $faultCode) { {
static function create($faultString, $faultCode)
{
switch ($faultString) { switch ($faultString) {
case 'Password incorrect.': case 'Password incorrect.':
case 'Permission denied.': case 'Permission denied.':
@ -31,6 +33,7 @@ class FaultException extends Exception {
case 'Already waiting for a vote.': case 'Already waiting for a vote.':
case 'You must stop server first.': case 'You must stop server first.':
return new LockedFeatureException($faultString, $faultCode); return new LockedFeatureException($faultString, $faultCode);
case 'Can\'t kick server.':
case 'Login or Uid unknown.': case 'Login or Uid unknown.':
case 'Login unknown.': case 'Login unknown.':
case 'Payer 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
{
} }

View File

@ -9,18 +9,18 @@ namespace Maniaplanet\DedicatedServer\Xmlrpc;
class GbxRemote class GbxRemote
{ {
const MAX_REQUEST_SIZE = 0x200000; // 2MB const MAX_REQUEST_SIZE = 0x400000; // 4MB
const MAX_RESPONSE_SIZE = 0x400000; // 4MB const MAX_RESPONSE_SIZE = 0x400000; // 4MB
public static $received; public static $received;
public static $sent; public static $sent;
private $socket; private $socket;
private $readTimeout = array('sec' => 30, 'usec' => 0); private $readTimeout = ['sec' => 5, 'usec' => 0];
private $writeTimeout = array('sec' => 30, 'usec' => 0); private $writeTimeout = ['sec' => 5, 'usec' => 0];
private $requestHandle; private $requestHandle;
private $callbacksBuffer = array(); private $callbacksBuffer = [];
private $multicallBuffer = array(); private $multicallBuffer = [];
private $lastNetworkActivity = 0; private $lastNetworkActivity = 0;
/** /**
@ -34,25 +34,99 @@ class GbxRemote
$this->connect($host, $port, $timeout); $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() function __destruct()
{ {
$this->terminate(); $this->terminate();
} }
public function terminate()
{
if ($this->socket) {
fclose($this->socket);
$this->socket = null;
}
}
/** /**
* Change timeouts * Change timeouts
* @param int $read read timeout (in ms), 0 to leave unchanged * @param int $read read timeout (in ms), 0 to leave unchanged
* @param int $write write 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)
{ {
if ($read) {
$this->readTimeout['sec'] = (int)($read / 1000); $this->readTimeout['sec'] = (int)($read / 1000);
$this->readTimeout['usec'] = ($read % 1000) * 1000; $this->readTimeout['usec'] = ($read % 1000) * 1000;
} }
if($write) if ($write) {
{
$this->writeTimeout['sec'] = (int)($write / 1000); $this->writeTimeout['sec'] = (int)($write / 1000);
$this->writeTimeout['usec'] = ($write % 1000) * 1000; $this->writeTimeout['usec'] = ($write % 1000) * 1000;
} }
@ -68,39 +142,49 @@ class GbxRemote
} }
/** /**
* @param string $host
* @param int $port
* @param int $timeout
* @throws TransportException * @throws TransportException
*/ */
private function connect($host, $port, $timeout) private function assertConnected()
{ {
$this->socket = @fsockopen($host, $port, $errno, $errstr, $timeout); if (!$this->socket) {
if(!$this->socket) throw new TransportException('Connection not initialized', TransportException::NOT_INITIALIZED);
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();
} }
function terminate() /**
* @param string $method
* @param mixed[] $args
*/
function addCall($method, $args)
{ {
if($this->socket) $this->multicallBuffer[] = [
'methodName' => $method,
'params' => $args
];
}
/**
* @return mixed
*/
function multiquery()
{ {
fclose($this->socket); switch (count($this->multicallBuffer)) {
$this->socket = null; 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 * @return mixed
* @throws MessageException * @throws MessageException
*/ */
function query($method, $args=array()) function query($method, $args = [])
{ {
$this->assertConnected(); $this->assertConnected();
$xml = Request::encode($method, $args); $xml = Request::encode($method, $args);
if(strlen($xml) > self::MAX_REQUEST_SIZE-8) if (strlen($xml) > self::MAX_REQUEST_SIZE - 8) {
{ if ($method != 'system.multicall' || count($args[0]) < 2) {
if($method != 'system.multicall' || count($args[0]) < 2)
throw new MessageException('Request too large', MessageException::REQUEST_TOO_LARGE); throw new MessageException('Request too large', MessageException::REQUEST_TOO_LARGE);
}
$mid = count($args[0]) >> 1; $mid = count($args[0]) >> 1;
$res1 = $this->query('system.multicall', array(array_slice($args[0], 0, $mid))); $res1 = $this->query('system.multicall', [array_slice($args[0], 0, $mid)]);
$res2 = $this->query('system.multicall', array(array_slice($args[0], $mid))); $res2 = $this->query('system.multicall', [array_slice($args[0], $mid)]);
return array_merge($res1, $res2); return array_merge($res1, $res2);
} }
@ -131,60 +215,40 @@ class GbxRemote
} }
/** /**
* @param string $method * @param string $xml
* @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;
}
/**
* @throws TransportException * @throws TransportException
*/ */
private function assertConnected() private function writeMessage($xml)
{ {
if(!$this->socket) if ($this->requestHandle == (int)0xffffffff) {
throw new TransportException('Connection not initialized', TransportException::NOT_INITIALIZED); $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;
} }
/** /**
@ -194,18 +258,17 @@ class GbxRemote
*/ */
private function flush($waitResponse = false) private function flush($waitResponse = false)
{ {
$r = array($this->socket); $r = [$this->socket];
while($waitResponse || @stream_select($r, $w, $e, 0) > 0) while ($waitResponse || @stream_select($r, $w, $e, 0) > 0) {
{
list($handle, $xml) = $this->readMessage(); list($handle, $xml) = $this->readMessage();
list($type, $value) = Request::decode($xml); list($type, $value) = Request::decode($xml);
switch($type) switch ($type) {
{
case 'fault': case 'fault':
throw FaultException::create($value['faultString'], $value['faultCode']); throw FaultException::create($value['faultString'], $value['faultCode']);
case 'response': case 'response':
if($handle == $this->requestHandle) if ($handle == $this->requestHandle) {
return $value; return $value;
}
break; break;
case 'call': case 'call':
$this->callbacksBuffer[] = $value; $this->callbacksBuffer[] = $value;
@ -221,92 +284,40 @@ class GbxRemote
private function readMessage() private function readMessage()
{ {
$header = $this->read(8); $header = $this->read(8);
if($header === false) if ($header === false) {
$this->onIoFailure('while reading header'); $this->onIoFailure('while reading header');
}
extract(unpack('Vsize/Vhandle', $header)); extract(unpack('Vsize/Vhandle', $header));
/** @var $size int */ /** @var $size int */
/** @var $handle int */ /** @var $handle int */
if($size == 0 || $handle == 0) if ($size == 0 || $handle == 0) {
throw new TransportException('Incorrect header', TransportException::PROTOCOL_ERROR); 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); throw new MessageException('Response too large', MessageException::RESPONSE_TOO_LARGE);
}
$data = $this->read($size); $data = $this->read($size);
if($data === false) if ($data === false) {
$this->onIoFailure('while reading data'); $this->onIoFailure('while reading data');
}
$this->lastNetworkActivity = time(); $this->lastNetworkActivity = time();
return array($handle, $data); return [$handle, $data];
} }
/** /**
* @param string $xml * @return mixed[]
* @throws TransportException
*/ */
private function writeMessage($xml) function getCallbacks()
{ {
if($this->requestHandle == (int) 0xffffffff) $this->assertConnected();
$this->requestHandle = (int) 0x80000000; $this->flush();
$data = pack('V2', strlen($xml), ++$this->requestHandle).$xml; $cb = $this->callbacksBuffer;
if(!$this->write($data)) $this->callbacksBuffer = [];
$this->onIoFailure('while writing'); return $cb;
$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 $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;
}
/**
* @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);
} }
} }

View File

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

View File

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

View File

@ -160,7 +160,7 @@ class ContainerAwareEventDispatcher extends EventDispatcher
* *
* @throws \InvalidArgumentException if the service is not defined * @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); $this->lazyLoad($eventName);

View File

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

View File

@ -27,7 +27,7 @@ class WrappedListener
private $stopwatch; private $stopwatch;
private $dispatcher; 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->listener = $listener;
$this->name = $name; $this->name = $name;

View File

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

View File

@ -35,7 +35,7 @@ interface EventDispatcherInterface
* *
* @api * @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. * Adds an event listener that listens on the specified events.

View File

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

View File

@ -39,7 +39,7 @@ class RecordWidget {
* @param \ManiaControl\Players\Player|null $player * @param \ManiaControl\Players\Player|null $player
* @return \FML\Controls\Frame * @return \FML\Controls\Frame
*/ */
public function generateRecordLineFrame($record, Player $player = null) { public function generateRecordLineFrame($record, ?Player $player = null) {
$width = $this->width; $width = $this->width;
$lineHeight = $this->lineHeight; $lineHeight = $this->lineHeight;
$largeNumberDiff = 0; $largeNumberDiff = 0;
@ -92,6 +92,7 @@ class RecordWidget {
$recordFrame->addChild($quad); $recordFrame->addChild($quad);
$quad->setStyles(Quad_Bgs1InRace::STYLE, Quad_Bgs1InRace::SUBSTYLE_BgCardList); $quad->setStyles(Quad_Bgs1InRace::STYLE, Quad_Bgs1InRace::SUBSTYLE_BgCardList);
$quad->setSize($width, $lineHeight); $quad->setSize($width, $lineHeight);
$quad->setZ(-1);
} }
return $recordFrame; return $recordFrame;
@ -105,7 +106,7 @@ class RecordWidget {
* @param \ManiaControl\Players\Player|null $player * @param \ManiaControl\Players\Player|null $player
* @return \FML\Controls\Frame * @return \FML\Controls\Frame
*/ */
public function generateRecordsFrame($records, $limit, Player $player = null) { public function generateRecordsFrame($records, $limit, ?Player $player = null) {
$lineHeight = $this->lineHeight; $lineHeight = $this->lineHeight;
$frame = new Frame(); $frame = new Frame();

View File

@ -83,7 +83,7 @@ class DedimaniaPlugin implements CallbackListener, CallQueueListener, CommandLis
public static function prepare(ManiaControl $maniaControl) { public static function prepare(ManiaControl $maniaControl) {
$servers = $maniaControl->getServer()->getAllServers(); $servers = $maniaControl->getServer()->getAllServers();
foreach ($servers as $server) { foreach ($servers as $server) {
$maniaControl->getSettingManager()->initSetting(get_class(), self::SETTING_DEDIMANIA_CODE . $server->login . '$l', ''); $maniaControl->getSettingManager()->initSetting(get_called_class(), self::SETTING_DEDIMANIA_CODE . $server->login . '$l', '');
} }
} }
@ -156,7 +156,7 @@ class DedimaniaPlugin implements CallbackListener, CallQueueListener, CommandLis
$this->recordWidget = new RecordWidget($this->maniaControl); $this->recordWidget = new RecordWidget($this->maniaControl);
if ($this->maniaControl->getServer()->getGameMode() == 0) { if (true/*$this->maniaControl->getServer()->getGameMode() == 0*/) {
$gameMode = $this->maniaControl->getClient()->getScriptName()['CurrentValue']; $gameMode = $this->maniaControl->getClient()->getScriptName()['CurrentValue'];
$this->isMultilap = ($gameMode == 'Laps.Script.txt' || $this->maniaControl->getMapManager()->getCurrentMap()->nbLaps > 0); $this->isMultilap = ($gameMode == 'Laps.Script.txt' || $this->maniaControl->getMapManager()->getCurrentMap()->nbLaps > 0);
$this->isRounds = ($gameMode == 'Rounds.Script.txt'); $this->isRounds = ($gameMode == 'Rounds.Script.txt');

View File

@ -52,11 +52,11 @@ class DynamicPointLimitPlugin implements CallbackListener, CommandListener, Plug
* @see \ManiaControl\Plugins\Plugin::prepare() * @see \ManiaControl\Plugins\Plugin::prepare()
*/ */
public static function prepare(ManiaControl $maniaControl) { public static function prepare(ManiaControl $maniaControl) {
$maniaControl->getSettingManager()->initSetting(get_class(), self::SETTING_POINT_LIMIT_MULTIPLIER, 10); $maniaControl->getSettingManager()->initSetting(get_called_class(), self::SETTING_POINT_LIMIT_MULTIPLIER, 10);
$maniaControl->getSettingManager()->initSetting(get_class(), self::SETTING_POINT_LIMIT_OFFSET, 0); $maniaControl->getSettingManager()->initSetting(get_called_class(), self::SETTING_POINT_LIMIT_OFFSET, 0);
$maniaControl->getSettingManager()->initSetting(get_class(), self::SETTING_MIN_POINT_LIMIT, 30); $maniaControl->getSettingManager()->initSetting(get_called_class(), self::SETTING_MIN_POINT_LIMIT, 30);
$maniaControl->getSettingManager()->initSetting(get_class(), self::SETTING_MAX_POINT_LIMIT, 200); $maniaControl->getSettingManager()->initSetting(get_called_class(), self::SETTING_MAX_POINT_LIMIT, 200);
$maniaControl->getSettingManager()->initSetting(get_class(), self::SETTING_ACCEPT_OTHER_MODES, false); $maniaControl->getSettingManager()->initSetting(get_called_class(), self::SETTING_ACCEPT_OTHER_MODES, false);
} }
/** /**

View File

@ -79,7 +79,7 @@ class KarmaPlugin implements CallbackListener, TimerListener, Plugin {
* @see \ManiaControl\Plugins\Plugin::prepare() * @see \ManiaControl\Plugins\Plugin::prepare()
*/ */
public static function prepare(ManiaControl $maniaControl) { public static function prepare(ManiaControl $maniaControl) {
$thisClass = get_class(); $thisClass = get_called_class();
$maniaControl->getSettingManager()->initSetting($thisClass, self::SETTING_MX_KARMA_ACTIVATED, true); $maniaControl->getSettingManager()->initSetting($thisClass, self::SETTING_MX_KARMA_ACTIVATED, true);
$maniaControl->getSettingManager()->initSetting($thisClass, self::SETTING_MX_KARMA_IMPORTING, true); $maniaControl->getSettingManager()->initSetting($thisClass, self::SETTING_MX_KARMA_IMPORTING, true);
$maniaControl->getSettingManager()->initSetting($thisClass, self::SETTING_WIDGET_DISPLAY_MX, true); $maniaControl->getSettingManager()->initSetting($thisClass, self::SETTING_WIDGET_DISPLAY_MX, true);
@ -343,7 +343,7 @@ class KarmaPlugin implements CallbackListener, TimerListener, Plugin {
/** /**
* Fetch the mxKarmaVotes for the current map * Fetch the mxKarmaVotes for the current map
*/ */
public function getMxKarmaVotes(Player $player = null) { public function getMxKarmaVotes(?Player $player = null) {
if (!$this->maniaControl->getSettingManager()->getSettingValue($this, self::SETTING_MX_KARMA_ACTIVATED)) { if (!$this->maniaControl->getSettingManager()->getSettingValue($this, self::SETTING_MX_KARMA_ACTIVATED)) {
return; return;
} }
@ -901,7 +901,7 @@ class KarmaPlugin implements CallbackListener, TimerListener, Plugin {
* @param Map $map * @param Map $map
* @param bool $forceBuild * @param bool $forceBuild
*/ */
private function buildManialink(Map $map = null, $forceBuild = false) { private function buildManialink(?Map $map = null, $forceBuild = false) {
if (!$forceBuild) { if (!$forceBuild) {
return; return;
} }
@ -915,7 +915,7 @@ class KarmaPlugin implements CallbackListener, TimerListener, Plugin {
$quadStyle = $this->maniaControl->getManialinkManager()->getStyleManager()->getDefaultQuadStyle(); $quadStyle = $this->maniaControl->getManialinkManager()->getStyleManager()->getDefaultQuadStyle();
$quadSubstyle = $this->maniaControl->getManialinkManager()->getStyleManager()->getDefaultQuadSubstyle(); $quadSubstyle = $this->maniaControl->getManialinkManager()->getStyleManager()->getDefaultQuadSubstyle();
$manialink = new ManiaLink(self::MLID_KARMA); $manialink = new ManiaLink(self::MLID_KARMA, 3);
$frame = new Frame(); $frame = new Frame();
$manialink->addChild($frame); $manialink->addChild($frame);