From bc23d8f96e5b691988f2b4f5c5bdc89ff9c923d8 Mon Sep 17 00:00:00 2001 From: Albirew Date: Fri, 19 Apr 2019 19:19:02 +0200 Subject: [PATCH 01/11] Front page graphical update Changed index page to make it more like admin page. --- Core/Frameworks/Baikal/Controller/Main.php | 40 +++++++++++++ .../Navigation/Topbar/Anonymous.php | 39 +++++++++++++ .../Baikal/Resources/Images/logo-baikal.png | Bin 0 -> 10115 bytes .../Baikal/Resources/Templates/Main.html | 14 +++++ .../Navigation/Topbar/Anonymous.html | 20 +++++++ .../Resources/Templates/Page/index.html | 53 ++++++++++++++++++ Core/Frameworks/Baikal/View/Main.php | 32 +++++++++++ .../View/Navigation/Topbar/Anonymous.php | 32 +++++++++++ Core/Resources/Web/Baikal | 1 + 9 files changed, 231 insertions(+) create mode 100644 Core/Frameworks/Baikal/Controller/Main.php create mode 100644 Core/Frameworks/Baikal/Controller/Navigation/Topbar/Anonymous.php create mode 100644 Core/Frameworks/Baikal/Resources/Images/logo-baikal.png create mode 100644 Core/Frameworks/Baikal/Resources/Templates/Main.html create mode 100644 Core/Frameworks/Baikal/Resources/Templates/Navigation/Topbar/Anonymous.html create mode 100644 Core/Frameworks/Baikal/Resources/Templates/Page/index.html create mode 100644 Core/Frameworks/Baikal/View/Main.php create mode 100644 Core/Frameworks/Baikal/View/Navigation/Topbar/Anonymous.php create mode 100644 Core/Resources/Web/Baikal diff --git a/Core/Frameworks/Baikal/Controller/Main.php b/Core/Frameworks/Baikal/Controller/Main.php new file mode 100644 index 0000000..abcc694 --- /dev/null +++ b/Core/Frameworks/Baikal/Controller/Main.php @@ -0,0 +1,40 @@ + +# All rights reserved +# +# http://baikal-server.com +# +# This script is part of the Baïkal Server project. The Baïkal +# Server project is free software; you can redistribute it +# and/or modify it under the terms of the GNU General Public +# License as published by the Free Software Foundation; either +# version 2 of the License, or (at your option) any later version. +# +# The GNU General Public License can be found at +# http://www.gnu.org/copyleft/gpl.html. +# +# This script is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# This copyright notice MUST APPEAR in all copies of the script! +################################################################# + + +namespace Baikal\Controller; + +class Main extends \Flake\Core\Controller { + + function execute() { + } + + function render() { + $oView = new \Baikal\View\Main(); + return $oView->render(); + } +} + diff --git a/Core/Frameworks/Baikal/Controller/Navigation/Topbar/Anonymous.php b/Core/Frameworks/Baikal/Controller/Navigation/Topbar/Anonymous.php new file mode 100644 index 0000000..6bc45ca --- /dev/null +++ b/Core/Frameworks/Baikal/Controller/Navigation/Topbar/Anonymous.php @@ -0,0 +1,39 @@ + +# All rights reserved +# +# http://baikal-server.com +# +# This script is part of the Baïkal Server project. The Baïkal +# Server project is free software; you can redistribute it +# and/or modify it under the terms of the GNU General Public +# License as published by the Free Software Foundation; either +# version 2 of the License, or (at your option) any later version. +# +# The GNU General Public License can be found at +# http://www.gnu.org/copyleft/gpl.html. +# +# This script is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# This copyright notice MUST APPEAR in all copies of the script! +################################################################# + + +namespace Baikal\Controller\Navigation\Topbar; + +class Anonymous extends \Flake\Core\Controller { + + function execute() { + } + + function render() { + $oView = new \Baikal\View\Navigation\Topbar\Anonymous(); + return $oView->render(); + } +} diff --git a/Core/Frameworks/Baikal/Resources/Images/logo-baikal.png b/Core/Frameworks/Baikal/Resources/Images/logo-baikal.png new file mode 100644 index 0000000000000000000000000000000000000000..1a623ea3ed8408457235fbf8198d48c05e1d99d4 GIT binary patch literal 10115 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 Y7|f~#rY{#BGo!pzm9!LV<*md22RZYLe*gdg literal 0 HcmV?d00001 diff --git a/Core/Frameworks/Baikal/Resources/Templates/Main.html b/Core/Frameworks/Baikal/Resources/Templates/Main.html new file mode 100644 index 0000000..5dff464 --- /dev/null +++ b/Core/Frameworks/Baikal/Resources/Templates/Main.html @@ -0,0 +1,14 @@ +{% autoescape false %} +
+

