diff --git a/application/core/Libs/FML/Controls/Audio.php b/application/core/Libs/FML/Controls/Audio.php index 6bb59051..a6065fe4 100644 --- a/application/core/Libs/FML/Controls/Audio.php +++ b/application/core/Libs/FML/Controls/Audio.php @@ -10,6 +10,8 @@ use FML\Types\Scriptable; * (CMlMediaPlayer) * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ class Audio extends Control implements Playable, Scriptable { /* diff --git a/application/core/Libs/FML/Controls/Control.php b/application/core/Libs/FML/Controls/Control.php index f4afd58c..c3b6e4a9 100644 --- a/application/core/Libs/FML/Controls/Control.php +++ b/application/core/Libs/FML/Controls/Control.php @@ -9,6 +9,8 @@ use FML\Types\Renderable; * (CMlControl) * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ abstract class Control implements Renderable { /* @@ -21,6 +23,11 @@ abstract class Control implements Renderable { const BOTTOM = 'bottom'; const LEFT = 'left'; + /* + * Static Properties + */ + protected static $currentIndex = 0; + /* * Protected Properties */ @@ -69,13 +76,14 @@ abstract class Control implements Renderable { } /** - * Check Id for dangerous Characters and assign an unique Id if necessary + * Check Id for dangerous Characters and assign a unique Id if necessary * * @return \FML\Controls\Control */ public function checkId() { if (!$this->getId()) { - $this->setId(uniqid()); + $this->setId('FML_ID_' . self::$currentIndex); + self::$currentIndex++; return $this; } $dangerousCharacters = array(' ', ' ', '.', '|', '-', PHP_EOL); diff --git a/application/core/Libs/FML/Controls/Entry.php b/application/core/Libs/FML/Controls/Entry.php index a0b7d1f8..b9337315 100644 --- a/application/core/Libs/FML/Controls/Entry.php +++ b/application/core/Libs/FML/Controls/Entry.php @@ -12,6 +12,8 @@ use FML\Types\TextFormatable; * (CMlEntry) * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ class Entry extends Control implements NewLineable, Scriptable, Styleable, TextFormatable { /* diff --git a/application/core/Libs/FML/Controls/FileEntry.php b/application/core/Libs/FML/Controls/FileEntry.php index 6dc2d44c..748361d0 100644 --- a/application/core/Libs/FML/Controls/FileEntry.php +++ b/application/core/Libs/FML/Controls/FileEntry.php @@ -7,6 +7,8 @@ namespace FML\Controls; * (CMlFileEntry) * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ class FileEntry extends Entry { /* diff --git a/application/core/Libs/FML/Controls/Frame.php b/application/core/Libs/FML/Controls/Frame.php index 06c783e8..9e5b33d5 100644 --- a/application/core/Libs/FML/Controls/Frame.php +++ b/application/core/Libs/FML/Controls/Frame.php @@ -12,6 +12,8 @@ use FML\Elements\FrameModel; * (CMlFrame) * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ class Frame extends Control implements Container { /* @@ -79,7 +81,7 @@ class Frame extends Control implements Container { */ public function getFormat($createIfEmpty = true) { if (!$this->format && $createIfEmpty) { - $this->format = new Format(); + $this->setFormat(new Format()); } return $this->format; } diff --git a/application/core/Libs/FML/Controls/Frame3d.php b/application/core/Libs/FML/Controls/Frame3d.php index 4e1e15ab..e205d2cb 100644 --- a/application/core/Libs/FML/Controls/Frame3d.php +++ b/application/core/Libs/FML/Controls/Frame3d.php @@ -10,6 +10,8 @@ use FML\Stylesheet\Style3d; * (CMlFrame) * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ class Frame3d extends Frame implements Scriptable { /* diff --git a/application/core/Libs/FML/Controls/FrameInstance.php b/application/core/Libs/FML/Controls/FrameInstance.php index dceaf4ce..573f3435 100644 --- a/application/core/Libs/FML/Controls/FrameInstance.php +++ b/application/core/Libs/FML/Controls/FrameInstance.php @@ -10,6 +10,8 @@ use FML\Types\Renderable; * (CMlFrame) * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ class FrameInstance extends Control { /* diff --git a/application/core/Libs/FML/Controls/Gauge.php b/application/core/Libs/FML/Controls/Gauge.php index 309c21d4..ee1035cb 100644 --- a/application/core/Libs/FML/Controls/Gauge.php +++ b/application/core/Libs/FML/Controls/Gauge.php @@ -9,6 +9,8 @@ use FML\Types\Styleable; * (CMlGauge) * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ class Gauge extends Control implements Styleable { /* diff --git a/application/core/Libs/FML/Controls/Label.php b/application/core/Libs/FML/Controls/Label.php index 3b44c918..4c2a0cb2 100644 --- a/application/core/Libs/FML/Controls/Label.php +++ b/application/core/Libs/FML/Controls/Label.php @@ -14,6 +14,8 @@ use FML\Types\TextFormatable; * (CMlLabel) * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ class Label extends Control implements Actionable, Linkable, NewLineable, Scriptable, Styleable, TextFormatable { /* diff --git a/application/core/Libs/FML/Controls/Labels/Label_Button.php b/application/core/Libs/FML/Controls/Labels/Label_Button.php index da709936..1fcb091a 100644 --- a/application/core/Libs/FML/Controls/Labels/Label_Button.php +++ b/application/core/Libs/FML/Controls/Labels/Label_Button.php @@ -8,6 +8,8 @@ use FML\Controls\Label; * Label Class for Button Styles * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ class Label_Button extends Label { /* diff --git a/application/core/Libs/FML/Controls/Labels/Label_Text.php b/application/core/Libs/FML/Controls/Labels/Label_Text.php index 4517bf02..74a2df74 100644 --- a/application/core/Libs/FML/Controls/Labels/Label_Text.php +++ b/application/core/Libs/FML/Controls/Labels/Label_Text.php @@ -8,6 +8,8 @@ use FML\Controls\Label; * Label Class for Text Styles * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ class Label_Text extends Label { /* @@ -35,6 +37,7 @@ class Label_Text extends Label { const STYLE_TextCardInfoSmall = 'TextCardInfoSmall'; const STYLE_TextCardInfoVerySmall = 'TextCardInfoVerySmall'; const STYLE_TextCardMedium = 'TextCardMedium'; + const STYLE_TextCardMediumWhite = 'TextCardMediumWhite'; const STYLE_TextCardRaceRank = 'TextCardRaceRank'; const STYLE_TextCardScores2 = 'TextCardScores2'; const STYLE_TextCardSmall = 'TextCardSmall'; @@ -77,8 +80,11 @@ class Label_Text extends Label { const STYLE_TextTitle3 = 'TextTitle3'; const STYLE_TextTitle3Header = 'TextTitle3Header'; const STYLE_TextTitleError = 'TextTitleError'; + const STYLE_TextToolTipAM = 'TextToolTipAM'; + const STYLE_TextToolTipAMBig = 'TextToolTipAMBig'; const STYLE_TextValueBig = 'TextValueBig'; const STYLE_TextValueMedium = 'TextValueMedium'; + const STYLE_TextValueMediumSm = 'TextValueMediumSm'; const STYLE_TextValueSmall = 'TextValueSmall'; const STYLE_TextValueSmallSm = 'TextValueSmallSm'; const STYLE_TrackerText = 'TrackerText'; diff --git a/application/core/Libs/FML/Controls/Quad.php b/application/core/Libs/FML/Controls/Quad.php index 3114c0d8..eccbd74c 100644 --- a/application/core/Libs/FML/Controls/Quad.php +++ b/application/core/Libs/FML/Controls/Quad.php @@ -14,6 +14,8 @@ use FML\Types\SubStyleable; * (CMlQuad) * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ class Quad extends Control implements Actionable, BgColorable, Linkable, Scriptable, Styleable, SubStyleable { /* diff --git a/application/core/Libs/FML/Controls/Quads/Quad_321Go.php b/application/core/Libs/FML/Controls/Quads/Quad_321Go.php index df9da295..df6ef614 100644 --- a/application/core/Libs/FML/Controls/Quads/Quad_321Go.php +++ b/application/core/Libs/FML/Controls/Quads/Quad_321Go.php @@ -8,6 +8,8 @@ use FML\Controls\Quad; * Quad Class for '321Go' Style * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ class Quad_321Go extends Quad { /* diff --git a/application/core/Libs/FML/Controls/Quads/Quad_BgRaceScore2.php b/application/core/Libs/FML/Controls/Quads/Quad_BgRaceScore2.php index 64971c0a..a98bbb06 100644 --- a/application/core/Libs/FML/Controls/Quads/Quad_BgRaceScore2.php +++ b/application/core/Libs/FML/Controls/Quads/Quad_BgRaceScore2.php @@ -8,6 +8,8 @@ use FML\Controls\Quad; * Quad Class for 'BgRaceScore2' Style * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ class Quad_BgRaceScore2 extends Quad { /* diff --git a/application/core/Libs/FML/Controls/Quads/Quad_Bgs1.php b/application/core/Libs/FML/Controls/Quads/Quad_Bgs1.php index b0bd1d4c..4cbc8f64 100644 --- a/application/core/Libs/FML/Controls/Quads/Quad_Bgs1.php +++ b/application/core/Libs/FML/Controls/Quads/Quad_Bgs1.php @@ -8,6 +8,8 @@ use FML\Controls\Quad; * Quad Class for 'Bgs1' Style * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ class Quad_Bgs1 extends Quad { /* @@ -36,6 +38,7 @@ class Quad_Bgs1 extends Quad { const SUBSTYLE_BgCardList = 'BgCardList'; const SUBSTYLE_BgCardOnline = 'BgCardOnline'; const SUBSTYLE_BgCardPlayer = 'BgCardPlayer'; + const SUBSTYLE_BgCardProperty = 'BgCardProperty'; const SUBSTYLE_BgCardSystem = 'BgCardSystem'; const SUBSTYLE_BgCardZone = 'BgCardZone'; const SUBSTYLE_BgColorContour = 'BgColorContour'; @@ -68,6 +71,7 @@ class Quad_Bgs1 extends Quad { const SUBSTYLE_BgWindow1 = 'BgWindow1'; const SUBSTYLE_BgWindow2 = 'BgWindow2'; const SUBSTYLE_BgWindow3 = 'BgWindow3'; + const SUBSTYLE_BgWindow4 = 'BgWindow4'; const SUBSTYLE_EnergyBar = 'EnergyBar'; const SUBSTYLE_EnergyTeam2 = 'EnergyTeam2'; const SUBSTYLE_Glow = 'Glow'; diff --git a/application/core/Libs/FML/Controls/Quads/Quad_Bgs1InRace.php b/application/core/Libs/FML/Controls/Quads/Quad_Bgs1InRace.php index af5ece2b..c87cd3d0 100644 --- a/application/core/Libs/FML/Controls/Quads/Quad_Bgs1InRace.php +++ b/application/core/Libs/FML/Controls/Quads/Quad_Bgs1InRace.php @@ -8,6 +8,8 @@ use FML\Controls\Quad; * Quad Class for 'Bgs1InRace' Style * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ class Quad_Bgs1InRace extends Quad { /* @@ -36,6 +38,7 @@ class Quad_Bgs1InRace extends Quad { const SUBSTYLE_BgCardList = 'BgCardList'; const SUBSTYLE_BgCardOnline = 'BgCardOnline'; const SUBSTYLE_BgCardPlayer = 'BgCardPlayer'; + const SUBSTYLE_BgCardProperty = 'BgCardProperty'; const SUBSTYLE_BgCardSystem = 'BgCardSystem'; const SUBSTYLE_BgCardZone = 'BgCardZone'; const SUBSTYLE_BgColorContour = 'BgColorContour'; @@ -68,6 +71,7 @@ class Quad_Bgs1InRace extends Quad { const SUBSTYLE_BgWindow1 = 'BgWindow1'; const SUBSTYLE_BgWindow2 = 'BgWindow2'; const SUBSTYLE_BgWindow3 = 'BgWindow3'; + const SUBSTYLE_BgWindow4 = 'BgWindow4'; const SUBSTYLE_EnergyBar = 'EnergyBar'; const SUBSTYLE_EnergyTeam2 = 'EnergyTeam2'; const SUBSTYLE_Glow = 'Glow'; diff --git a/application/core/Libs/FML/Controls/Quads/Quad_BgsChallengeMedals.php b/application/core/Libs/FML/Controls/Quads/Quad_BgsChallengeMedals.php index 239ae827..f473a043 100644 --- a/application/core/Libs/FML/Controls/Quads/Quad_BgsChallengeMedals.php +++ b/application/core/Libs/FML/Controls/Quads/Quad_BgsChallengeMedals.php @@ -8,6 +8,8 @@ use FML\Controls\Quad; * Quad Class for 'BgsChallengeMedals' Style * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ class Quad_BgsChallengeMedals extends Quad { /* diff --git a/application/core/Libs/FML/Controls/Quads/Quad_BgsPlayerCard.php b/application/core/Libs/FML/Controls/Quads/Quad_BgsPlayerCard.php index 963aded3..fe912335 100644 --- a/application/core/Libs/FML/Controls/Quads/Quad_BgsPlayerCard.php +++ b/application/core/Libs/FML/Controls/Quads/Quad_BgsPlayerCard.php @@ -8,6 +8,8 @@ use FML\Controls\Quad; * Quad Class for 'BgsPlayerCard' Style * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ class Quad_BgsPlayerCard extends Quad { /* diff --git a/application/core/Libs/FML/Controls/Quads/Quad_Copilot.php b/application/core/Libs/FML/Controls/Quads/Quad_Copilot.php index cfb59aed..176c2bb7 100644 --- a/application/core/Libs/FML/Controls/Quads/Quad_Copilot.php +++ b/application/core/Libs/FML/Controls/Quads/Quad_Copilot.php @@ -8,6 +8,8 @@ use FML\Controls\Quad; * Quad Class for 'Copilot' Style * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ class Quad_Copilot extends Quad { /* diff --git a/application/core/Libs/FML/Controls/Quads/Quad_Emblems.php b/application/core/Libs/FML/Controls/Quads/Quad_Emblems.php index 71cc33a4..9a4e0183 100644 --- a/application/core/Libs/FML/Controls/Quads/Quad_Emblems.php +++ b/application/core/Libs/FML/Controls/Quads/Quad_Emblems.php @@ -8,6 +8,8 @@ use FML\Controls\Quad; * Quad Class for 'Emblems' Style * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ class Quad_Emblems extends Quad { /* diff --git a/application/core/Libs/FML/Controls/Quads/Quad_EnergyBar.php b/application/core/Libs/FML/Controls/Quads/Quad_EnergyBar.php index c6308df5..9c88895e 100644 --- a/application/core/Libs/FML/Controls/Quads/Quad_EnergyBar.php +++ b/application/core/Libs/FML/Controls/Quads/Quad_EnergyBar.php @@ -8,6 +8,8 @@ use FML\Controls\Quad; * Quad Class for 'EnergyBar' Style * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ class Quad_EnergyBar extends Quad { /* diff --git a/application/core/Libs/FML/Controls/Quads/Quad_Hud3dEchelons.php b/application/core/Libs/FML/Controls/Quads/Quad_Hud3dEchelons.php index e03f0596..e9f0d4bd 100644 --- a/application/core/Libs/FML/Controls/Quads/Quad_Hud3dEchelons.php +++ b/application/core/Libs/FML/Controls/Quads/Quad_Hud3dEchelons.php @@ -8,6 +8,8 @@ use FML\Controls\Quad; * Quad Class for 'Hud3dEchelons' Style * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ class Quad_Hud3dEchelons extends Quad { /* diff --git a/application/core/Libs/FML/Controls/Quads/Quad_Hud3dIcons.php b/application/core/Libs/FML/Controls/Quads/Quad_Hud3dIcons.php new file mode 100644 index 00000000..963e5431 --- /dev/null +++ b/application/core/Libs/FML/Controls/Quads/Quad_Hud3dIcons.php @@ -0,0 +1,48 @@ +setStyle(self::STYLE); + } +} diff --git a/application/core/Libs/FML/Controls/Quads/Quad_Icons128x128_1.php b/application/core/Libs/FML/Controls/Quads/Quad_Icons128x128_1.php index 33df6987..1168d016 100644 --- a/application/core/Libs/FML/Controls/Quads/Quad_Icons128x128_1.php +++ b/application/core/Libs/FML/Controls/Quads/Quad_Icons128x128_1.php @@ -8,6 +8,8 @@ use FML\Controls\Quad; * Quad Class for 'Icons128x128_1' Style * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ class Quad_Icons128x128_1 extends Quad { /* diff --git a/application/core/Libs/FML/Controls/Quads/Quad_Icons128x128_Blink.php b/application/core/Libs/FML/Controls/Quads/Quad_Icons128x128_Blink.php index af5167e2..98ac323c 100644 --- a/application/core/Libs/FML/Controls/Quads/Quad_Icons128x128_Blink.php +++ b/application/core/Libs/FML/Controls/Quads/Quad_Icons128x128_Blink.php @@ -8,6 +8,8 @@ use FML\Controls\Quad; * Quad Class for 'Icons128x128_Blink' Style * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ class Quad_Icons128x128_Blink extends Quad { /* diff --git a/application/core/Libs/FML/Controls/Quads/Quad_Icons128x32_1.php b/application/core/Libs/FML/Controls/Quads/Quad_Icons128x32_1.php index d5b4c84d..fcb3e81d 100644 --- a/application/core/Libs/FML/Controls/Quads/Quad_Icons128x32_1.php +++ b/application/core/Libs/FML/Controls/Quads/Quad_Icons128x32_1.php @@ -8,6 +8,8 @@ use FML\Controls\Quad; * Quad Class for 'Icons128x32_1' Style * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ class Quad_Icons128x32_1 extends Quad { /* @@ -18,6 +20,7 @@ class Quad_Icons128x32_1 extends Quad { const SUBSTYLE_ManiaLinkHome = 'ManiaLinkHome'; const SUBSTYLE_ManiaLinkSwitch = 'ManiaLinkSwitch'; const SUBSTYLE_ManiaPlanet = 'ManiaPlanet'; + const SUBSTYLE_Minimize = 'Minimize'; const SUBSTYLE_Music = 'Music'; const SUBSTYLE_PainterBrush = 'PainterBrush'; const SUBSTYLE_PainterFill = 'PainterFill'; diff --git a/application/core/Libs/FML/Controls/Quads/Quad_Icons64x64_1.php b/application/core/Libs/FML/Controls/Quads/Quad_Icons64x64_1.php index 916520f5..1398ad3a 100644 --- a/application/core/Libs/FML/Controls/Quads/Quad_Icons64x64_1.php +++ b/application/core/Libs/FML/Controls/Quads/Quad_Icons64x64_1.php @@ -8,6 +8,8 @@ use FML\Controls\Quad; * Quad Class for 'Icons64x64_1' Style * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ class Quad_Icons64x64_1 extends Quad { /* @@ -79,6 +81,7 @@ class Quad_Icons64x64_1 extends Quad { const SUBSTYLE_ShowRight2 = 'ShowRight2'; const SUBSTYLE_ShowUp = 'ShowUp'; const SUBSTYLE_ShowUp2 = 'ShowUp2'; + const SUBSTYLE_ShowUpChanging = 'ShowUpChanging'; const SUBSTYLE_SliderCursor = 'SliderCursor'; const SUBSTYLE_SliderCursor2 = 'SliderCursor2'; const SUBSTYLE_StateFavourite = 'StateFavourite'; diff --git a/application/core/Libs/FML/Controls/Quads/Quad_Icons64x64_2.php b/application/core/Libs/FML/Controls/Quads/Quad_Icons64x64_2.php index 3b10dc73..a9a3229f 100644 --- a/application/core/Libs/FML/Controls/Quads/Quad_Icons64x64_2.php +++ b/application/core/Libs/FML/Controls/Quads/Quad_Icons64x64_2.php @@ -8,6 +8,8 @@ use FML\Controls\Quad; * Quad Class for 'Icons64x64_2' Style * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ class Quad_Icons64x64_2 extends Quad { /* @@ -25,6 +27,7 @@ class Quad_Icons64x64_2 extends Quad { const SUBSTYLE_RocketElimination = 'RocketElimination'; const SUBSTYLE_RocketHit = 'RocketHit'; const SUBSTYLE_ServerNotice = 'ServerNotice'; + const SUBSTYLE_SortBy = 'SortBy'; const SUBSTYLE_UnknownElimination = 'UnknownElimination'; const SUBSTYLE_UnknownHit = 'UnknownHit'; diff --git a/application/core/Libs/FML/Controls/Quads/Quad_ManiaPlanetLogos.php b/application/core/Libs/FML/Controls/Quads/Quad_ManiaPlanetLogos.php index fe9298f8..c87314ca 100644 --- a/application/core/Libs/FML/Controls/Quads/Quad_ManiaPlanetLogos.php +++ b/application/core/Libs/FML/Controls/Quads/Quad_ManiaPlanetLogos.php @@ -8,6 +8,8 @@ use FML\Controls\Quad; * Quad Class for 'ManiaPlanetLogos' Style * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ class Quad_ManiaPlanetLogos extends Quad { /* diff --git a/application/core/Libs/FML/Controls/Quads/Quad_ManiaPlanetMainMenu.php b/application/core/Libs/FML/Controls/Quads/Quad_ManiaPlanetMainMenu.php new file mode 100644 index 00000000..cb07af58 --- /dev/null +++ b/application/core/Libs/FML/Controls/Quads/Quad_ManiaPlanetMainMenu.php @@ -0,0 +1,51 @@ +setStyle(self::STYLE); + } +} diff --git a/application/core/Libs/FML/Controls/Quads/Quad_ManiaplanetSystem.php b/application/core/Libs/FML/Controls/Quads/Quad_ManiaplanetSystem.php index b0d342ad..b383bd51 100644 --- a/application/core/Libs/FML/Controls/Quads/Quad_ManiaplanetSystem.php +++ b/application/core/Libs/FML/Controls/Quads/Quad_ManiaplanetSystem.php @@ -8,6 +8,8 @@ use FML\Controls\Quad; * Quad Class for 'ManiaplanetSystem' Style * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ class Quad_ManiaplanetSystem extends Quad { /* diff --git a/application/core/Libs/FML/Controls/Quads/Quad_MedalsBig.php b/application/core/Libs/FML/Controls/Quads/Quad_MedalsBig.php index 972d8158..7fa4dea8 100644 --- a/application/core/Libs/FML/Controls/Quads/Quad_MedalsBig.php +++ b/application/core/Libs/FML/Controls/Quads/Quad_MedalsBig.php @@ -8,6 +8,8 @@ use FML\Controls\Quad; * Quad Class for 'MedalsBig' Style * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ class Quad_MedalsBig extends Quad { /* diff --git a/application/core/Libs/FML/Controls/Quads/Quad_TitleLogos.php b/application/core/Libs/FML/Controls/Quads/Quad_TitleLogos.php index 11528acb..81c8f6a4 100644 --- a/application/core/Libs/FML/Controls/Quads/Quad_TitleLogos.php +++ b/application/core/Libs/FML/Controls/Quads/Quad_TitleLogos.php @@ -8,6 +8,8 @@ use FML\Controls\Quad; * Quad Class for 'TitleLogos' Style * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ class Quad_TitleLogos extends Quad { /* diff --git a/application/core/Libs/FML/Controls/Quads/Quad_UIConstruction_Buttons.php b/application/core/Libs/FML/Controls/Quads/Quad_UIConstruction_Buttons.php index 09d0a1c1..2ab4575d 100644 --- a/application/core/Libs/FML/Controls/Quads/Quad_UIConstruction_Buttons.php +++ b/application/core/Libs/FML/Controls/Quads/Quad_UIConstruction_Buttons.php @@ -8,6 +8,8 @@ use FML\Controls\Quad; * Quad Class for 'UIConstruction_Buttons' Style * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ class Quad_UIConstruction_Buttons extends Quad { /* @@ -16,6 +18,7 @@ class Quad_UIConstruction_Buttons extends Quad { const STYLE = 'UIConstruction_Buttons'; const SUBSTYLE_ActionMaker = 'ActionMaker'; const SUBSTYLE_Add = 'Add'; + const SUBSTYLE_AirMapping = 'AirMapping'; const SUBSTYLE_Author = 'Author'; const SUBSTYLE_AuthorTime = 'AuthorTime'; const SUBSTYLE_BgEditors = 'BgEditors'; @@ -32,6 +35,7 @@ class Quad_UIConstruction_Buttons extends Quad { const SUBSTYLE_Down = 'Down'; const SUBSTYLE_Drive = 'Drive'; const SUBSTYLE_Erase = 'Erase'; + const SUBSTYLE_GhostBlocks = 'GhostBlocks'; const SUBSTYLE_Help = 'Help'; const SUBSTYLE_Item = 'Item'; const SUBSTYLE_Left = 'Left'; diff --git a/application/core/Libs/FML/Controls/Quads/Quad_UIConstruction_Buttons2.php b/application/core/Libs/FML/Controls/Quads/Quad_UIConstruction_Buttons2.php new file mode 100644 index 00000000..65a4e02c --- /dev/null +++ b/application/core/Libs/FML/Controls/Quads/Quad_UIConstruction_Buttons2.php @@ -0,0 +1,52 @@ +setStyle(self::STYLE); + } +} diff --git a/application/core/Libs/FML/Controls/Quads/Quad_UiSMSpectatorScoreBig.php b/application/core/Libs/FML/Controls/Quads/Quad_UiSMSpectatorScoreBig.php index 24031618..66816df7 100644 --- a/application/core/Libs/FML/Controls/Quads/Quad_UiSMSpectatorScoreBig.php +++ b/application/core/Libs/FML/Controls/Quads/Quad_UiSMSpectatorScoreBig.php @@ -8,6 +8,8 @@ use FML\Controls\Quad; * Quad Class for 'UiSMSpectatorScoreBig' Style * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ class Quad_UiSMSpectatorScoreBig extends Quad { /* diff --git a/application/core/Libs/FML/Controls/Video.php b/application/core/Libs/FML/Controls/Video.php index 81dbae4e..74228624 100644 --- a/application/core/Libs/FML/Controls/Video.php +++ b/application/core/Libs/FML/Controls/Video.php @@ -10,6 +10,8 @@ use FML\Types\Scriptable; * (CMlMediaPlayer) * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ class Video extends Control implements Playable, Scriptable { /* diff --git a/application/core/Libs/FML/CustomUI.php b/application/core/Libs/FML/CustomUI.php index 379ecb1d..965c7188 100644 --- a/application/core/Libs/FML/CustomUI.php +++ b/application/core/Libs/FML/CustomUI.php @@ -6,6 +6,8 @@ namespace FML; * Class representing a Custom_UI * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ class CustomUI { /* diff --git a/application/core/Libs/FML/Elements/Dico.php b/application/core/Libs/FML/Elements/Dico.php index 213f43bf..6b4c1236 100644 --- a/application/core/Libs/FML/Elements/Dico.php +++ b/application/core/Libs/FML/Elements/Dico.php @@ -6,6 +6,8 @@ namespace FML\Elements; * Dictionary Element * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ class Dico { /** diff --git a/application/core/Libs/FML/Elements/Format.php b/application/core/Libs/FML/Elements/Format.php index d98ab8d5..d45144ac 100644 --- a/application/core/Libs/FML/Elements/Format.php +++ b/application/core/Libs/FML/Elements/Format.php @@ -11,6 +11,8 @@ use FML\Types\TextFormatable; * Format Element * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ class Format implements BgColorable, Renderable, Styleable, TextFormatable { /* diff --git a/application/core/Libs/FML/Elements/FrameModel.php b/application/core/Libs/FML/Elements/FrameModel.php index 256777cb..d4f966ba 100644 --- a/application/core/Libs/FML/Elements/FrameModel.php +++ b/application/core/Libs/FML/Elements/FrameModel.php @@ -10,6 +10,8 @@ use FML\Types\Renderable; * Class representing a Frame Model * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ class FrameModel implements Container, Renderable { /* @@ -90,7 +92,7 @@ class FrameModel implements Container, Renderable { */ public function getFormat($createIfEmpty = true) { if (!$this->format && $createIfEmpty) { - $this->format = new Format(); + $this->setFormat(new Format()); } return $this->format; } diff --git a/application/core/Libs/FML/Elements/Including.php b/application/core/Libs/FML/Elements/Including.php index 7dc48487..316b7b5f 100644 --- a/application/core/Libs/FML/Elements/Including.php +++ b/application/core/Libs/FML/Elements/Including.php @@ -8,6 +8,8 @@ use FML\Types\Renderable; * Include Element * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ class Including implements Renderable { /* diff --git a/application/core/Libs/FML/Elements/Music.php b/application/core/Libs/FML/Elements/Music.php index 5f40cd39..ab1938f1 100644 --- a/application/core/Libs/FML/Elements/Music.php +++ b/application/core/Libs/FML/Elements/Music.php @@ -8,6 +8,8 @@ use FML\Types\Renderable; * Music Element * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ class Music implements Renderable { /* diff --git a/application/core/Libs/FML/Elements/SimpleScript.php b/application/core/Libs/FML/Elements/SimpleScript.php index be1e9d46..8c744883 100644 --- a/application/core/Libs/FML/Elements/SimpleScript.php +++ b/application/core/Libs/FML/Elements/SimpleScript.php @@ -8,6 +8,8 @@ use FML\Types\Renderable; * Class representing a ManiaLink Script Tag with a simple Script Text * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ class SimpleScript implements Renderable { /* diff --git a/application/core/Libs/FML/ManiaCode.php b/application/core/Libs/FML/ManiaCode.php index b924f5c7..9e5a706f 100644 --- a/application/core/Libs/FML/ManiaCode.php +++ b/application/core/Libs/FML/ManiaCode.php @@ -23,6 +23,8 @@ use FML\ManiaCode\ViewReplay; * Class representing a ManiaCode * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ class ManiaCode { /* diff --git a/application/core/Libs/FML/ManiaCode/AddBuddy.php b/application/core/Libs/FML/ManiaCode/AddBuddy.php index d7ee2e5b..0a3f8852 100644 --- a/application/core/Libs/FML/ManiaCode/AddBuddy.php +++ b/application/core/Libs/FML/ManiaCode/AddBuddy.php @@ -6,6 +6,8 @@ namespace FML\ManiaCode; * ManiaCode Element adding a Buddy * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ class AddBuddy implements Element { /* diff --git a/application/core/Libs/FML/ManiaCode/AddFavorite.php b/application/core/Libs/FML/ManiaCode/AddFavorite.php index 75b1f275..651599cb 100644 --- a/application/core/Libs/FML/ManiaCode/AddFavorite.php +++ b/application/core/Libs/FML/ManiaCode/AddFavorite.php @@ -6,6 +6,8 @@ namespace FML\ManiaCode; * ManiaCode Element adding a Server as Favorite * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ class AddFavorite implements Element { /* diff --git a/application/core/Libs/FML/ManiaCode/Element.php b/application/core/Libs/FML/ManiaCode/Element.php index 9d63b2c5..c443f3c9 100644 --- a/application/core/Libs/FML/ManiaCode/Element.php +++ b/application/core/Libs/FML/ManiaCode/Element.php @@ -2,6 +2,13 @@ namespace FML\ManiaCode; +/** + * Base ManiaCode Element + * + * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 + */ interface Element { /** diff --git a/application/core/Libs/FML/ManiaCode/GetSkin.php b/application/core/Libs/FML/ManiaCode/GetSkin.php index 7e81f018..66ac6268 100644 --- a/application/core/Libs/FML/ManiaCode/GetSkin.php +++ b/application/core/Libs/FML/ManiaCode/GetSkin.php @@ -6,6 +6,8 @@ namespace FML\ManiaCode; * ManiaCode Element downloading a Skin * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ class GetSkin implements Element { /* diff --git a/application/core/Libs/FML/ManiaCode/Go_To.php b/application/core/Libs/FML/ManiaCode/Go_To.php index d41973df..8a75266c 100644 --- a/application/core/Libs/FML/ManiaCode/Go_To.php +++ b/application/core/Libs/FML/ManiaCode/Go_To.php @@ -6,6 +6,8 @@ namespace FML\ManiaCode; * ManiaCode Element going to a Link * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ class Go_To implements Element { /* diff --git a/application/core/Libs/FML/ManiaCode/InstallMap.php b/application/core/Libs/FML/ManiaCode/InstallMap.php index f1524577..5ef7fae8 100644 --- a/application/core/Libs/FML/ManiaCode/InstallMap.php +++ b/application/core/Libs/FML/ManiaCode/InstallMap.php @@ -6,6 +6,8 @@ namespace FML\ManiaCode; * ManiaCode Element installing a Map * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ class InstallMap implements Element { /* diff --git a/application/core/Libs/FML/ManiaCode/InstallPack.php b/application/core/Libs/FML/ManiaCode/InstallPack.php index f08a5699..c47b9543 100644 --- a/application/core/Libs/FML/ManiaCode/InstallPack.php +++ b/application/core/Libs/FML/ManiaCode/InstallPack.php @@ -6,6 +6,8 @@ namespace FML\ManiaCode; * ManiaCode Element installing a Title Pack * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ class InstallPack implements Element { /* diff --git a/application/core/Libs/FML/ManiaCode/InstallReplay.php b/application/core/Libs/FML/ManiaCode/InstallReplay.php index abd75298..f3701058 100644 --- a/application/core/Libs/FML/ManiaCode/InstallReplay.php +++ b/application/core/Libs/FML/ManiaCode/InstallReplay.php @@ -6,6 +6,8 @@ namespace FML\ManiaCode; * ManiaCode Element installing a Replay * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ class InstallReplay implements Element { /* diff --git a/application/core/Libs/FML/ManiaCode/InstallScript.php b/application/core/Libs/FML/ManiaCode/InstallScript.php index dc146e8f..1b327837 100644 --- a/application/core/Libs/FML/ManiaCode/InstallScript.php +++ b/application/core/Libs/FML/ManiaCode/InstallScript.php @@ -6,6 +6,8 @@ namespace FML\ManiaCode; * ManiaCode Element installing a Script * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ class InstallScript implements Element { /* diff --git a/application/core/Libs/FML/ManiaCode/InstallSkin.php b/application/core/Libs/FML/ManiaCode/InstallSkin.php index 223bcb4e..3498f2c4 100644 --- a/application/core/Libs/FML/ManiaCode/InstallSkin.php +++ b/application/core/Libs/FML/ManiaCode/InstallSkin.php @@ -6,6 +6,8 @@ namespace FML\ManiaCode; * ManiaCode Element installing a Skin * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ class InstallSkin implements Element { /* diff --git a/application/core/Libs/FML/ManiaCode/JoinServer.php b/application/core/Libs/FML/ManiaCode/JoinServer.php index 5e1b2a4a..95ece4af 100644 --- a/application/core/Libs/FML/ManiaCode/JoinServer.php +++ b/application/core/Libs/FML/ManiaCode/JoinServer.php @@ -6,6 +6,8 @@ namespace FML\ManiaCode; * ManiaCode Element joining a Server * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ class JoinServer implements Element { /* diff --git a/application/core/Libs/FML/ManiaCode/PlayMap.php b/application/core/Libs/FML/ManiaCode/PlayMap.php index 88c4da26..a94be4c9 100644 --- a/application/core/Libs/FML/ManiaCode/PlayMap.php +++ b/application/core/Libs/FML/ManiaCode/PlayMap.php @@ -6,6 +6,8 @@ namespace FML\ManiaCode; * ManiaCode Element playing a Map * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ class PlayMap implements Element { /* diff --git a/application/core/Libs/FML/ManiaCode/PlayReplay.php b/application/core/Libs/FML/ManiaCode/PlayReplay.php index eaaa732b..b3bf9912 100644 --- a/application/core/Libs/FML/ManiaCode/PlayReplay.php +++ b/application/core/Libs/FML/ManiaCode/PlayReplay.php @@ -6,6 +6,8 @@ namespace FML\ManiaCode; * ManiaCode Element playing a Replay * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ class PlayReplay implements Element { /* diff --git a/application/core/Libs/FML/ManiaCode/ShowMessage.php b/application/core/Libs/FML/ManiaCode/ShowMessage.php index 721b3ee5..c214c227 100644 --- a/application/core/Libs/FML/ManiaCode/ShowMessage.php +++ b/application/core/Libs/FML/ManiaCode/ShowMessage.php @@ -6,6 +6,8 @@ namespace FML\ManiaCode; * ManiaCode Element showing a Message * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ class ShowMessage implements Element { /* diff --git a/application/core/Libs/FML/ManiaCode/ViewReplay.php b/application/core/Libs/FML/ManiaCode/ViewReplay.php index aa0da618..82dc772e 100644 --- a/application/core/Libs/FML/ManiaCode/ViewReplay.php +++ b/application/core/Libs/FML/ManiaCode/ViewReplay.php @@ -6,6 +6,8 @@ namespace FML\ManiaCode; * ManiaCode Element viewing a Replay * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ class ViewReplay implements Element { /* diff --git a/application/core/Libs/FML/ManiaLink.php b/application/core/Libs/FML/ManiaLink.php index d415500c..72f5f065 100644 --- a/application/core/Libs/FML/ManiaLink.php +++ b/application/core/Libs/FML/ManiaLink.php @@ -11,12 +11,15 @@ use FML\Types\Renderable; * Class representing a ManiaLink * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ class ManiaLink { /* * Constants */ const BACKGROUND_0 = '0'; + const BACKGROUND_1 = '1'; const BACKGROUND_STARS = 'stars'; const BACKGROUND_STATIONS = 'stations'; const BACKGROUND_TITLE = 'title'; @@ -163,7 +166,7 @@ class ManiaLink { */ public function getDico($createIfEmpty = true) { if (!$this->dico && $createIfEmpty) { - $this->dico = new Dico(); + $this->setDico(new Dico()); } return $this->dico; } @@ -187,7 +190,7 @@ class ManiaLink { */ public function getStylesheet($createIfEmpty = true) { if (!$this->stylesheet && $createIfEmpty) { - $this->stylesheet = new Stylesheet(); + $this->setStylesheet(new Stylesheet()); } return $this->stylesheet; } @@ -211,7 +214,7 @@ class ManiaLink { */ public function getScript($createIfEmpty = true) { if (!$this->script && $createIfEmpty) { - $this->script = new Script(); + $this->setScript(new Script()); } return $this->script; } diff --git a/application/core/Libs/FML/ManiaLinks.php b/application/core/Libs/FML/ManiaLinks.php index d9a430e2..e2e0ff19 100644 --- a/application/core/Libs/FML/ManiaLinks.php +++ b/application/core/Libs/FML/ManiaLinks.php @@ -6,6 +6,8 @@ namespace FML; * Class holding several ManiaLinks at once * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ class ManiaLinks { /* @@ -85,7 +87,7 @@ class ManiaLinks { */ public function getCustomUI($createIfEmpty = true) { if (!$this->customUI && $createIfEmpty) { - $this->customUI = new CustomUI(); + $this->setCustomUI(new CustomUI()); } return $this->customUI; } diff --git a/application/core/Libs/FML/Script/Builder.php b/application/core/Libs/FML/Script/Builder.php index 033c8c03..e6a358b2 100644 --- a/application/core/Libs/FML/Script/Builder.php +++ b/application/core/Libs/FML/Script/Builder.php @@ -6,6 +6,8 @@ namespace FML\Script; * Builder Class offering Methods to build ManiaScript * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ abstract class Builder { @@ -29,8 +31,8 @@ abstract class Builder { */ public static function escapeText($text) { $escapedText = $text; - $dangers = array('\\', '"'); - $replacements = array('\\\\', '\\"'); + $dangers = array('\\', '"', "\n"); + $replacements = array('\\\\', '\\"', '\n'); $escapedText = str_ireplace($dangers, $replacements, $escapedText); return $escapedText; } diff --git a/application/core/Libs/FML/Script/EUISound.php b/application/core/Libs/FML/Script/EUISound.php index 0e7430a3..1ab9c355 100644 --- a/application/core/Libs/FML/Script/EUISound.php +++ b/application/core/Libs/FML/Script/EUISound.php @@ -6,6 +6,8 @@ namespace FML\Script; * Class for EUISound Variants * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ abstract class EUISound { /* diff --git a/application/core/Libs/FML/Script/Script.php b/application/core/Libs/FML/Script/Script.php index b460945f..3de3cd84 100644 --- a/application/core/Libs/FML/Script/Script.php +++ b/application/core/Libs/FML/Script/Script.php @@ -11,6 +11,8 @@ use FML\Types\Actionable; * Class representing the ManiaLink Script * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ class Script { /* diff --git a/application/core/Libs/FML/Stylesheet/Mood.php b/application/core/Libs/FML/Stylesheet/Mood.php index 86e47ff2..3b70e6c9 100644 --- a/application/core/Libs/FML/Stylesheet/Mood.php +++ b/application/core/Libs/FML/Stylesheet/Mood.php @@ -9,6 +9,8 @@ namespace FML\Stylesheet; * Class representing a Stylesheets Mood * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ class Mood { /* diff --git a/application/core/Libs/FML/Stylesheet/Style3d.php b/application/core/Libs/FML/Stylesheet/Style3d.php index f7028362..2895eab2 100644 --- a/application/core/Libs/FML/Stylesheet/Style3d.php +++ b/application/core/Libs/FML/Stylesheet/Style3d.php @@ -6,6 +6,8 @@ namespace FML\Stylesheet; * Class representing a specific Style3d * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ class Style3d { /* diff --git a/application/core/Libs/FML/Stylesheet/Stylesheet.php b/application/core/Libs/FML/Stylesheet/Stylesheet.php index 50d46cad..31bf8f39 100644 --- a/application/core/Libs/FML/Stylesheet/Stylesheet.php +++ b/application/core/Libs/FML/Stylesheet/Stylesheet.php @@ -6,6 +6,8 @@ namespace FML\Stylesheet; * Class representing the ManiaLinks Stylesheet * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ class Stylesheet { /* @@ -73,7 +75,7 @@ class Stylesheet { */ public function getMood($createIfEmpty = true) { if (!$this->mood && $createIfEmpty) { - $this->mood = new Mood(); + $this->setMood(new Mood()); } return $this->mood; } diff --git a/application/core/Libs/FML/Types/Actionable.php b/application/core/Libs/FML/Types/Actionable.php index 309666cc..2b887f1b 100644 --- a/application/core/Libs/FML/Types/Actionable.php +++ b/application/core/Libs/FML/Types/Actionable.php @@ -6,6 +6,8 @@ namespace FML\Types; * Interface for Elements that support the Action Attribute * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ interface Actionable { /* diff --git a/application/core/Libs/FML/Types/BgColorable.php b/application/core/Libs/FML/Types/BgColorable.php index cba68a2b..7fc2c72b 100644 --- a/application/core/Libs/FML/Types/BgColorable.php +++ b/application/core/Libs/FML/Types/BgColorable.php @@ -6,6 +6,8 @@ namespace FML\Types; * Interface for Elements with Background Color Attribute * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ interface BgColorable { diff --git a/application/core/Libs/FML/Types/Container.php b/application/core/Libs/FML/Types/Container.php index 353232bf..8e4322d1 100644 --- a/application/core/Libs/FML/Types/Container.php +++ b/application/core/Libs/FML/Types/Container.php @@ -9,6 +9,8 @@ use FML\Elements\Format; * Interface for Element being able to contain other Controls * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ interface Container { diff --git a/application/core/Libs/FML/Types/Linkable.php b/application/core/Libs/FML/Types/Linkable.php index 9a326d1c..9535659d 100644 --- a/application/core/Libs/FML/Types/Linkable.php +++ b/application/core/Libs/FML/Types/Linkable.php @@ -6,6 +6,8 @@ namespace FML\Types; * Interface for Elements with Url Attributes * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ interface Linkable { diff --git a/application/core/Libs/FML/Types/NewLineable.php b/application/core/Libs/FML/Types/NewLineable.php index d0765732..a78b3bb4 100644 --- a/application/core/Libs/FML/Types/NewLineable.php +++ b/application/core/Libs/FML/Types/NewLineable.php @@ -6,6 +6,8 @@ namespace FML\Types; * Interface for Elements with AutoNewLine Attribute * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ interface NewLineable { diff --git a/application/core/Libs/FML/Types/Playable.php b/application/core/Libs/FML/Types/Playable.php index bd008c32..fa027a18 100644 --- a/application/core/Libs/FML/Types/Playable.php +++ b/application/core/Libs/FML/Types/Playable.php @@ -6,6 +6,8 @@ namespace FML\Types; * Interface for Elements with Media Attributes * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ interface Playable { diff --git a/application/core/Libs/FML/Types/Renderable.php b/application/core/Libs/FML/Types/Renderable.php index 36065478..0c4d445f 100644 --- a/application/core/Libs/FML/Types/Renderable.php +++ b/application/core/Libs/FML/Types/Renderable.php @@ -6,6 +6,8 @@ namespace FML\Types; * Interface for renderable Elements * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ interface Renderable { diff --git a/application/core/Libs/FML/Types/Scriptable.php b/application/core/Libs/FML/Types/Scriptable.php index 79a76f9f..1e63bb21 100644 --- a/application/core/Libs/FML/Types/Scriptable.php +++ b/application/core/Libs/FML/Types/Scriptable.php @@ -6,6 +6,8 @@ namespace FML\Types; * Interface for Elements with ScriptEvents Attribute * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ interface Scriptable { diff --git a/application/core/Libs/FML/Types/Styleable.php b/application/core/Libs/FML/Types/Styleable.php index c75c47b7..7dfa5213 100644 --- a/application/core/Libs/FML/Types/Styleable.php +++ b/application/core/Libs/FML/Types/Styleable.php @@ -6,6 +6,8 @@ namespace FML\Types; * Interface for Elements with Style Attribute * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ interface Styleable { diff --git a/application/core/Libs/FML/Types/SubStyleable.php b/application/core/Libs/FML/Types/SubStyleable.php index 69e57ca4..7788d62b 100644 --- a/application/core/Libs/FML/Types/SubStyleable.php +++ b/application/core/Libs/FML/Types/SubStyleable.php @@ -6,6 +6,8 @@ namespace FML\Types; * Interface for Elements with SubStyle Attribute * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ interface SubStyleable { diff --git a/application/core/Libs/FML/Types/TextFormatable.php b/application/core/Libs/FML/Types/TextFormatable.php index b9e6e201..aa138b90 100644 --- a/application/core/Libs/FML/Types/TextFormatable.php +++ b/application/core/Libs/FML/Types/TextFormatable.php @@ -6,6 +6,8 @@ namespace FML\Types; * Interface for Elements with Formatable Text * * @author steeffeen + * @copyright FancyManiaLinks Copyright © 2014 Steffen Schröder + * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 */ interface TextFormatable { diff --git a/application/core/Libs/FML/autoload.php b/application/core/Libs/FML/autoload.php index 70b25e38..715d6c3d 100644 --- a/application/core/Libs/FML/autoload.php +++ b/application/core/Libs/FML/autoload.php @@ -5,6 +5,8 @@ * * @author steeffeen * @version 1.0 + * @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__ . '/../');