diff --git a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Dashboard.php b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Dashboard.php index b21807c..5f03791 100755 --- a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Dashboard.php +++ b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Dashboard.php @@ -50,14 +50,6 @@ class Dashboard extends \Flake\Core\Controller { $iNbEvents = \Baikal\Model\Calendar\Event::getBaseRequester()->count(); $oView->setData("nbevents", $iNbEvents); - if($iNbCalendars > 0) { - $fEventsPerCalendarAvg = $iNbEvents / $iNbCalendars; - } else { - $fEventsPerCalendarAvg = 0; - } - - $oView->setData("eventspercalendaravg", $fEventsPerCalendarAvg); - # Statistics: CardDAV $iNbBooks = \Baikal\Model\AddressBook::getBaseRequester()->count(); $oView->setData("nbbooks", $iNbBooks); @@ -65,14 +57,6 @@ class Dashboard extends \Flake\Core\Controller { $iNbContacts = \Baikal\Model\AddressBook\Contact::getBaseRequester()->count(); $oView->setData("nbcontacts", $iNbEvents); - if($iNbBooks > 0) { - $fContactsPerBookAvg = $iNbContacts / $iNbBooks; - } else { - $fContactsPerBookAvg = 0; - } - - $oView->setData("contactsperbookavg", $fContactsPerBookAvg); - return $oView->render(); } } \ No newline at end of file diff --git a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Install/Initialize.php b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Install/Initialize.php index 29e33ec..cfa900b 100755 --- a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Install/Initialize.php +++ b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Install/Initialize.php @@ -81,23 +81,22 @@ PHP; public function render() { $sBigIcon = "glyph2x-magic"; $sBaikalVersion = BAIKAL_VERSION; - - $sHtml = << -

Baïkal initialization wizard

-

Configure your new Baïkal {$sBaikalVersion} installation.

- -HTML; + + $oView = new \BaikalAdmin\View\Install\Initialize(); + $oView->setData("baikalversion", BAIKAL_VERSION); if($this->oForm->persisted()) { - $sHtml .= "

Baïkal is now configured. You may now Access the Baïkal admin"; - + $sMessage = "

Baïkal is now configured. You may now Access the Baïkal admin"; + $sForm = ""; } else { - # Display the config form - $sHtml .= $this->oForm->render(); + $sMessage = ""; + $sForm = $this->oForm->render(); } - - return $sHtml; + + $oView->setData("message", $sMessage); + $oView->setData("form", $sForm); + + return $oView->render(); } protected function tagConfiguredVersion() { diff --git a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Login.php b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Login.php index f0a60c4..e907480 100755 --- a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Login.php +++ b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Login.php @@ -34,38 +34,43 @@ class Login extends \Flake\Core\Controller { public function render() { $sActionUrl = \Flake\Util\Tools::getCurrentUrl(); $sSubmittedFlagName = "auth"; + + if(self::isSubmitted() && !\BaikalAdmin\Core\Auth::isAuthenticated()) { + $sMessage = \Formal\Core\Message::error( + "The login/password you provided is invalid. Please retry.", + "Authentication error" + ); + } elseif(self::justLoggedOut()) { + $sMessage = \Formal\Core\Message::notice( + "You have been disconnected from your session.", + "Session ended", + FALSE + ); + } + $sLogin = htmlspecialchars(\Flake\Util\Tools::POST("login")); $sPassword = htmlspecialchars(\Flake\Util\Tools::POST("password")); + if(trim($sLogin) === "") { $sLogin = "admin"; } - - $sForm =<<

-

Authentication

-

Please authenticate to access Baïkal Web Admin.

- - - - -
-

- - -

- -

- - -

-
- -
-
-
-FORM; - return $sForm; + $oView = new \BaikalAdmin\View\Login(); + $oView->setData("message", $sMessage); + $oView->setData("actionurl", $sActionUrl); + $oView->setData("submittedflagname", $sSubmittedFlagName); + $oView->setData("login", $sLogin); + $oView->setData("password", $sPassword); + + return $oView->render(); + } + + protected static function isSubmitted() { + return (intval(\Flake\Util\Tools::POST("auth")) === 1); + } + + protected static function justLoggedOut() { + $aParams = $GLOBALS["ROUTER"]::getURLParams(); + return (!empty($aParams) && $aParams[0] === "loggedout"); } } \ No newline at end of file diff --git a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Logout.php b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Logout.php new file mode 100755 index 0000000..4194db6 --- /dev/null +++ b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Logout.php @@ -0,0 +1,43 @@ + +* All rights reserved +* +* http://baikal.codr.fr +* +* 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 BaikalAdmin\Controller; + +class Logout extends \Flake\Core\Controller { + + public function execute() { + \BaikalAdmin\Core\Auth::unAuthenticate(); + + $sControllerForDefaultRoute = $GLOBALS["ROUTER"]::getControllerForRoute("default"); +# debug($sControllerForDefaultRoute); +# die(); + $sLink = $GLOBALS["ROUTER"]::buildRouteForController($sControllerForDefaultRoute, "loggedout"); + \Flake\Util\Tools::redirect($sLink); + } + + public function render() { + } +} \ No newline at end of file diff --git a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Navigation/Topbar.php b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Navigation/Topbar.php index 1ab1b08..4dddd7d 100755 --- a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Navigation/Topbar.php +++ b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Navigation/Topbar.php @@ -33,6 +33,8 @@ class Topbar extends \Flake\Core\Controller { public function render() { + $oView = new \BaikalAdmin\View\Navigation\Topbar(); + $sCurrentRoute = $GLOBALS["ROUTER"]::getCurrentRoute(); $sActiveHome = $sActiveUsers = $sActiveSettingsStandard = $sActiveSettingsSystem = ""; @@ -41,6 +43,7 @@ class Topbar extends \Flake\Core\Controller { $sUsersLink = \BaikalAdmin\Controller\Users::link(); $sSettingsStandardLink = \BaikalAdmin\Controller\Settings\Standard::link(); $sSettingsSystemLink = \BaikalAdmin\Controller\Settings\System::link(); + $sLogoutLink = \BaikalAdmin\Controller\Logout::link(); if($sCurrentRoute === "default") { $sActiveHome = "active"; @@ -61,28 +64,16 @@ class Topbar extends \Flake\Core\Controller { $sActiveSettingsSystem = "active"; } - $sHtml =<< -
-
- - - - - - Baïkal Web Admin -
- -
-
-
- -HTML; - return $sHtml; + $oView->setData("activehome", $sActiveHome); + $oView->setData("activeusers", $sActiveUsers); + $oView->setData("activesettingsstandard", $sActiveSettingsStandard); + $oView->setData("activesettingssystem", $sActiveSettingsSystem); + $oView->setData("homelink", $sHomeLink); + $oView->setData("userslink", $sUsersLink); + $oView->setData("settingsstandardlink", $sSettingsStandardLink); + $oView->setData("settingssystemlink", $sSettingsSystemLink); + $oView->setData("logoutlink", $sLogoutLink); + + return $oView->render(); } } \ No newline at end of file diff --git a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Navigation/Topbar/Anonymous.php b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Navigation/Topbar/Anonymous.php index e7c00f6..842efd5 100755 --- a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Navigation/Topbar/Anonymous.php +++ b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Navigation/Topbar/Anonymous.php @@ -32,16 +32,7 @@ class Anonymous extends \Flake\Core\Controller { } public function render() { - - $sHtml =<< -
-
- Baïkal Web Admin -
-
- -HTML; - return $sHtml; + $oView = new \BaikalAdmin\View\Navigation\Topbar\Anonymous(); + return $oView->render(); } } \ No newline at end of file diff --git a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Navigation/Topbar/Install.php b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Navigation/Topbar/Install.php index 0e25499..a1306b1 100755 --- a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Navigation/Topbar/Install.php +++ b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Navigation/Topbar/Install.php @@ -32,16 +32,7 @@ class Install extends \Flake\Core\Controller { } public function render() { - - $sHtml =<< -
-
- Baïkal Install Tool -
-
- -HTML; - return $sHtml; + $oView = new \BaikalAdmin\View\Navigation\Topbar\Install(); + return $oView->render(); } } \ No newline at end of file diff --git a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Settings/Standard.php b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Settings/Standard.php index 4c04e69..91701b9 100755 --- a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Settings/Standard.php +++ b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Settings/Standard.php @@ -50,11 +50,9 @@ class Standard extends \Flake\Core\Controller { public function render() { - $sHeader =<<
-

Baïkal settings

- -FORM; - return $sHeader . $this->oForm->render(); + $oView = new \BaikalAdmin\View\Settings\Standard(); + $oView->setData("form", $this->oForm->render()); + + return $oView->render(); } } \ No newline at end of file diff --git a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Settings/System.php b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Settings/System.php index 4c91955..9841f2a 100755 --- a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Settings/System.php +++ b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Settings/System.php @@ -50,17 +50,15 @@ class System extends \Flake\Core\Controller { public function render() { - $sHeader =<< -

Baïkal system settings

- -FORM; - - $sMessage = \Formal\Core\Message::notice( + $oView = new \BaikalAdmin\View\Settings\System(); + $oView->setData("message", \Formal\Core\Message::notice( "Do not change anything on this page unless you really know what you are doing.
You might break Baïkal if you misconfigure something here.", "Warning !", FALSE - ); - return $sHeader . $sMessage . $this->oForm->render(); + )); + + $oView->setData("form", $this->oForm->render()); + + return $oView->render(); } } \ No newline at end of file diff --git a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/User/AddressBooks.php b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/User/AddressBooks.php index f3dc1d0..55fe2c4 100755 --- a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/User/AddressBooks.php +++ b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/User/AddressBooks.php @@ -118,29 +118,28 @@ class AddressBooks extends \Flake\Core\Controller { public function render() { - $sHtml = ""; + $oView = new \BaikalAdmin\View\User\AddressBooks(); - # Render list of users - $oAddressBooks = $this->oUser->getAddressBooksBaseRequester()->execute(); - - $oView = new \BaikalAdmin\View\AddressBooks\Listing(); + # User $oView->setData("user", $this->oUser); - $oView->setData("addressbooks", $oAddressBooks); - $sHtml .= $oView->render(); - # Render form - $sHtml .= ""; + # Render list of address books + $oAddressBooks = $this->oUser->getAddressBooksBaseRequester()->execute(); + $oView->setData("addressbooks", $oAddressBooks); + + # Messages $sMessages = implode("\n", $this->aMessages); + $oView->setData("messages", $sMessages); if(self::newRequested() || self::editRequested()) { - # We have to display the User form - $sHtml .= $this->oForm->render(); + $sForm = $this->oForm->render(); } else { - # No form is displayed; simply display messages, if any - $sHtml .= $sMessages; + $sForm = ""; } + + $oView->setData("form", $sForm); - return $sHtml; + return $oView->render(); } protected function initForm() { diff --git a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/User/Calendars.php b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/User/Calendars.php index ca06df1..6a9ae52 100755 --- a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/User/Calendars.php +++ b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/User/Calendars.php @@ -123,29 +123,28 @@ class Calendars extends \Flake\Core\Controller { public function render() { - $sHtml = ""; + $oView = new \BaikalAdmin\View\User\Calendars(); - # Render list of users - $oCalendars = $this->oUser->getCalendarsBaseRequester()->execute(); - - $oView = new \BaikalAdmin\View\Calendars\Listing(); + # User $oView->setData("user", $this->oUser); - $oView->setData("calendars", $oCalendars); - $sHtml .= $oView->render(); - # Render form - $sHtml .= ""; + # List of calendars + $oCalendars = $this->oUser->getCalendarsBaseRequester()->execute(); + $oView->setData("calendars", $oCalendars); + + # Messages $sMessages = implode("\n", $this->aMessages); + $oView->setData("messages", $sMessages); if(self::newRequested() || self::editRequested()) { - # We have to display the User form - $sHtml .= $this->oForm->render(); + $sForm = $this->oForm->render(); } else { - # No form is displayed; simply display messages, if any - $sHtml .= $sMessages; + $sForm = ""; } + + $oView->setData("form", $sForm); - return $sHtml; + return $oView->render(); } protected function initForm() { diff --git a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Users.php b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Users.php index 74e5c5b..68c3dfe 100755 --- a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Users.php +++ b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Users.php @@ -98,28 +98,27 @@ class Users extends \Flake\Core\Controller { } public function render() { - $sHtml = ""; - # Render list of users + $oView = new \BaikalAdmin\View\Users(); + + # List of users $oUsers = \Baikal\Model\User::getBaseRequester()->execute(); - $oView = new \BaikalAdmin\View\Users\Listing(); $oView->setData("users", $oUsers); - $sHtml .= $oView->render(); - - # Render form - $sHtml .= ""; + # Messages $sMessages = implode("\n", $this->aMessages); - + $oView->setData("messages", $sMessages); + + # Form if(self::newRequested() || self::editRequested()) { - # We have to display the User form - $sHtml .= $this->oForm->render(); + $sForm = $this->oForm->render(); } else { - # No form is displayed; simply display messages, if any - $sHtml .= $sMessages; + $sForm = ""; } - return $sHtml; + $oView->setData("form", $sForm); + + return $oView->render(); } protected function initForm() { diff --git a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Core/Auth.php b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Core/Auth.php index bc6facc..4a6f10b 100755 --- a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Core/Auth.php +++ b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Core/Auth.php @@ -74,6 +74,11 @@ class Auth { return TRUE; } + return FALSE; + } + + public static function authenticate() { + if(intval(\Flake\Util\Tools::POST("auth")) !== 1) { return FALSE; } @@ -89,6 +94,11 @@ class Auth { } return FALSE; + + } + + public static function unAuthenticate() { + unset($_SESSION["baikaladminauth"]); } public static function hashAdminPassword($sPassword) { diff --git a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/Dashboard.html b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/Dashboard.html index 4acbb08..e7f3e1b 100755 --- a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/Dashboard.html +++ b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/Dashboard.html @@ -89,10 +89,6 @@ Number of events - - Events per calendar avg. - - @@ -108,10 +104,6 @@ Number of contacts - - Contacts per book avg. - - diff --git a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/Install/Initialize.html b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/Install/Initialize.html new file mode 100755 index 0000000..0ee9cb9 --- /dev/null +++ b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/Install/Initialize.html @@ -0,0 +1,8 @@ +
+

Baïkal initialization wizard

+

Configure your new Baïkal installation.

+
+ + + + \ No newline at end of file diff --git a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/Login.html b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/Login.html new file mode 100755 index 0000000..f6e4d54 --- /dev/null +++ b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/Login.html @@ -0,0 +1,25 @@ +
+

Authentication

+

Please authenticate to access Baïkal Web Admin.

+
+ + + + + +
+

+ + +

+ +

+ + +

+ +
+ +
+
+
\ No newline at end of file diff --git a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/Navigation/Topbar.html b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/Navigation/Topbar.html new file mode 100755 index 0000000..7f8173f --- /dev/null +++ b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/Navigation/Topbar.html @@ -0,0 +1,21 @@ +
+
+
+ + + + + + Baïkal Web Admin +
+ +
+
+
+
diff --git a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/Navigation/Topbar/Anonymous.html b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/Navigation/Topbar/Anonymous.html new file mode 100755 index 0000000..db737e0 --- /dev/null +++ b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/Navigation/Topbar/Anonymous.html @@ -0,0 +1,7 @@ +
+
+
+ Baïkal Web Admin +
+
+
\ No newline at end of file diff --git a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/Navigation/Topbar/Install.html b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/Navigation/Topbar/Install.html new file mode 100755 index 0000000..0b09bdb --- /dev/null +++ b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/Navigation/Topbar/Install.html @@ -0,0 +1,7 @@ +
+
+
+ Baïkal Install Tool +
+
+
\ No newline at end of file diff --git a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/Settings/Standard.html b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/Settings/Standard.html new file mode 100755 index 0000000..d2e6b31 --- /dev/null +++ b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/Settings/Standard.html @@ -0,0 +1,5 @@ +
+

Baïkal settings

+
+ + \ No newline at end of file diff --git a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/Settings/System.html b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/Settings/System.html new file mode 100755 index 0000000..bc3deac --- /dev/null +++ b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/Settings/System.html @@ -0,0 +1,6 @@ +
+

Baïkal system settings

+
+ + + \ No newline at end of file diff --git a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/AddressBooks/Listing.html b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/User/AddressBooks.html similarity index 96% rename from CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/AddressBooks/Listing.html rename to CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/User/AddressBooks.html index d346217..aac3d9b 100755 --- a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/AddressBooks/Listing.html +++ b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/User/AddressBooks.html @@ -33,4 +33,8 @@ - \ No newline at end of file + + + + + \ No newline at end of file diff --git a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/Calendars/Listing.html b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/User/Calendars.html similarity index 96% rename from CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/Calendars/Listing.html rename to CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/User/Calendars.html index a8603bb..b5005de 100755 --- a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/Calendars/Listing.html +++ b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/User/Calendars.html @@ -33,4 +33,8 @@ - \ No newline at end of file + + + + + \ No newline at end of file diff --git a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/Users/Listing.html b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/Users.html similarity index 96% rename from CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/Users/Listing.html rename to CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/Users.html index e62e666..e3f339f 100755 --- a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/Users/Listing.html +++ b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/Users.html @@ -31,4 +31,8 @@ - \ No newline at end of file + + + + + \ No newline at end of file diff --git a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Route/Logout.php b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Route/Logout.php new file mode 100755 index 0000000..1aae473 --- /dev/null +++ b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Route/Logout.php @@ -0,0 +1,34 @@ + +* All rights reserved +* +* http://baikal.codr.fr +* +* 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 BaikalAdmin\Route; + +class Logout { + + public static function execute(\Flake\Core\Render\Container &$oRenderContainer) { + $oRenderContainer->zone("Payload")->addBlock(new \BaikalAdmin\Controller\Logout()); + } +} \ No newline at end of file diff --git a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/View/AddressBooks/Listing.php b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/View/Install/Initialize.php similarity index 91% rename from CoreVersions/0.2.0/Frameworks/BaikalAdmin/View/AddressBooks/Listing.php rename to CoreVersions/0.2.0/Frameworks/BaikalAdmin/View/Install/Initialize.php index efb2f80..9085cdb 100755 --- a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/View/AddressBooks/Listing.php +++ b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/View/Install/Initialize.php @@ -24,7 +24,7 @@ * This copyright notice MUST APPEAR in all copies of the script! ***************************************************************/ -namespace BaikalAdmin\View\AddressBooks; +namespace BaikalAdmin\View\Install; -class Listing extends \BaikalAdmin\Core\View { +class Initialize extends \BaikalAdmin\Core\View { } \ No newline at end of file diff --git a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/View/Users/Listing.php b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/View/Login.php similarity index 92% rename from CoreVersions/0.2.0/Frameworks/BaikalAdmin/View/Users/Listing.php rename to CoreVersions/0.2.0/Frameworks/BaikalAdmin/View/Login.php index 435ea33..9e9b01a 100755 --- a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/View/Users/Listing.php +++ b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/View/Login.php @@ -24,7 +24,8 @@ * This copyright notice MUST APPEAR in all copies of the script! ***************************************************************/ -namespace BaikalAdmin\View\Users; +namespace BaikalAdmin\View; -class Listing extends \BaikalAdmin\Core\View { +class Login extends \BaikalAdmin\Core\View { + } \ No newline at end of file diff --git a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/View/Navigation/Topbar.php b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/View/Navigation/Topbar.php new file mode 100755 index 0000000..6efbc2d --- /dev/null +++ b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/View/Navigation/Topbar.php @@ -0,0 +1,31 @@ + +* All rights reserved +* +* http://baikal.codr.fr +* +* 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 BaikalAdmin\View\Navigation; + +class Topbar extends \BaikalAdmin\Core\View { + +} \ No newline at end of file diff --git a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/View/Navigation/Topbar/Anonymous.php b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/View/Navigation/Topbar/Anonymous.php new file mode 100755 index 0000000..a4c6a6e --- /dev/null +++ b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/View/Navigation/Topbar/Anonymous.php @@ -0,0 +1,31 @@ + +* All rights reserved +* +* http://baikal.codr.fr +* +* 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 BaikalAdmin\View\Navigation\Topbar; + +class Anonymous extends \BaikalAdmin\Core\View { + +} \ No newline at end of file diff --git a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/View/Navigation/Topbar/Install.php b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/View/Navigation/Topbar/Install.php new file mode 100755 index 0000000..5d6fab0 --- /dev/null +++ b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/View/Navigation/Topbar/Install.php @@ -0,0 +1,31 @@ + +* All rights reserved +* +* http://baikal.codr.fr +* +* 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 BaikalAdmin\View\Navigation\Topbar; + +class Install extends \BaikalAdmin\Core\View { + +} \ No newline at end of file diff --git a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/View/Settings/Standard.php b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/View/Settings/Standard.php new file mode 100755 index 0000000..cdfb506 --- /dev/null +++ b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/View/Settings/Standard.php @@ -0,0 +1,31 @@ + +* All rights reserved +* +* http://baikal.codr.fr +* +* 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 BaikalAdmin\View\Settings; + +class Standard extends \BaikalAdmin\Core\View { + +} \ No newline at end of file diff --git a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/View/Calendars/Listing.php b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/View/Settings/System.php similarity index 92% rename from CoreVersions/0.2.0/Frameworks/BaikalAdmin/View/Calendars/Listing.php rename to CoreVersions/0.2.0/Frameworks/BaikalAdmin/View/Settings/System.php index d05064d..118a819 100755 --- a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/View/Calendars/Listing.php +++ b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/View/Settings/System.php @@ -24,7 +24,8 @@ * This copyright notice MUST APPEAR in all copies of the script! ***************************************************************/ -namespace BaikalAdmin\View\Calendars; +namespace BaikalAdmin\View\Settings; -class Listing extends \BaikalAdmin\Core\View { +class System extends \BaikalAdmin\Core\View { + } \ No newline at end of file diff --git a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/View/User/AddressBooks.php b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/View/User/AddressBooks.php new file mode 100755 index 0000000..2d0e28f --- /dev/null +++ b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/View/User/AddressBooks.php @@ -0,0 +1,30 @@ + +* All rights reserved +* +* http://baikal.codr.fr +* +* 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 BaikalAdmin\View\User; + +class AddressBooks extends \BaikalAdmin\Core\View { +} \ No newline at end of file diff --git a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/View/User/Calendars.php b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/View/User/Calendars.php new file mode 100755 index 0000000..341739c --- /dev/null +++ b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/View/User/Calendars.php @@ -0,0 +1,30 @@ + +* All rights reserved +* +* http://baikal.codr.fr +* +* 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 BaikalAdmin\View\User; + +class Calendars extends \BaikalAdmin\Core\View { +} \ No newline at end of file diff --git a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/View/Users.php b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/View/Users.php new file mode 100755 index 0000000..59ad5f3 --- /dev/null +++ b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/View/Users.php @@ -0,0 +1,30 @@ + +* All rights reserved +* +* http://baikal.codr.fr +* +* 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 BaikalAdmin\View; + +class Users extends \BaikalAdmin\Core\View { +} \ No newline at end of file diff --git a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/WWWRoot/index.php b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/WWWRoot/index.php index 460212e..d3eae50 100755 --- a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/WWWRoot/index.php +++ b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/WWWRoot/index.php @@ -47,7 +47,10 @@ $oPage->setTitle("Baïkal Web Admin"); $oPage->setBaseUrl(PROJECT_URI); # Authentication -if(\BaikalAdmin\Core\Auth::isAuthenticated() === FALSE) { +if( + \BaikalAdmin\Core\Auth::isAuthenticated() === FALSE && + \BaikalAdmin\Core\Auth::authenticate() === FALSE +) { $oPage->zone("navbar")->addBlock(new \BaikalAdmin\Controller\Navigation\Topbar\Anonymous()); $oPage->zone("Payload")->addBlock(new \BaikalAdmin\Controller\Login()); } else { diff --git a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/config.php b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/config.php index 248ad8a..0e390ce 100755 --- a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/config.php +++ b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/config.php @@ -33,5 +33,6 @@ $GLOBALS["ROUTES"] = array( "users/addressbooks" => "\BaikalAdmin\Route\User\AddressBooks", "install" => "\BaikalAdmin\Route\Install", "settings/standard" => "\BaikalAdmin\Route\Settings\Standard", - "settings/system" => "\BaikalAdmin\Route\Settings\System" + "settings/system" => "\BaikalAdmin\Route\Settings\System", + "logout" => "\BaikalAdmin\Route\Logout" ); \ No newline at end of file diff --git a/Specific/db/baikal.sqlite b/Specific/db/baikal.sqlite index 169db6b..92b4dbb 100755 Binary files a/Specific/db/baikal.sqlite and b/Specific/db/baikal.sqlite differ