Baïkal +

Lightweight CalDAV+CardDAV server.

+
+ +{{ message }} + +
+
+

Baïkal is running alright.

+
+
+{% endautoescape %} \ No newline at end of file diff --git a/Core/Frameworks/Baikal/Resources/Templates/Navigation/Topbar/Anonymous.html b/Core/Frameworks/Baikal/Resources/Templates/Navigation/Topbar/Anonymous.html new file mode 100644 index 0000000..8717b26 --- /dev/null +++ b/Core/Frameworks/Baikal/Resources/Templates/Navigation/Topbar/Anonymous.html @@ -0,0 +1,20 @@ +{% autoescape false %} +
+
+
+ + + + + + Server +
+ +
+
+
+
+{% endautoescape %} diff --git a/Core/Frameworks/Baikal/Resources/Templates/Page/index.html b/Core/Frameworks/Baikal/Resources/Templates/Page/index.html new file mode 100644 index 0000000..c85f01c --- /dev/null +++ b/Core/Frameworks/Baikal/Resources/Templates/Page/index.html @@ -0,0 +1,53 @@ +{% autoescape false %} + + + + + {{ pagetitle }} + + + + + + + + + + + + + {{ head }} + + + {{ navbar }} + +
+ {{ Payload }} +
+ + + + + + + {{ javascript }} + + +{% endautoescape %} diff --git a/Core/Frameworks/Baikal/View/Main.php b/Core/Frameworks/Baikal/View/Main.php new file mode 100644 index 0000000..6bd4fdf --- /dev/null +++ b/Core/Frameworks/Baikal/View/Main.php @@ -0,0 +1,32 @@ + +# All rights reserved +# +# http://baikal-server.com +# +# This script is part of the Baïkal Server project. The Baïkal +# Server project is free software; you can redistribute it +# and/or modify it under the terms of the GNU General Public +# License as published by the Free Software Foundation; either +# version 2 of the License, or (at your option) any later version. +# +# The GNU General Public License can be found at +# http://www.gnu.org/copyleft/gpl.html. +# +# This script is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# This copyright notice MUST APPEAR in all copies of the script! +################################################################# + + +namespace Baikal\View; + +class Main extends \Baikal\Core\View { + +} diff --git a/Core/Frameworks/Baikal/View/Navigation/Topbar/Anonymous.php b/Core/Frameworks/Baikal/View/Navigation/Topbar/Anonymous.php new file mode 100644 index 0000000..48afed6 --- /dev/null +++ b/Core/Frameworks/Baikal/View/Navigation/Topbar/Anonymous.php @@ -0,0 +1,32 @@ + +# All rights reserved +# +# http://baikal-server.com +# +# This script is part of the Baïkal Server project. The Baïkal +# Server project is free software; you can redistribute it +# and/or modify it under the terms of the GNU General Public +# License as published by the Free Software Foundation; either +# version 2 of the License, or (at your option) any later version. +# +# The GNU General Public License can be found at +# http://www.gnu.org/copyleft/gpl.html. +# +# This script is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# This copyright notice MUST APPEAR in all copies of the script! +################################################################# + + +namespace Baikal\View\Navigation\Topbar; + +class Anonymous extends \Baikal\Core\View { + +} diff --git a/Core/Resources/Web/Baikal b/Core/Resources/Web/Baikal new file mode 100644 index 0000000..9f5895a --- /dev/null +++ b/Core/Resources/Web/Baikal @@ -0,0 +1 @@ +../../Frameworks/Baikal/Resources \ No newline at end of file From 6feba12e8aceaa516311a75e303a780c87cff85e Mon Sep 17 00:00:00 2001 From: Albirew Date: Fri, 19 Apr 2019 19:21:15 +0200 Subject: [PATCH 02/11] removed file not converted to simlink --- Core/Resources/Web/Baikal | 1 - 1 file changed, 1 deletion(-) delete mode 100644 Core/Resources/Web/Baikal diff --git a/Core/Resources/Web/Baikal b/Core/Resources/Web/Baikal deleted file mode 100644 index 9f5895a..0000000 --- a/Core/Resources/Web/Baikal +++ /dev/null @@ -1 +0,0 @@ -../../Frameworks/Baikal/Resources \ No newline at end of file From a62f92147b052529aaddf51398f0136f20d53ef9 Mon Sep 17 00:00:00 2001 From: Albirew Date: Fri, 19 Apr 2019 19:31:15 +0200 Subject: [PATCH 03/11] fixed simlink --- Core/Resources/Web/Baikal | 1 + 1 file changed, 1 insertion(+) create mode 120000 Core/Resources/Web/Baikal diff --git a/Core/Resources/Web/Baikal b/Core/Resources/Web/Baikal new file mode 120000 index 0000000..9f5895a --- /dev/null +++ b/Core/Resources/Web/Baikal @@ -0,0 +1 @@ +../../Frameworks/Baikal/Resources \ No newline at end of file From c5ef60c747305d7be33a48db9b6a5abbfe04b50a Mon Sep 17 00:00:00 2001 From: Albirew Date: Fri, 19 Apr 2019 19:44:27 +0200 Subject: [PATCH 04/11] added forgotten views --- Core/Frameworks/Baikal/Core/View.php | 36 ++++++++++++++++++++++++ Core/Frameworks/Baikal/WWWRoot/index.php | 26 +++++++++-------- 2 files changed, 50 insertions(+), 12 deletions(-) create mode 100644 Core/Frameworks/Baikal/Core/View.php diff --git a/Core/Frameworks/Baikal/Core/View.php b/Core/Frameworks/Baikal/Core/View.php new file mode 100644 index 0000000..f48e9fa --- /dev/null +++ b/Core/Frameworks/Baikal/Core/View.php @@ -0,0 +1,36 @@ + +# All rights reserved +# +# http://baikal-server.com +# +# This script is part of the Baïkal Server project. The Baïkal +# Server project is free software; you can redistribute it +# and/or modify it under the terms of the GNU General Public +# License as published by the Free Software Foundation; either +# version 2 of the License, or (at your option) any later version. +# +# The GNU General Public License can be found at +# http://www.gnu.org/copyleft/gpl.html. +# +# This script is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# This copyright notice MUST APPEAR in all copies of the script! +################################################################# + + +namespace Baikal\Core; + +class View extends \Flake\Core\View { + function templatesPath() { + $sViewName = get_class($this); + $sTemplate = str_replace("\\", "/", substr($sViewName, strlen("Baikal\\View\\"))) . ".html"; + return PROJECT_PATH_ROOT . "Core/Resources/Web/Baikal/Templates/" . $sTemplate; + } +} diff --git a/Core/Frameworks/Baikal/WWWRoot/index.php b/Core/Frameworks/Baikal/WWWRoot/index.php index 7f8b36e..b00a2ba 100644 --- a/Core/Frameworks/Baikal/WWWRoot/index.php +++ b/Core/Frameworks/Baikal/WWWRoot/index.php @@ -49,16 +49,18 @@ require PROJECT_PATH_ROOT . 'vendor/autoload.php'; \Flake\Framework::bootstrap(); # Bootstrapping Baïkal -\Baikal\Framework::bootstrap(); +//\Baikal\Framework::bootstrap(); +\BaikalAdmin\Framework::bootstrap(); -?> - - - Baïkal Server - - - -

