" . $exception . "";
}
public static function assertBaikalIsOk() {
diff --git a/CoreVersions/0.2.0/Frameworks/Baikal/Framework.php b/CoreVersions/0.2.0/Frameworks/Baikal/Framework.php
index 5959680..c4a5fad 100755
--- a/CoreVersions/0.2.0/Frameworks/Baikal/Framework.php
+++ b/CoreVersions/0.2.0/Frameworks/Baikal/Framework.php
@@ -30,8 +30,10 @@ class Framework extends \Flake\Core\Framework {
public static function installTool() {
if(defined("BAIKAL_CONTEXT_INSTALL") && BAIKAL_CONTEXT_INSTALL === TRUE) {
+ # Install tool has been launched and we're already on the install page
return;
} else {
+ # Install tool has been launched; redirecting user
$sInstallToolUrl = PROJECT_URI . "admin/install/";
header("Location: " . $sInstallToolUrl);
exit(0);
@@ -79,9 +81,7 @@ class Framework extends \Flake\Core\Framework {
\Baikal\Core\Tools::assertBaikalIsOk();
set_error_handler("\Baikal\Framework::exception_error_handler");
-
- unset($bShouldCheckEnv);
-
+
# SabreDAV Autoloader
require_once(BAIKAL_PATH_SABREDAV . 'autoload.php');
}
@@ -91,7 +91,7 @@ class Framework extends \Flake\Core\Framework {
}
# Mapping PHP errors to exceptions; needed by SabreDAV
- function exception_error_handler($errno, $errstr, $errfile, $errline) {
+ public static function exception_error_handler($errno, $errstr, $errfile, $errline) {
throw new \ErrorException($errstr, 0, $errno, $errfile, $errline);
}
}
\ No newline at end of file
diff --git a/CoreVersions/0.2.0/Frameworks/Baikal/Model/Config/Standard.php b/CoreVersions/0.2.0/Frameworks/Baikal/Model/Config/Standard.php
index 8b91cf5..f1058ff 100755
--- a/CoreVersions/0.2.0/Frameworks/Baikal/Model/Config/Standard.php
+++ b/CoreVersions/0.2.0/Frameworks/Baikal/Model/Config/Standard.php
@@ -32,13 +32,13 @@ class Standard extends \Baikal\Model\Config {
"BAIKAL_TIMEZONE" => array(
"type" => "string",
),
- "BAIKAL_CARD_ENABLED" => array(
+ "BAIKAL_ADMIN_ENABLED" => array(
"type" => "boolean",
),
"BAIKAL_CAL_ENABLED" => array(
"type" => "boolean",
),
- "BAIKAL_ADMIN_ENABLED" => array(
+ "BAIKAL_CARD_ENABLED" => array(
"type" => "boolean",
),
"BAIKAL_ADMIN_PASSWORDHASH" => array(
@@ -69,8 +69,12 @@ class Standard extends \Baikal\Model\Config {
)));
$oMorpho->add(new \Formal\Element\Checkbox(array(
- "prop" => "BAIKAL_CARD_ENABLED",
- "label" => "Enable CardDAV"
+ "prop" => "BAIKAL_ADMIN_ENABLED",
+ "label" => "Enable Web Admin",
+ "popover" => array(
+ "title" => "Warning !",
+ "content" => "If disabled, you'll lose access to this very admin interface !",
+ ),
)));
$oMorpho->add(new \Formal\Element\Checkbox(array(
@@ -79,12 +83,8 @@ class Standard extends \Baikal\Model\Config {
)));
$oMorpho->add(new \Formal\Element\Checkbox(array(
- "prop" => "BAIKAL_ADMIN_ENABLED",
- "label" => "Enable Web Admin",
- "popover" => array(
- "title" => "Warning !",
- "content" => "If disabled, you'll lose access to this very admin interface !",
- ),
+ "prop" => "BAIKAL_CARD_ENABLED",
+ "label" => "Enable CardDAV"
)));
$oMorpho->add(new \Formal\Element\Password(array(
diff --git a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Dashboard.php b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Dashboard.php
index 9a42c37..b21807c 100755
--- a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Dashboard.php
+++ b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Dashboard.php
@@ -32,17 +32,47 @@ class Dashboard extends \Flake\Core\Controller {
}
public function render() {
- $sLinkUsers = \BaikalAdmin\Controller\Users::link();
+ $oView = new \BaikalAdmin\View\Dashboard();
+ $oView->setData("BAIKAL_VERSION", BAIKAL_VERSION);
- $sMessage =<<
-* Nombre de calendriers
-* Nombre d'évènements
-* Version + Mise à jour de baikal
-* Lien vers liste des utilisateurs
-* Lien vers paramétrage
-MESSAGE;
- return $sMessage;
+ # Services status
+ $oView->setData("BAIKAL_CAL_ENABLED", BAIKAL_CAL_ENABLED);
+ $oView->setData("BAIKAL_CARD_ENABLED", BAIKAL_CARD_ENABLED);
+
+ # Statistics: Users
+ $iNbUsers = \Baikal\Model\User::getBaseRequester()->count();
+ $oView->setData("nbusers", $iNbUsers);
+
+ # Statistics: CalDAV
+ $iNbCalendars = \Baikal\Model\Calendar::getBaseRequester()->count();
+ $oView->setData("nbcalendars", $iNbCalendars);
+
+ $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);
+
+ $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 2dc0192..29e33ec 100755
--- a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Install/Initialize.php
+++ b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Install/Initialize.php
@@ -79,7 +79,7 @@ PHP;
}
public function render() {
- $sBigIcon = \BaikalAdmin\Model\Install::bigicon();
+ $sBigIcon = "glyph2x-magic";
$sBaikalVersion = BAIKAL_VERSION;
$sHtml = <<
HTML;
-/* $sHtml .= <<What is this ?
-
- This is the Baïkal Install Tool.
- It's displayed because you just installed or upgraded your Baïkal installation.
- Baïkal requires some maintenance in order to ensure everything works as expected.
-
-HTML;
-*/
return $sHtml;
}
}
\ No newline at end of file
diff --git a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Install/AdminPassword.php b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Login.php
similarity index 52%
rename from CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Install/AdminPassword.php
rename to CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Login.php
index ef2a39a..f0a60c4 100755
--- a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Install/AdminPassword.php
+++ b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Login.php
@@ -24,48 +24,48 @@
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
-namespace BaikalAdmin\Controller\Install;
+namespace BaikalAdmin\Controller;
-class AdminPassword extends \Flake\Core\Controller {
-
- protected $aMessages = array();
- protected $oModel; # \BaikalAdmin\Model\Install
- protected $oForm; # \Formal\Form
-
-/* public function __construct() {
- parent::__construct();
-
- $this->oModel = new \BaikalAdmin\Model\Install();
-
- $this->oForm = $this->oModel->formForThisModelInstance(array(
- "close" => FALSE
- ));
- }
-
- public function execute() {
- if($this->oForm->submitted()) {
- $this->oForm->execute();
- }
- }*/
+class Login extends \Flake\Core\Controller {
public function execute() {
}
-
+
public function render() {
- $sBigIcon = \BaikalAdmin\Model\Install::bigicon();
- $sBaikalVersion = BAIKAL_VERSION;
+ $sActionUrl = \Flake\Util\Tools::getCurrentUrl();
+ $sSubmittedFlagName = "auth";
+ $sLogin = htmlspecialchars(\Flake\Util\Tools::POST("login"));
+ $sPassword = htmlspecialchars(\Flake\Util\Tools::POST("password"));
+ if(trim($sLogin) === "") {
+ $sLogin = "admin";
+ }
+
+ $sForm =<<
+FORM;
+ return $sForm;
}
}
\ 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 17744df..1ab1b08 100755
--- a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Navigation/Topbar.php
+++ b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Navigation/Topbar.php
@@ -73,7 +73,7 @@ class Topbar extends \Flake\Core\Controller {
Baïkal Web Admin
+HTML;
+ return $sHtml;
}
}
\ 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 c6271d1..4c04e69 100755
--- a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Settings/Standard.php
+++ b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Settings/Standard.php
@@ -49,6 +49,12 @@ class Standard extends \Flake\Core\Controller {
}
public function render() {
- return $this->oForm->render();
+
+ $sHeader =<<