From 300d8174099c7772574bc60c9085f83a5005b084 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steffen=20Schro=CC=88der?= Date: Mon, 11 Aug 2014 23:15:53 +0200 Subject: [PATCH] FML Update 1.4 --- application/libs/FML/Components/CheckBox.php | 4 ++-- application/libs/FML/Controls/Control.php | 6 +++--- application/libs/FML/Controls/Entry.php | 2 +- .../libs/FML/Controls/FrameInstance.php | 2 +- application/libs/FML/Controls/Gauge.php | 15 ------------- .../libs/FML/Controls/Quads/Quad_Bgs1.php | 3 +++ .../FML/Controls/Quads/Quad_Bgs1InRace.php | 3 +++ .../FML/Controls/Quads/Quad_BgsButtons.php | 1 + .../FML/Controls/Quads/Quad_Icons128x32_1.php | 6 +++++- .../FML/Controls/Quads/Quad_Icons64x64_2.php | 1 + .../Quads/Quad_UIConstruction_Buttons.php | 1 + application/libs/FML/CustomUI.php | 2 +- application/libs/FML/Elements/Including.php | 2 +- application/libs/FML/Elements/Music.php | 2 +- .../libs/FML/Elements/SimpleScript.php | 2 +- application/libs/FML/ManiaCode/AddBuddy.php | 2 +- .../libs/FML/ManiaCode/AddFavorite.php | 4 ++-- application/libs/FML/ManiaCode/GetSkin.php | 6 +++--- application/libs/FML/ManiaCode/Go_To.php | 2 +- .../libs/FML/ManiaCode/InstallMacroblock.php | 6 +++--- application/libs/FML/ManiaCode/InstallMap.php | 4 ++-- .../libs/FML/ManiaCode/InstallPack.php | 6 +++--- .../libs/FML/ManiaCode/InstallReplay.php | 4 ++-- .../libs/FML/ManiaCode/InstallScript.php | 6 +++--- .../libs/FML/ManiaCode/InstallSkin.php | 6 +++--- application/libs/FML/ManiaCode/JoinServer.php | 4 ++-- application/libs/FML/ManiaCode/PlayMap.php | 4 ++-- application/libs/FML/ManiaCode/PlayReplay.php | 4 ++-- .../libs/FML/ManiaCode/ShowMessage.php | 2 +- application/libs/FML/ManiaCode/ViewReplay.php | 4 ++-- application/libs/FML/ManiaLink.php | 21 +++++++++++++------ .../libs/FML/Models/CheckBoxDesign.php | 4 ++-- .../FML/Script/Features/ActionTrigger.php | 6 +++--- .../FML/Script/Features/CheckBoxFeature.php | 6 +++--- .../libs/FML/Script/Features/Clock.php | 2 +- .../libs/FML/Script/Features/EntrySubmit.php | 2 +- .../libs/FML/Script/Features/KeyAction.php | 10 ++++----- .../libs/FML/Script/Features/MenuElement.php | 4 ++-- .../libs/FML/Script/Features/Paging.php | 10 ++++----- .../libs/FML/Script/Features/PagingButton.php | 4 ++-- .../libs/FML/Script/Features/PagingPage.php | 2 +- .../FML/Script/Features/PlayerProfile.php | 2 +- .../libs/FML/Script/Features/Toggle.php | 4 ++-- .../libs/FML/Script/Features/Tooltip.php | 6 +++--- .../libs/FML/Script/Features/UISound.php | 4 ++-- .../Script/Features/ValuePickerFeature.php | 6 +++--- application/libs/FML/Script/Script.php | 16 ++++++++------ application/libs/FML/Stylesheet/Style3d.php | 2 +- application/libs/FML/UniqueID.php | 2 +- application/libs/FML/autoload.php | 6 +++--- 50 files changed, 123 insertions(+), 112 deletions(-) diff --git a/application/libs/FML/Components/CheckBox.php b/application/libs/FML/Components/CheckBox.php index 883d5ef2..04703262 100644 --- a/application/libs/FML/Components/CheckBox.php +++ b/application/libs/FML/Components/CheckBox.php @@ -69,7 +69,7 @@ class CheckBox implements Renderable, ScriptFeatureable { * @return static */ public function setEnabledDesign($style, $subStyle = null) { - if (is_object($style) && ($style instanceof CheckBoxDesign)) { + if ($style instanceof CheckBoxDesign) { $this->feature->setEnabledDesign($style); } else { $checkBoxDesign = new CheckBoxDesign($style, $subStyle); @@ -86,7 +86,7 @@ class CheckBox implements Renderable, ScriptFeatureable { * @return static */ public function setDisabledDesign($style, $subStyle = null) { - if (is_object($style) && ($style instanceof CheckBoxDesign)) { + if ($style instanceof CheckBoxDesign) { $this->feature->setDisabledDesign($style); } else { $checkBoxDesign = new CheckBoxDesign($style, $subStyle); diff --git a/application/libs/FML/Controls/Control.php b/application/libs/FML/Controls/Control.php index 0df8843b..054dc76d 100644 --- a/application/libs/FML/Controls/Control.php +++ b/application/libs/FML/Controls/Control.php @@ -71,7 +71,7 @@ abstract class Control implements Renderable, ScriptFeatureable { * @param string $controlId (optional) Control id */ public function __construct($controlId = null) { - if (!is_null($controlId)) { + if ($controlId !== null) { $this->setId($controlId); } } @@ -141,7 +141,7 @@ abstract class Control implements Renderable, ScriptFeatureable { public function setPosition($posX, $posY, $posZ = null) { $this->setX($posX); $this->setY($posY); - if (!is_null($posZ)) { + if ($posZ !== null) { $this->setZ($posZ); } return $this; @@ -325,7 +325,7 @@ abstract class Control implements Renderable, ScriptFeatureable { * @return static */ public function addActionTriggerFeature($actionName, $eventLabel = ScriptLabel::MOUSECLICK) { - if (is_object($actionName) && ($actionName instanceof ActionTrigger)) { + if ($actionName instanceof ActionTrigger) { $this->addScriptFeature($actionName); } else { $actionTrigger = new ActionTrigger($actionName, $this, $eventLabel); diff --git a/application/libs/FML/Controls/Entry.php b/application/libs/FML/Controls/Entry.php index 6aad5190..210e3df8 100644 --- a/application/libs/FML/Controls/Entry.php +++ b/application/libs/FML/Controls/Entry.php @@ -175,7 +175,7 @@ class Entry extends Control implements NewLineable, Scriptable, Styleable, TextF if ($this->name) { $xmlElement->setAttribute('name', $this->name); } - if (!is_null($this->default)) { + if ($this->default !== null) { $xmlElement->setAttribute('default', $this->default); } else if ($this->autoComplete) { $value = null; diff --git a/application/libs/FML/Controls/FrameInstance.php b/application/libs/FML/Controls/FrameInstance.php index 4efbc3a4..30914afc 100644 --- a/application/libs/FML/Controls/FrameInstance.php +++ b/application/libs/FML/Controls/FrameInstance.php @@ -40,7 +40,7 @@ class FrameInstance extends Control { */ public function __construct($modelId = null, $controlId = null) { parent::__construct($controlId); - if (!is_null($modelId)) { + if ($modelId !== null) { $this->setModelId($modelId); } } diff --git a/application/libs/FML/Controls/Gauge.php b/application/libs/FML/Controls/Gauge.php index 31747bf6..9c24780a 100644 --- a/application/libs/FML/Controls/Gauge.php +++ b/application/libs/FML/Controls/Gauge.php @@ -28,7 +28,6 @@ class Gauge extends Control implements Styleable { protected $ratio = 0.; protected $grading = 1.; protected $color = null; - protected $rotation = 0.; protected $centered = null; protected $clan = null; protected $drawBg = 1; @@ -75,17 +74,6 @@ class Gauge extends Control implements Styleable { return $this; } - /** - * Set rotation - * - * @param float $rotation Gauge rotation - * @return static - */ - public function setRotation($rotation) { - $this->rotation = (float)$rotation; - return $this; - } - /** * Set centered * @@ -152,9 +140,6 @@ class Gauge extends Control implements Styleable { if ($this->color) { $xmlElement->setAttribute('color', $this->color); } - if ($this->rotation) { - $xmlElement->setAttribute('rotation', $this->rotation); - } if ($this->centered) { $xmlElement->setAttribute('centered', $this->centered); } diff --git a/application/libs/FML/Controls/Quads/Quad_Bgs1.php b/application/libs/FML/Controls/Quads/Quad_Bgs1.php index 435f5ec0..7e03f281 100644 --- a/application/libs/FML/Controls/Quads/Quad_Bgs1.php +++ b/application/libs/FML/Controls/Quads/Quad_Bgs1.php @@ -44,6 +44,7 @@ class Quad_Bgs1 extends Quad { const SUBSTYLE_BgColorContour = 'BgColorContour'; const SUBSTYLE_BgDialogBlur = 'BgDialogBlur'; const SUBSTYLE_BgEmpty = 'BgEmpty'; + const SUBSTYLE_BgGlow2 = 'BgGlow2'; const SUBSTYLE_BgGradBottom = 'BgGradBottom'; const SUBSTYLE_BgGradLeft = 'BgGradLeft'; const SUBSTYLE_BgGradRight = 'BgGradRight'; @@ -53,11 +54,13 @@ class Quad_Bgs1 extends Quad { const SUBSTYLE_BgIconBorder = 'BgIconBorder'; const SUBSTYLE_BgList = 'BgList'; const SUBSTYLE_BgListLine = 'BgListLine'; + const SUBSTYLE_BgMetalBar = 'BgMetalBar'; const SUBSTYLE_BgPager = 'BgPager'; const SUBSTYLE_BgProgressBar = 'BgProgressBar'; const SUBSTYLE_BgShadow = 'BgShadow'; const SUBSTYLE_BgSlider = 'BgSlider'; const SUBSTYLE_BgSystemBar = 'BgSystemBar'; + const SUBSTYLE_BgTitle = 'BgTitle'; const SUBSTYLE_BgTitle2 = 'BgTitle2'; const SUBSTYLE_BgTitle3 = 'BgTitle3'; const SUBSTYLE_BgTitle3_1 = 'BgTitle3_1'; diff --git a/application/libs/FML/Controls/Quads/Quad_Bgs1InRace.php b/application/libs/FML/Controls/Quads/Quad_Bgs1InRace.php index 9f939319..5081d706 100644 --- a/application/libs/FML/Controls/Quads/Quad_Bgs1InRace.php +++ b/application/libs/FML/Controls/Quads/Quad_Bgs1InRace.php @@ -44,6 +44,7 @@ class Quad_Bgs1InRace extends Quad { const SUBSTYLE_BgColorContour = 'BgColorContour'; const SUBSTYLE_BgDialogBlur = 'BgDialogBlur'; const SUBSTYLE_BgEmpty = 'BgEmpty'; + const SUBSTYLE_BgGlow2 = 'BgGlow2'; const SUBSTYLE_BgGradBottom = 'BgGradBottom'; const SUBSTYLE_BgGradLeft = 'BgGradLeft'; const SUBSTYLE_BgGradRight = 'BgGradRight'; @@ -53,11 +54,13 @@ class Quad_Bgs1InRace extends Quad { const SUBSTYLE_BgIconBorder = 'BgIconBorder'; const SUBSTYLE_BgList = 'BgList'; const SUBSTYLE_BgListLine = 'BgListLine'; + const SUBSTYLE_BgMetalBar = 'BgMetalBar'; const SUBSTYLE_BgPager = 'BgPager'; const SUBSTYLE_BgProgressBar = 'BgProgressBar'; const SUBSTYLE_BgShadow = 'BgShadow'; const SUBSTYLE_BgSlider = 'BgSlider'; const SUBSTYLE_BgSystemBar = 'BgSystemBar'; + const SUBSTYLE_BgTitle = 'BgTitle'; const SUBSTYLE_BgTitle2 = 'BgTitle2'; const SUBSTYLE_BgTitle3 = 'BgTitle3'; const SUBSTYLE_BgTitle3_1 = 'BgTitle3_1'; diff --git a/application/libs/FML/Controls/Quads/Quad_BgsButtons.php b/application/libs/FML/Controls/Quads/Quad_BgsButtons.php index ffaa7b4a..95edb26f 100644 --- a/application/libs/FML/Controls/Quads/Quad_BgsButtons.php +++ b/application/libs/FML/Controls/Quads/Quad_BgsButtons.php @@ -21,6 +21,7 @@ class Quad_BgsButtons extends Quad { const SUBSTYLE_BgButtonMediumSelector = 'BgButtonMediumSelector'; const SUBSTYLE_BgButtonMediumSpecial = 'BgButtonMediumSpecial'; const SUBSTYLE_BgButtonSmall = 'BgButtonSmall'; + const SUBSTYLE_BgButtonSmall2 = 'BgButtonSmall2'; const SUBSTYLE_BgButtonXSmall = 'BgButtonXSmall'; /* diff --git a/application/libs/FML/Controls/Quads/Quad_Icons128x32_1.php b/application/libs/FML/Controls/Quads/Quad_Icons128x32_1.php index 26b23724..33388e97 100644 --- a/application/libs/FML/Controls/Quads/Quad_Icons128x32_1.php +++ b/application/libs/FML/Controls/Quads/Quad_Icons128x32_1.php @@ -15,7 +15,11 @@ class Quad_Icons128x32_1 extends Quad { /* * Constants */ - const STYLE = 'Icons128x32_1'; + const STYLE = 'Icons128x32_1'; + const SUBSTYLE_ArrowUp = 'ArrowUp'; + const SUBSTYLE_BgQuadWhite = 'BgQuadWhite'; + // TODO: validate existence of 'close' + const SUBSTYLE_Close = 'Close'; const SUBSTYLE_Empty = 'Empty'; const SUBSTYLE_ManiaLinkHome = 'ManiaLinkHome'; const SUBSTYLE_ManiaLinkSwitch = 'ManiaLinkSwitch'; diff --git a/application/libs/FML/Controls/Quads/Quad_Icons64x64_2.php b/application/libs/FML/Controls/Quads/Quad_Icons64x64_2.php index ac3e3281..5482bcc7 100644 --- a/application/libs/FML/Controls/Quads/Quad_Icons64x64_2.php +++ b/application/libs/FML/Controls/Quads/Quad_Icons64x64_2.php @@ -18,6 +18,7 @@ class Quad_Icons64x64_2 extends Quad { const STYLE = 'Icons64x64_2'; const SUBSTYLE_ArrowElimination = 'ArrowElimination'; const SUBSTYLE_ArrowHit = 'ArrowHit'; + const SUBSTYLE_Calendar = 'Calendar'; const SUBSTYLE_Disconnected = 'Disconnected'; const SUBSTYLE_DisconnectedLight = 'DisconnectedLight'; const SUBSTYLE_LaserElimination = 'LaserElimination'; diff --git a/application/libs/FML/Controls/Quads/Quad_UIConstruction_Buttons.php b/application/libs/FML/Controls/Quads/Quad_UIConstruction_Buttons.php index c61595d0..55744b9a 100644 --- a/application/libs/FML/Controls/Quads/Quad_UIConstruction_Buttons.php +++ b/application/libs/FML/Controls/Quads/Quad_UIConstruction_Buttons.php @@ -35,6 +35,7 @@ class Quad_UIConstruction_Buttons extends Quad { const SUBSTYLE_Down = 'Down'; const SUBSTYLE_Drive = 'Drive'; const SUBSTYLE_Erase = 'Erase'; + const SUBSTYLE_FreeItems = 'FreeItems'; const SUBSTYLE_GhostBlocks = 'GhostBlocks'; const SUBSTYLE_Help = 'Help'; const SUBSTYLE_Item = 'Item'; diff --git a/application/libs/FML/CustomUI.php b/application/libs/FML/CustomUI.php index 8d434558..a4137684 100644 --- a/application/libs/FML/CustomUI.php +++ b/application/libs/FML/CustomUI.php @@ -150,7 +150,7 @@ class CustomUI { } $settings = $this->getSettings(); foreach ($settings as $setting => $value) { - if (is_null($value)) { + if ($value === null) { continue; } $xmlSubElement = $domDocument->createElement($setting); diff --git a/application/libs/FML/Elements/Including.php b/application/libs/FML/Elements/Including.php index ac233769..4d5979ef 100644 --- a/application/libs/FML/Elements/Including.php +++ b/application/libs/FML/Elements/Including.php @@ -34,7 +34,7 @@ class Including implements Renderable { * @param string $url (optional) Include url */ public function __construct($url = null) { - if (!is_null($url)) { + if ($url !== null) { $this->setUrl($url); } } diff --git a/application/libs/FML/Elements/Music.php b/application/libs/FML/Elements/Music.php index a41e79fb..1daefc9c 100644 --- a/application/libs/FML/Elements/Music.php +++ b/application/libs/FML/Elements/Music.php @@ -34,7 +34,7 @@ class Music implements Renderable { * @param string $data (optional) Media url */ public function __construct($data = null) { - if (!is_null($data)) { + if ($data !== null) { $this->setData($data); } } diff --git a/application/libs/FML/Elements/SimpleScript.php b/application/libs/FML/Elements/SimpleScript.php index 1745efc4..871c250d 100644 --- a/application/libs/FML/Elements/SimpleScript.php +++ b/application/libs/FML/Elements/SimpleScript.php @@ -34,7 +34,7 @@ class SimpleScript implements Renderable { * @param string $text (optional) Script text */ public function __construct($text = null) { - if (!is_null($text)) { + if ($text !== null) { $this->setText($text); } } diff --git a/application/libs/FML/ManiaCode/AddBuddy.php b/application/libs/FML/ManiaCode/AddBuddy.php index f9a0e4f2..fe36815c 100644 --- a/application/libs/FML/ManiaCode/AddBuddy.php +++ b/application/libs/FML/ManiaCode/AddBuddy.php @@ -32,7 +32,7 @@ class AddBuddy extends Element { * @param string $login (optional) Buddy login */ public function __construct($login = null) { - if (!is_null($login)) { + if ($login !== null) { $this->setLogin($login); } } diff --git a/application/libs/FML/ManiaCode/AddFavorite.php b/application/libs/FML/ManiaCode/AddFavorite.php index 9e876669..f1b19591 100644 --- a/application/libs/FML/ManiaCode/AddFavorite.php +++ b/application/libs/FML/ManiaCode/AddFavorite.php @@ -34,7 +34,7 @@ class AddFavorite extends Element { * @param string $login (optional) Server login */ public function __construct($login = null) { - if (!is_null($login)) { + if ($login !== null) { $this->setLogin($login); } } @@ -71,7 +71,7 @@ class AddFavorite extends Element { */ public function render(\DOMDocument $domDocument) { $xmlElement = parent::render($domDocument); - if (is_null($this->serverIp)) { + if ($this->serverIp === null) { $loginElement = $domDocument->createElement('login', $this->login); $xmlElement->appendChild($loginElement); } else { diff --git a/application/libs/FML/ManiaCode/GetSkin.php b/application/libs/FML/ManiaCode/GetSkin.php index 2bbd13cb..958c72b8 100644 --- a/application/libs/FML/ManiaCode/GetSkin.php +++ b/application/libs/FML/ManiaCode/GetSkin.php @@ -38,13 +38,13 @@ class GetSkin extends Element { * @param string $url (optional) Skin url */ public function __construct($name = null, $file = null, $url = null) { - if (!is_null($name)) { + if ($name !== null) { $this->setName($name); } - if (!is_null($file)) { + if ($file !== null) { $this->setFile($file); } - if (!is_null($url)) { + if ($url !== null) { $this->setUrl($url); } } diff --git a/application/libs/FML/ManiaCode/Go_To.php b/application/libs/FML/ManiaCode/Go_To.php index 5d167f53..3b511fc4 100644 --- a/application/libs/FML/ManiaCode/Go_To.php +++ b/application/libs/FML/ManiaCode/Go_To.php @@ -32,7 +32,7 @@ class Go_To extends Element { * @param string $link (optional) Goto link */ public function __construct($link = null) { - if (!is_null($link)) { + if ($link !== null) { $this->setLink($link); } } diff --git a/application/libs/FML/ManiaCode/InstallMacroblock.php b/application/libs/FML/ManiaCode/InstallMacroblock.php index 6ba73feb..a8d20ba1 100644 --- a/application/libs/FML/ManiaCode/InstallMacroblock.php +++ b/application/libs/FML/ManiaCode/InstallMacroblock.php @@ -37,13 +37,13 @@ class InstallMacroblock extends Element { * @param string $url (optional) Macroblock url */ public function __construct($name = null, $file = null, $url = null) { - if (!is_null($name)) { + if ($name !== null) { $this->setName($name); } - if (!is_null($file)) { + if ($file !== null) { $this->setFile($file); } - if (!is_null($url)) { + if ($url !== null) { $this->setUrl($url); } } diff --git a/application/libs/FML/ManiaCode/InstallMap.php b/application/libs/FML/ManiaCode/InstallMap.php index 8c8dd97e..10be08a2 100644 --- a/application/libs/FML/ManiaCode/InstallMap.php +++ b/application/libs/FML/ManiaCode/InstallMap.php @@ -35,10 +35,10 @@ class InstallMap extends Element { * @param string $url (optional) Map url */ public function __construct($name = null, $url = null) { - if (!is_null($name)) { + if ($name !== null) { $this->setName($name); } - if (!is_null($url)) { + if ($url !== null) { $this->setUrl($url); } } diff --git a/application/libs/FML/ManiaCode/InstallPack.php b/application/libs/FML/ManiaCode/InstallPack.php index bd621d70..33781e59 100644 --- a/application/libs/FML/ManiaCode/InstallPack.php +++ b/application/libs/FML/ManiaCode/InstallPack.php @@ -38,13 +38,13 @@ class InstallPack extends Element { * @param string $url (optional) Pack url */ public function __construct($name = null, $file = null, $url = null) { - if (!is_null($name)) { + if ($name !== null) { $this->setName($name); } - if (!is_null($file)) { + if ($file !== null) { $this->setFile($file); } - if (!is_null($url)) { + if ($url !== null) { $this->setUrl($url); } } diff --git a/application/libs/FML/ManiaCode/InstallReplay.php b/application/libs/FML/ManiaCode/InstallReplay.php index 445a3fde..b851ec72 100644 --- a/application/libs/FML/ManiaCode/InstallReplay.php +++ b/application/libs/FML/ManiaCode/InstallReplay.php @@ -35,10 +35,10 @@ class InstallReplay extends Element { * @param string $url (optional) Replay url */ public function __construct($name = null, $url = null) { - if (!is_null($name)) { + if ($name!== null) { $this->setName($name); } - if (!is_null($url)) { + if ($url!== null) { $this->setUrl($url); } } diff --git a/application/libs/FML/ManiaCode/InstallScript.php b/application/libs/FML/ManiaCode/InstallScript.php index 79a86f77..e11e693a 100644 --- a/application/libs/FML/ManiaCode/InstallScript.php +++ b/application/libs/FML/ManiaCode/InstallScript.php @@ -38,13 +38,13 @@ class InstallScript extends Element { * @param string $url (optional) Script url */ public function __construct($name = null, $file = null, $url = null) { - if (!is_null($name)) { + if ($name !== null) { $this->setName($name); } - if (!is_null($file)) { + if ($file !== null) { $this->setFile($file); } - if (!is_null($url)) { + if ($url !== null) { $this->setUrl($url); } } diff --git a/application/libs/FML/ManiaCode/InstallSkin.php b/application/libs/FML/ManiaCode/InstallSkin.php index 56f39c2c..a6584ec4 100644 --- a/application/libs/FML/ManiaCode/InstallSkin.php +++ b/application/libs/FML/ManiaCode/InstallSkin.php @@ -38,13 +38,13 @@ class InstallSkin extends Element { * @param string $url (optional) Skin url */ public function __construct($name = null, $file = null, $url = null) { - if (!is_null($name)) { + if ($name !== null) { $this->setName($name); } - if (!is_null($file)) { + if ($file !== null) { $this->setFile($file); } - if (!is_null($url)) { + if ($url !== null) { $this->setUrl($url); } } diff --git a/application/libs/FML/ManiaCode/JoinServer.php b/application/libs/FML/ManiaCode/JoinServer.php index eed5a921..2a0299fd 100644 --- a/application/libs/FML/ManiaCode/JoinServer.php +++ b/application/libs/FML/ManiaCode/JoinServer.php @@ -34,7 +34,7 @@ class JoinServer extends Element { * @param string $login (optional) Server login */ public function __construct($login = null) { - if (!is_null($login)) { + if ($login !== null) { $this->setLogin($login); } } @@ -71,7 +71,7 @@ class JoinServer extends Element { */ public function render(\DOMDocument $domDocument) { $xmlElement = parent::render($domDocument); - if (is_null($this->serverIp)) { + if ($this->serverIp === null) { $loginElement = $domDocument->createElement('login', $this->login); $xmlElement->appendChild($loginElement); } else { diff --git a/application/libs/FML/ManiaCode/PlayMap.php b/application/libs/FML/ManiaCode/PlayMap.php index 56019a69..5e0d9406 100644 --- a/application/libs/FML/ManiaCode/PlayMap.php +++ b/application/libs/FML/ManiaCode/PlayMap.php @@ -35,10 +35,10 @@ class PlayMap extends Element { * @param string $url (optional) Map url */ public function __construct($name = null, $url = null) { - if (!is_null($name)) { + if ($name !== null) { $this->setName($name); } - if (!is_null($url)) { + if ($url !== null) { $this->setUrl($url); } } diff --git a/application/libs/FML/ManiaCode/PlayReplay.php b/application/libs/FML/ManiaCode/PlayReplay.php index fa48d795..667e98ce 100644 --- a/application/libs/FML/ManiaCode/PlayReplay.php +++ b/application/libs/FML/ManiaCode/PlayReplay.php @@ -35,10 +35,10 @@ class PlayReplay extends Element { * @param string $url (optional) Replay url */ public function __construct($name = null, $url = null) { - if (!is_null($name)) { + if ($name !== null) { $this->setName($name); } - if (!is_null($url)) { + if ($url !== null) { $this->setUrl($url); } } diff --git a/application/libs/FML/ManiaCode/ShowMessage.php b/application/libs/FML/ManiaCode/ShowMessage.php index 0cb50889..917e6c9a 100644 --- a/application/libs/FML/ManiaCode/ShowMessage.php +++ b/application/libs/FML/ManiaCode/ShowMessage.php @@ -32,7 +32,7 @@ class ShowMessage extends Element { * @param string $message (optional) Message text */ public function __construct($message = null) { - if (!is_null($message)) { + if ($message !== null) { $this->setMessage($message); } } diff --git a/application/libs/FML/ManiaCode/ViewReplay.php b/application/libs/FML/ManiaCode/ViewReplay.php index c8e7e218..1ffd9549 100644 --- a/application/libs/FML/ManiaCode/ViewReplay.php +++ b/application/libs/FML/ManiaCode/ViewReplay.php @@ -35,10 +35,10 @@ class ViewReplay extends Element { * @param string $url (optional) Replay url */ public function __construct($name = null, $url = null) { - if (!is_null($name)) { + if ($name !== null) { $this->setName($name); } - if (!is_null($url)) { + if ($url !== null) { $this->setUrl($url); } } diff --git a/application/libs/FML/ManiaLink.php b/application/libs/FML/ManiaLink.php index 4c4e3a48..61bb8601 100644 --- a/application/libs/FML/ManiaLink.php +++ b/application/libs/FML/ManiaLink.php @@ -48,22 +48,31 @@ class ManiaLink { /** * Create a new ManiaLink object * - * @param string $maniaLinkId (optional) ManiaLink id + * @param string $maniaLinkId (optional) ManiaLink id + * @param string $maniaLinkName (optional) ManiaLink Name * @return static */ - public static function create($maniaLinkId = null) { - return new static($maniaLinkId); + public static function create($maniaLinkId = null, $maniaLinkName = null) { + return new static($maniaLinkId, $maniaLinkName); } /** * Construct a new ManiaLink object * - * @param string $maniaLinkId (optional) ManiaLink id + * @param string $maniaLinkId (optional) ManiaLink id + * @param string $maniaLinkName (optional) ManiaLink Name */ - public function __construct($maniaLinkId = null) { - if (!is_null($maniaLinkId)) { + public function __construct($maniaLinkId = null, $maniaLinkName = null) { + if ($maniaLinkId !== null) { $this->setId($maniaLinkId); } + if ($maniaLinkName !== false) { + if ($maniaLinkName) { + $this->setName($maniaLinkName); + } else { + $this->setName($maniaLinkId); + } + } } /** diff --git a/application/libs/FML/Models/CheckBoxDesign.php b/application/libs/FML/Models/CheckBoxDesign.php index 6cf6d91b..eda65813 100644 --- a/application/libs/FML/Models/CheckBoxDesign.php +++ b/application/libs/FML/Models/CheckBoxDesign.php @@ -48,7 +48,7 @@ class CheckBoxDesign implements Styleable, SubStyleable { * @param string $subStyle (optional) SubStyle name */ public function __construct($style, $subStyle = null) { - if (is_null($subStyle)) { + if ($subStyle === null) { $this->setImageUrl($style); } else { $this->setStyle($style); @@ -116,7 +116,7 @@ class CheckBoxDesign implements Styleable, SubStyleable { * @return string */ public function getDesignString($escaped = true, $addApostrophes = true) { - if (!is_null($this->url)) { + if ($this->url !== null) { $string = $this->url; } else { $string = $this->style . '|' . $this->subStyle;; diff --git a/application/libs/FML/Script/Features/ActionTrigger.php b/application/libs/FML/Script/Features/ActionTrigger.php index cec3dbb7..32aa2d6a 100644 --- a/application/libs/FML/Script/Features/ActionTrigger.php +++ b/application/libs/FML/Script/Features/ActionTrigger.php @@ -32,13 +32,13 @@ class ActionTrigger extends ScriptFeature { * @param string $labelName (optional) Script Label name */ public function __construct($actionName = null, Control $control = null, $labelName = ScriptLabel::MOUSECLICK) { - if (!is_null($actionName)) { + if ($actionName !== null) { $this->setActionName($actionName); } - if (!is_null($control)) { + if ($control !== null) { $this->setControl($control); } - if (!is_null($labelName)) { + if ($labelName !== null) { $this->setLabelName($labelName); } } diff --git a/application/libs/FML/Script/Features/CheckBoxFeature.php b/application/libs/FML/Script/Features/CheckBoxFeature.php index 36a457b7..b4fa40fd 100644 --- a/application/libs/FML/Script/Features/CheckBoxFeature.php +++ b/application/libs/FML/Script/Features/CheckBoxFeature.php @@ -47,13 +47,13 @@ class CheckBoxFeature extends ScriptFeature { * @param bool $default (optional) Default value */ public function __construct(Quad $quad = null, Entry $entry = null, $default = null) { - if (!is_null($quad)) { + if ($quad !== null) { $this->setQuad($quad); } - if (!is_null($entry)) { + if ($entry !== null) { $this->setEntry($entry); } - if (!is_null($default)) { + if ($default !== null) { $this->setDefault($default); } $this->setEnabledDesign(CheckBoxDesign::defaultEnabledDesign()); diff --git a/application/libs/FML/Script/Features/Clock.php b/application/libs/FML/Script/Features/Clock.php index 42f3f48e..2efd528c 100644 --- a/application/libs/FML/Script/Features/Clock.php +++ b/application/libs/FML/Script/Features/Clock.php @@ -31,7 +31,7 @@ class Clock extends ScriptFeature { * @param bool $showFullDate (optional) Whether the date should be shown */ public function __construct(Label $label = null, $showSeconds = true, $showFullDate = false) { - if (!is_null($label)) { + if ($label !== null) { $this->setLabel($label); } $this->setShowSeconds($showSeconds); diff --git a/application/libs/FML/Script/Features/EntrySubmit.php b/application/libs/FML/Script/Features/EntrySubmit.php index e949950a..4ae21094 100644 --- a/application/libs/FML/Script/Features/EntrySubmit.php +++ b/application/libs/FML/Script/Features/EntrySubmit.php @@ -30,7 +30,7 @@ class EntrySubmit extends ScriptFeature { * @param string $url (optional) Submit url */ public function __construct(Entry $entry = null, $url = null) { - if (!is_null($entry)) { + if ($entry !== null) { $this->setEntry($entry); } $this->setUrl($url); diff --git a/application/libs/FML/Script/Features/KeyAction.php b/application/libs/FML/Script/Features/KeyAction.php index af79873b..c5d5e6aa 100644 --- a/application/libs/FML/Script/Features/KeyAction.php +++ b/application/libs/FML/Script/Features/KeyAction.php @@ -30,10 +30,10 @@ class KeyAction extends ScriptFeature { * @param string $keyName (optional) Key name */ public function __construct($actionName = null, $keyName = null) { - if (!is_null($actionName)) { + if ($actionName !== null) { $this->setActionName($actionName); } - if (!is_null($keyName)) { + if ($keyName !== null) { $this->setKeyName($keyName); } } @@ -105,13 +105,13 @@ class KeyAction extends ScriptFeature { $actionName = Builder::escapeText($this->actionName, true); $key = null; $value = null; - if (!is_null($this->keyName)) { + if ($this->keyName !== null) { $key = 'KeyName'; $value = $this->keyName; - } else if (!is_null($this->keyCode)) { + } else if ($this->keyCode !== null) { $key = 'KeyCode'; $value = $this->keyCode; - } else if (!is_null($this->charPressed)) { + } else if ($this->charPressed !== null) { $key = 'CharPressed'; $value = $this->charPressed; } diff --git a/application/libs/FML/Script/Features/MenuElement.php b/application/libs/FML/Script/Features/MenuElement.php index a5de67e4..d67a113f 100644 --- a/application/libs/FML/Script/Features/MenuElement.php +++ b/application/libs/FML/Script/Features/MenuElement.php @@ -26,10 +26,10 @@ class MenuElement { * @param Control $control (optional) Toggled Menu Control */ public function __construct(Control $item = null, Control $control = null) { - if (!is_null($item)) { + if ($item !== null) { $this->setItem($item); } - if (!is_null($control)) { + if ($control !== null) { $this->setControl($control); } } diff --git a/application/libs/FML/Script/Features/Paging.php b/application/libs/FML/Script/Features/Paging.php index c6951686..3a1a743b 100644 --- a/application/libs/FML/Script/Features/Paging.php +++ b/application/libs/FML/Script/Features/Paging.php @@ -44,7 +44,7 @@ class Paging extends ScriptFeature { * @param Label $label (optional) Page number Label */ public function __construct(Label $label = null) { - if (!is_null($label)) { + if ($label !== null) { $this->setLabel($label); } } @@ -57,7 +57,7 @@ class Paging extends ScriptFeature { * @return static */ public function addPage(Control $pageControl, $pageNumber = null) { - if (is_null($pageNumber)) { + if ($pageNumber === null) { $pageNumber = count($this->pages) + 1; } $page = new PagingPage($pageControl, $pageNumber); @@ -86,7 +86,7 @@ class Paging extends ScriptFeature { * @return static */ public function addButton(Control $buttonControl, $browseAction = null) { - if (is_null($browseAction)) { + if ($browseAction === null) { $buttonCount = count($this->buttons); if ($buttonCount % 2 === 0) { $browseAction = $buttonCount / 2 + 1; @@ -288,7 +288,7 @@ Void {$updatePageFunction}(Text _PagingId, Text _PageLabelId, Integer _BrowseAct $minPage = null; foreach ($this->pages as $page) { $pageNumber = $page->getPageNumber(); - if (is_null($minPageNumber) || $pageNumber < $minPageNumber) { + if ($minPageNumber === null || $pageNumber < $minPageNumber) { $minPageNumber = $pageNumber; $minPage = $page; } @@ -306,7 +306,7 @@ Void {$updatePageFunction}(Text _PagingId, Text _PageLabelId, Integer _BrowseAct $maxPage = null; foreach ($this->pages as $page) { $pageNumber = $page->getPageNumber(); - if (is_null($maxPageNumber) || $pageNumber > $maxPageNumber) { + if ($maxPageNumber === null || $pageNumber > $maxPageNumber) { $maxPageNumber = $pageNumber; $maxPage = $page; } diff --git a/application/libs/FML/Script/Features/PagingButton.php b/application/libs/FML/Script/Features/PagingButton.php index bf26a41c..b6cc7af7 100644 --- a/application/libs/FML/Script/Features/PagingButton.php +++ b/application/libs/FML/Script/Features/PagingButton.php @@ -27,10 +27,10 @@ class PagingButton { * @param int $browseAction (optional) Number of browsed Pages per Click */ public function __construct(Control $control = null, $browseAction = null) { - if (!is_null($control)) { + if ($control !== null) { $this->setControl($control); } - if (!is_null($browseAction)) { + if ($browseAction !== null) { $this->setBrowseAction($browseAction); } } diff --git a/application/libs/FML/Script/Features/PagingPage.php b/application/libs/FML/Script/Features/PagingPage.php index dc26b31a..1f2ef86a 100644 --- a/application/libs/FML/Script/Features/PagingPage.php +++ b/application/libs/FML/Script/Features/PagingPage.php @@ -26,7 +26,7 @@ class PagingPage { * @param int $pageNumber (optional) Number of the Page */ public function __construct(Control $control = null, $pageNumber = 1) { - if (!is_null($control)) { + if ($control !== null) { $this->setControl($control); } $this->setPageNumber($pageNumber); diff --git a/application/libs/FML/Script/Features/PlayerProfile.php b/application/libs/FML/Script/Features/PlayerProfile.php index 2705b815..08d30274 100644 --- a/application/libs/FML/Script/Features/PlayerProfile.php +++ b/application/libs/FML/Script/Features/PlayerProfile.php @@ -33,7 +33,7 @@ class PlayerProfile extends ScriptFeature { */ public function __construct($login = null, Control $control = null, $labelName = ScriptLabel::MOUSECLICK) { $this->setLogin($login); - if (!is_null($control)) { + if ($control !== null) { $this->setControl($control); } $this->setLabelName($labelName); diff --git a/application/libs/FML/Script/Features/Toggle.php b/application/libs/FML/Script/Features/Toggle.php index f6324731..3f0c5d27 100644 --- a/application/libs/FML/Script/Features/Toggle.php +++ b/application/libs/FML/Script/Features/Toggle.php @@ -37,10 +37,10 @@ class Toggle extends ScriptFeature { */ public function __construct(Control $togglingControl = null, Control $toggledControl = null, $labelName = ScriptLabel::MOUSECLICK, $onlyShow = false, $onlyHide = false) { - if (!is_null($togglingControl)) { + if ($togglingControl !== null) { $this->setTogglingControl($togglingControl); } - if (!is_null($toggledControl)) { + if ($toggledControl !== null) { $this->setToggledControl($toggledControl); } $this->setLabelName($labelName); diff --git a/application/libs/FML/Script/Features/Tooltip.php b/application/libs/FML/Script/Features/Tooltip.php index 26ec2fbd..2b640557 100644 --- a/application/libs/FML/Script/Features/Tooltip.php +++ b/application/libs/FML/Script/Features/Tooltip.php @@ -38,15 +38,15 @@ class Tooltip extends ScriptFeature { * @param string $text (optional) Text to display if the TooltipControl is a Label */ public function __construct(Control $hoverControl = null, Control $tooltipControl = null, $stayOnClick = false, $invert = false, $text = null) { - if (!is_null($hoverControl)) { + if ($hoverControl !== null) { $this->setHoverControl($hoverControl); } - if (!is_null($tooltipControl)) { + if ($tooltipControl !== null) { $this->setTooltipControl($tooltipControl); } $this->setStayOnClick($stayOnClick); $this->setInvert($invert); - if (!is_null($text)) { + if ($text !== null) { $this->setText($text); } } diff --git a/application/libs/FML/Script/Features/UISound.php b/application/libs/FML/Script/Features/UISound.php index df11ac60..70152f67 100644 --- a/application/libs/FML/Script/Features/UISound.php +++ b/application/libs/FML/Script/Features/UISound.php @@ -68,10 +68,10 @@ class UISound extends ScriptFeature { * @param string $labelName (optional) Script Label name */ public function __construct($soundName = null, Control $control = null, $variant = 0, $labelName = ScriptLabel::MOUSECLICK) { - if (!is_null($soundName)) { + if ($soundName !== null) { $this->setSoundName($soundName); } - if (!is_null($control)) { + if ($control !== null) { $this->setControl($control); } $this->setVariant($variant); diff --git a/application/libs/FML/Script/Features/ValuePickerFeature.php b/application/libs/FML/Script/Features/ValuePickerFeature.php index 62efc8bc..fe12841f 100644 --- a/application/libs/FML/Script/Features/ValuePickerFeature.php +++ b/application/libs/FML/Script/Features/ValuePickerFeature.php @@ -44,16 +44,16 @@ class ValuePickerFeature extends ScriptFeature { * @param string $default (optional) Default value */ public function __construct(Label $label = null, Entry $entry = null, array $values = array(), $default = null) { - if (!is_null($label)) { + if ($label !== null) { $this->setLabel($label); } - if (!is_null($entry)) { + if ($entry !== null) { $this->setEntry($entry); } if (!empty($values)) { $this->setValues($values); } - if (!is_null($default)) { + if ($default !== null) { $this->setDefault($default); } } diff --git a/application/libs/FML/Script/Script.php b/application/libs/FML/Script/Script.php index 5514e275..57866cb3 100644 --- a/application/libs/FML/Script/Script.php +++ b/application/libs/FML/Script/Script.php @@ -39,7 +39,7 @@ class Script { * @return static */ public function setScriptInclude($file, $namespace = null) { - if (is_object($file) && ($file instanceof ScriptInclude)) { + if ($file instanceof ScriptInclude) { $scriptInclude = $file; } else { $scriptInclude = new ScriptInclude($file, $namespace); @@ -56,7 +56,7 @@ class Script { * @return static */ public function addScriptConstant($name, $value = null) { - if (is_object($name) && ($name instanceof ScriptConstant)) { + if ($name instanceof ScriptConstant) { $scriptConstant = $name; } else { $scriptConstant = new ScriptConstant($name, $value); @@ -75,7 +75,7 @@ class Script { * @return static */ public function addScriptFunction($name, $text = null) { - if (is_object($name) && ($name instanceof ScriptFunction)) { + if ($name instanceof ScriptFunction) { $scriptFunction = $name; } else { $scriptFunction = new ScriptFunction($name, $text); @@ -94,7 +94,7 @@ class Script { * @return static */ public function addCustomScriptLabel($name, $text = null) { - if (is_object($name) && ($name instanceof ScriptLabel)) { + if ($name instanceof ScriptLabel) { $scriptLabel = $name; } else { $scriptLabel = new ScriptLabel($name, $text); @@ -112,7 +112,7 @@ class Script { * @return static */ public function appendGenericScriptLabel($name, $text = null, $isolated = false) { - if (is_object($name) && ($name instanceof ScriptLabel)) { + if ($name instanceof ScriptLabel) { $scriptLabel = $name; } else { $scriptLabel = new ScriptLabel($name, $text, $isolated); @@ -218,7 +218,11 @@ class Script { */ protected function getHeaderComment() { $headerComment = '/**************************************************** -* FancyManiaLinks v' . FML_VERSION . ' by steeffeen * +* FancyManiaLinks'; + if (defined('FML_VERSION')) { + $headerComment .= ' v' . FML_VERSION; + } + $headerComment .= ' by steeffeen * * http://github.com/steeffeen/FancyManiaLinks * ****************************************************/ diff --git a/application/libs/FML/Stylesheet/Style3d.php b/application/libs/FML/Stylesheet/Style3d.php index a8415681..45476ab4 100644 --- a/application/libs/FML/Stylesheet/Style3d.php +++ b/application/libs/FML/Stylesheet/Style3d.php @@ -53,7 +53,7 @@ class Style3d { * @param string $styleId (optional) Style id */ public function __construct($styleId = null) { - if (!is_null($styleId)) { + if ($styleId !== null) { $this->setId($styleId); } } diff --git a/application/libs/FML/UniqueID.php b/application/libs/FML/UniqueID.php index 708df9e9..4efa151b 100644 --- a/application/libs/FML/UniqueID.php +++ b/application/libs/FML/UniqueID.php @@ -20,7 +20,7 @@ class UniqueID { */ protected static $currentIndex = 0; - /** + /* * Protected properties */ protected $index = null; diff --git a/application/libs/FML/autoload.php b/application/libs/FML/autoload.php index b4d5d5fc..ffa9b429 100644 --- a/application/libs/FML/autoload.php +++ b/application/libs/FML/autoload.php @@ -4,16 +4,16 @@ * FancyManiaLinks - Automatic ManiaLink Generator Framework * * @author steeffeen - * @version 1.3 + * @version 1.4 * @link http://github.com/steeffeen/FancyManiaLinks * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ if (!defined('FML_PATH')) { - define('FML_PATH', __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR); + define('FML_PATH', dirname(__DIR__) . DIRECTORY_SEPARATOR); } if (!defined('FML_VERSION')) { - define('FML_VERSION', '1.3'); + define('FML_VERSION', '1.4'); } /*