Baïkal is running alright.

- - +# Create and setup a page object +$oPage = new \Flake\Controller\Page(PROJECT_PATH_ROOT . "Core/Resources/Web/Baikal/Templates/Page/index.html"); +$oPage->injectHTTPHeaders(); +$oPage->setTitle("Baïkal server"); +$oPage->setBaseUrl(PROJECT_URI); + +# Draw page +$oPage->zone("navbar")->addBlock(new \Baikal\Controller\Navigation\Topbar\Anonymous()); +$oPage->zone("Payload")->addBlock(new \Baikal\Controller\Main()); + +# Render the page +echo $oPage->render(); From da9f981ae99e258922fe07f1483ba99902c54e7d Mon Sep 17 00:00:00 2001 From: Albirew Date: Tue, 23 Apr 2019 13:32:09 +0200 Subject: [PATCH 05/11] PR review: fixed line break --- Core/Frameworks/Baikal/Resources/Templates/Main.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/Frameworks/Baikal/Resources/Templates/Main.html b/Core/Frameworks/Baikal/Resources/Templates/Main.html index 5dff464..7c71394 100644 --- a/Core/Frameworks/Baikal/Resources/Templates/Main.html +++ b/Core/Frameworks/Baikal/Resources/Templates/Main.html @@ -1,5 +1,5 @@ {% autoescape false %} -
+

Baïkal

Lightweight CalDAV+CardDAV server.

From bc84ed7d86b18c84ce83869a27ed6c9876cdbcff Mon Sep 17 00:00:00 2001 From: Albirew Date: Tue, 23 Apr 2019 13:34:50 +0200 Subject: [PATCH 06/11] PR review: fixed URL in comment --- Core/Frameworks/Baikal/Controller/Main.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/Frameworks/Baikal/Controller/Main.php b/Core/Frameworks/Baikal/Controller/Main.php index abcc694..500ead8 100644 --- a/Core/Frameworks/Baikal/Controller/Main.php +++ b/Core/Frameworks/Baikal/Controller/Main.php @@ -5,7 +5,7 @@ # (c) 2013 Jérôme Schneider # All rights reserved # -# http://baikal-server.com +# http://sabre.io/baikal # # This script is part of the Baïkal Server project. The Baïkal # Server project is free software; you can redistribute it From 9dac98d6d4c42e3c1ab9c15ab2e93ab1e0bc87be Mon Sep 17 00:00:00 2001 From: Albirew Date: Tue, 23 Apr 2019 13:35:50 +0200 Subject: [PATCH 07/11] PR review: added line break --- Core/Frameworks/Baikal/Resources/Templates/Main.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/Frameworks/Baikal/Resources/Templates/Main.html b/Core/Frameworks/Baikal/Resources/Templates/Main.html index 7c71394..1f2ed22 100644 --- a/Core/Frameworks/Baikal/Resources/Templates/Main.html +++ b/Core/Frameworks/Baikal/Resources/Templates/Main.html @@ -11,4 +11,4 @@

Baïkal is running alright.

-{% endautoescape %} \ No newline at end of file +{% endautoescape %} From 0934fab4f0fdb70fe541f47655ffd6b6d45036cc Mon Sep 17 00:00:00 2001 From: Albirew Date: Tue, 23 Apr 2019 13:47:31 +0200 Subject: [PATCH 08/11] PR review: rotated login icon --- .../Baikal/Resources/Templates/Navigation/Topbar/Anonymous.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/Frameworks/Baikal/Resources/Templates/Navigation/Topbar/Anonymous.html b/Core/Frameworks/Baikal/Resources/Templates/Navigation/Topbar/Anonymous.html index 8717b26..c6bb24b 100644 --- a/Core/Frameworks/Baikal/Resources/Templates/Navigation/Topbar/Anonymous.html +++ b/Core/Frameworks/Baikal/Resources/Templates/Navigation/Topbar/Anonymous.html @@ -10,7 +10,7 @@ Server
From 0913b887458cff0fb9a6cecf4fa6129bcd6101ab Mon Sep 17 00:00:00 2001 From: Albirew Date: Tue, 23 Apr 2019 13:51:53 +0200 Subject: [PATCH 09/11] PR review: open "get your own" in new tab also added basic security, see https://medium.com/@jitbit/target-blank-the-most-underestimated-vulnerability-ever-96e328301f4c --- .../Baikal/Resources/Templates/Navigation/Topbar/Anonymous.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/Frameworks/Baikal/Resources/Templates/Navigation/Topbar/Anonymous.html b/Core/Frameworks/Baikal/Resources/Templates/Navigation/Topbar/Anonymous.html index c6bb24b..e2ab048 100644 --- a/Core/Frameworks/Baikal/Resources/Templates/Navigation/Topbar/Anonymous.html +++ b/Core/Frameworks/Baikal/Resources/Templates/Navigation/Topbar/Anonymous.html @@ -11,7 +11,7 @@
From 6293df67ddb58f74137a481a12be599627d10a74 Mon Sep 17 00:00:00 2001 From: Albirew Date: Tue, 23 Apr 2019 14:05:57 +0200 Subject: [PATCH 10/11] fixed URL in comment --- Core/Frameworks/Baikal/Controller/Main.php | 1 - .../Baikal/Controller/Navigation/Topbar/Anonymous.php | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Core/Frameworks/Baikal/Controller/Main.php b/Core/Frameworks/Baikal/Controller/Main.php index 500ead8..9ee579c 100644 --- a/Core/Frameworks/Baikal/Controller/Main.php +++ b/Core/Frameworks/Baikal/Controller/Main.php @@ -37,4 +37,3 @@ class Main extends \Flake\Core\Controller { return $oView->render(); } } - diff --git a/Core/Frameworks/Baikal/Controller/Navigation/Topbar/Anonymous.php b/Core/Frameworks/Baikal/Controller/Navigation/Topbar/Anonymous.php index 6bc45ca..69d5182 100644 --- a/Core/Frameworks/Baikal/Controller/Navigation/Topbar/Anonymous.php +++ b/Core/Frameworks/Baikal/Controller/Navigation/Topbar/Anonymous.php @@ -5,7 +5,7 @@ # (c) 2013 Jérôme Schneider # All rights reserved # -# http://baikal-server.com +# http://sabre.io/baikal # # This script is part of the Baïkal Server project. The Baïkal # Server project is free software; you can redistribute it From e8320ff738823ba87fb559a2c323e53a1727a34e Mon Sep 17 00:00:00 2001 From: Albirew Date: Wed, 24 Apr 2019 15:55:36 +0200 Subject: [PATCH 11/11] PR review, cleaned commented code --- Core/Frameworks/Baikal/WWWRoot/index.php | 1 - 1 file changed, 1 deletion(-) diff --git a/Core/Frameworks/Baikal/WWWRoot/index.php b/Core/Frameworks/Baikal/WWWRoot/index.php index b00a2ba..6ac8fb5 100644 --- a/Core/Frameworks/Baikal/WWWRoot/index.php +++ b/Core/Frameworks/Baikal/WWWRoot/index.php @@ -49,7 +49,6 @@ require PROJECT_PATH_ROOT . 'vendor/autoload.php'; \Flake\Framework::bootstrap(); # Bootstrapping Baïkal -//\Baikal\Framework::bootstrap(); \BaikalAdmin\Framework::bootstrap(); # Create and setup a page object