Working on web admin

CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Dashboard.php

@@ -55,7 +55,7 @@ class Dashboard extends \Flake\Core\Controller {
 		$oView->setData("nbbooks", $iNbBooks);
 		
 		$iNbContacts = \Baikal\Model\AddressBook\Contact::getBaseRequester()->count();
-		$oView->setData("nbcontacts", $iNbEvents);
+		$oView->setData("nbcontacts", $iNbContacts);
 		
 		return $oView->render();
 	}

CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Login.php

@@ -34,6 +34,7 @@ class Login extends \Flake\Core\Controller {
 	public function render() {
 		$sActionUrl = \Flake\Util\Tools::getCurrentUrl();
 		$sSubmittedFlagName = "auth";
+		$sMessage = "";
 		
 		if(self::isSubmitted() && !\BaikalAdmin\Core\Auth::isAuthenticated()) {
 			$sMessage = \Formal\Core\Message::error(

CoreVersions/0.2.0/Frameworks/BaikalAdmin/WWWRoot/index.php

@@ -31,8 +31,9 @@ define("PROJECT_CONTEXT_BASEURI", "/admin/");
 define("BAIKAL_CONTEXT", TRUE);
 define("BAIKAL_CONTEXT_ADMIN", TRUE);
 
-# Bootstrap Flake
-require_once(dirname(dirname(dirname(__FILE__))) . "/Flake/Core/Bootstrap.php");	# ../../
+# Bootstraping Flake
+require_once(dirname(dirname(dirname(__FILE__))) . "/Flake/Framework.php");	# ../../
+\Flake\Framework::bootstrap();
 
 # Bootstrap BaikalAdmin
 \BaikalAdmin\Framework::bootstrap();

CoreVersions/0.2.0/Frameworks/BaikalAdmin/WWWRoot/install/index.php

@@ -31,8 +31,9 @@ define("PROJECT_CONTEXT_BASEURI", "/admin/install/");
 define("BAIKAL_CONTEXT", TRUE);
 define("BAIKAL_CONTEXT_INSTALL", TRUE);
 
-# Bootstrap Flake
-require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/Flake/Core/Bootstrap.php");	# ../../../
+# Bootstraping Flake
+require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/Flake/Framework.php");	# ../../../
+\Flake\Framework::bootstrap();
 
 # Bootstrap BaikalAdmin
 \BaikalAdmin\Framework::bootstrap();

CoreVersions/0.2.0/Frameworks/Flake/Core/Bootstrap.php

@@ -1,146 +0,0 @@
-<?php
-/***************************************************************
-*  Copyright notice
-*
-*  (c) 2012 Jérôme Schneider <mail@jeromeschneider.fr>
-*  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!
-***************************************************************/
-
-# Asserting PHP 5.3.0+
-if(version_compare(PHP_VERSION, '5.3.0', '<')) {
-	die('Flake Fatal Error: Flake requires PHP 5.3.0+ to run properly. Your version is: ' . PHP_VERSION . '.');
-}
-
-# Define absolute server path to Flake Framework
-define("FLAKE_PATH_ROOT", dirname(dirname(__FILE__)) . "/");	# ../
-
-if(!defined('LF')) {
-	define('LF', chr(10));
-}
-
-if(!defined('CR')) {
-	define('CR', chr(13));
-}
-
-if(array_key_exists("SERVER_NAME", $_SERVER) && $_SERVER["SERVER_NAME"] === "mongoose") {
-	define("MONGOOSE_SERVER", TRUE);
-} else {
-	define("MONGOOSE_SERVER", FALSE);
-}
-
-# Display errors messages, except notices
-#ini_set("display_errors", 1);
-#ini_set("error_reporting", E_ALL & ~E_NOTICE);
-
-function rmBeginSlash($sString) {
-	if(substr($sString, 0, 1) === "/") {
-		$sString = substr($sString, 1);
-	}
-	
-	return $sString;
-}
-
-function rmEndSlash($sString) {
-	if(substr($sString, -1) === "/") {
-		$sString = substr($sString, 0, -1);
-	}
-	
-	return $sString;
-}
-
-function appendSlash($sString) {
-	if(substr($sString, -1) !== "/") {
-		$sString .= "/";
-	}
-	
-	return $sString;
-}
-
-function prependSlash($sString) {
-	if(substr($sString, 0, 1) !== "/") {
-		$sString = "/" . $sString;
-	}
-	
-	return $sString;
-}
-if(!function_exists("debug")) {
-	function debug($mVar, $sHeader=0) {
-		\Flake\Util\Tools::debug($mVar, $sHeader);
-	}
-}
-
-#################################################################################################
-
-# determine Flake install root path
-# not using realpath here to avoid symlinks resolution
-
-define("PROJECT_PATH_ROOT", dirname(dirname(dirname(dirname(dirname(dirname(__FILE__)))))) . "/");	# ../../../../../
-define("PROJECT_PATH_CORE", PROJECT_PATH_ROOT . "Core/");
-define("PROJECT_PATH_SPECIFIC", PROJECT_PATH_ROOT . "Specific/");
-define("PROJECT_PATH_FRAMEWORKS", PROJECT_PATH_CORE . "Frameworks/");
-define("PROJECT_PATH_WWWROOT", PROJECT_PATH_CORE . "WWWRoot/");
-
-# Define path to Baïkal SQLite file
-define("PROJECT_SQLITE_FILE", PROJECT_PATH_SPECIFIC . "db/baikal.sqlite");
-
-define("PROJECT_SAFEHASH_SALT", "une-clef-super-secrete");
-
-require_once(PROJECT_PATH_CORE . "Distrib.php");
-
-# Determine PROJECT_URI
-$sScript = substr($_SERVER["SCRIPT_FILENAME"], strlen($_SERVER["DOCUMENT_ROOT"]));
-$sDirName = appendSlash(dirname($sScript));
-$sBaseUrl = appendSlash(substr($sDirName, 0, -1 * strlen(PROJECT_CONTEXT_BASEURI)));
-$aParts = explode("/", $_SERVER["SERVER_PROTOCOL"]);
-$sProtocol = strtolower(array_shift($aParts));
-define("PROJECT_BASEURI", $sBaseUrl);
-define("PROJECT_URI", $sProtocol . "://" . rmEndSlash($_SERVER["HTTP_HOST"]) . $sBaseUrl);
-unset($sScript); unset($sDirName); unset($sBaseUrl); unset($sProtocol); unset($aParts);
-
-#################################################################################################
-
-require_once(FLAKE_PATH_ROOT . 'Core/ClassLoader.php');
-\Flake\Core\ClassLoader::register();
-
-# Include Flake Framework config
-require_once(FLAKE_PATH_ROOT . "config.php");
-
-# Determine Router class
-$GLOBALS["ROUTER"] = \Flake\Util\Tools::router();
-
-if(!\Flake\Util\Tools::isCliPhp()) {
-	ini_set("html_errors", TRUE);
-	session_start();
-}
-
-setlocale(LC_ALL, FLAKE_LOCALE);
-date_default_timezone_set(FLAKE_TIMEZONE);
-
-if(defined("PROJECT_SQLITE_FILE") && file_exists(PROJECT_SQLITE_FILE) && is_readable(PROJECT_SQLITE_FILE) && !isset($GLOBALS["DB"])) {
-	$GLOBALS["DB"] = new \Flake\Core\Database\Sqlite(PROJECT_SQLITE_FILE);
-}
-
-$GLOBALS["TEMPLATESTACK"] = array();
-
-$aUrlInfo = parse_url(PROJECT_URI);
-define("FLAKE_DOMAIN", $_SERVER["HTTP_HOST"]);
-define("FLAKE_URIPATH", \Flake\Util\Tools::stripBeginSlash($aUrlInfo["path"]));
-unset($aUrlInfo);

CoreVersions/0.2.0/Frameworks/Flake/Core/Framework.php

@@ -26,6 +26,6 @@
 
 namespace Flake\Core;
 
-class Framework extends \Flake\Core\FLObject {
+class Framework {
 	
 }

CoreVersions/0.2.0/Frameworks/Flake/Framework.php

@@ -0,0 +1,156 @@
+<?php
+/***************************************************************
+*  Copyright notice
+*
+*  (c) 2012 Jérôme Schneider <mail@jeromeschneider.fr>
+*  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 Flake;
+require_once(dirname(__FILE__) . "/Core/Framework.php");	# Manual require as Classloader not included yet
+
+	
+if(!function_exists("debug")) {
+	function debug($mVar, $sHeader=0) {
+		\Flake\Util\Tools::debug($mVar, $sHeader);
+	}
+}
+
+class Framework extends \Flake\Core\Framework {
+	
+	function rmBeginSlash($sString) {
+		if(substr($sString, 0, 1) === "/") {
+			$sString = substr($sString, 1);
+		}
+
+		return $sString;
+	}
+
+	function rmEndSlash($sString) {
+		if(substr($sString, -1) === "/") {
+			$sString = substr($sString, 0, -1);
+		}
+
+		return $sString;
+	}
+
+	function appendSlash($sString) {
+		if(substr($sString, -1) !== "/") {
+			$sString .= "/";
+		}
+
+		return $sString;
+	}
+
+	function prependSlash($sString) {
+		if(substr($sString, 0, 1) !== "/") {
+			$sString = "/" . $sString;
+		}
+
+		return $sString;
+	}
+	
+	public static function bootstrap() {
+		# Asserting PHP 5.3.0+
+		if(version_compare(PHP_VERSION, '5.3.0', '<')) {
+			die('Flake Fatal Error: Flake requires PHP 5.3.0+ to run properly. Your version is: ' . PHP_VERSION . '.');
+		}
+
+		# Define absolute server path to Flake Framework
+		define("FLAKE_PATH_ROOT", dirname(__FILE__) . "/");	# ./
+
+		if(!defined('LF')) {
+			define('LF', chr(10));
+		}
+
+		if(!defined('CR')) {
+			define('CR', chr(13));
+		}
+
+		if(array_key_exists("SERVER_NAME", $_SERVER) && $_SERVER["SERVER_NAME"] === "mongoose") {
+			define("MONGOOSE_SERVER", TRUE);
+		} else {
+			define("MONGOOSE_SERVER", FALSE);
+		}
+
+		# Display errors messages, except notices
+		#ini_set("display_errors", 1);
+		#ini_set("error_reporting", E_ALL & ~E_NOTICE);
+
+		#################################################################################################
+
+		# determine Flake install root path
+		# not using realpath here to avoid symlinks resolution
+
+		define("PROJECT_PATH_ROOT", dirname(dirname(dirname(dirname(dirname(__FILE__))))) . "/");	# ../../../../../
+		define("PROJECT_PATH_CORE", PROJECT_PATH_ROOT . "Core/");
+		define("PROJECT_PATH_SPECIFIC", PROJECT_PATH_ROOT . "Specific/");
+		define("PROJECT_PATH_FRAMEWORKS", PROJECT_PATH_CORE . "Frameworks/");
+		define("PROJECT_PATH_WWWROOT", PROJECT_PATH_CORE . "WWWRoot/");
+
+		# Define path to Baïkal SQLite file
+		define("PROJECT_SQLITE_FILE", PROJECT_PATH_SPECIFIC . "db/baikal.sqlite");
+
+		define("PROJECT_SAFEHASH_SALT", "une-clef-super-secrete");
+
+		require_once(PROJECT_PATH_CORE . "Distrib.php");
+
+		# Determine PROJECT_URI
+		$sScript = substr($_SERVER["SCRIPT_FILENAME"], strlen($_SERVER["DOCUMENT_ROOT"]));
+		$sDirName = self::appendSlash(dirname($sScript));
+		$sBaseUrl = self::appendSlash(substr($sDirName, 0, -1 * strlen(PROJECT_CONTEXT_BASEURI)));
+		$aParts = explode("/", $_SERVER["SERVER_PROTOCOL"]);
+		$sProtocol = strtolower(array_shift($aParts));
+		define("PROJECT_BASEURI", $sBaseUrl);
+		define("PROJECT_URI", $sProtocol . "://" . self::rmEndSlash($_SERVER["HTTP_HOST"]) . $sBaseUrl);
+		unset($sScript); unset($sDirName); unset($sBaseUrl); unset($sProtocol); unset($aParts);
+
+		#################################################################################################
+
+		require_once(FLAKE_PATH_ROOT . 'Core/ClassLoader.php');
+		\Flake\Core\ClassLoader::register();
+
+		# Include Flake Framework config
+		require_once(FLAKE_PATH_ROOT . "config.php");
+
+		# Determine Router class
+		$GLOBALS["ROUTER"] = \Flake\Util\Tools::router();
+
+		if(!\Flake\Util\Tools::isCliPhp()) {
+			ini_set("html_errors", TRUE);
+			session_start();
+		}
+
+		setlocale(LC_ALL, FLAKE_LOCALE);
+		date_default_timezone_set(FLAKE_TIMEZONE);
+
+		if(defined("PROJECT_SQLITE_FILE") && file_exists(PROJECT_SQLITE_FILE) && is_readable(PROJECT_SQLITE_FILE) && !isset($GLOBALS["DB"])) {
+			$GLOBALS["DB"] = new \Flake\Core\Database\Sqlite(PROJECT_SQLITE_FILE);
+		}
+
+		$GLOBALS["TEMPLATESTACK"] = array();
+
+		$aUrlInfo = parse_url(PROJECT_URI);
+		define("FLAKE_DOMAIN", $_SERVER["HTTP_HOST"]);
+		define("FLAKE_URIPATH", \Flake\Util\Tools::stripBeginSlash($aUrlInfo["path"]));
+		unset($aUrlInfo);
+	}
+}

CoreVersions/0.2.0/WWWRoot/cal.php

@@ -27,8 +27,9 @@
 define("BAIKAL_CONTEXT", TRUE);
 define("PROJECT_CONTEXT_BASEURI", "/");
 
-# Bootstrapping Flake
-require_once(dirname(dirname(__FILE__)) . "/Frameworks/Flake/Core/Bootstrap.php");
+# Bootstraping Flake
+require_once(dirname(dirname(__FILE__)) . "/Frameworks/Flake/Framework.php");
+\Flake\Framework::bootstrap();
 
 # Bootstrapping Baïkal
 \Baikal\Framework::bootstrap();

CoreVersions/0.2.0/WWWRoot/card.php

@@ -27,8 +27,9 @@
 define("BAIKAL_CONTEXT", TRUE);
 define("PROJECT_CONTEXT_BASEURI", "/");
 
-# Bootstrapping Flake
-require_once(dirname(dirname(__FILE__)) . "/Frameworks/Flake/Core/Bootstrap.php");
+# Bootstraping Flake
+require_once(dirname(dirname(__FILE__)) . "/Frameworks/Flake/Framework.php");
+\Flake\Framework::bootstrap();
 
 # Bootstrapping Baïkal
 \Baikal\Framework::bootstrap();

CoreVersions/0.2.0/WWWRoot/index.php

@@ -27,7 +27,8 @@ define("BAIKAL_CONTEXT", TRUE);
 define("PROJECT_CONTEXT_BASEURI", "/");
 
 # Bootstraping Flake
-require_once(dirname(dirname(__FILE__)) . "/Frameworks/Flake/Core/Bootstrap.php");
+require_once(dirname(dirname(__FILE__)) . "/Frameworks/Flake/Framework.php");
+\Flake\Framework::bootstrap();
 
 # Bootstrapping Baïkal
 \Baikal\Framework::bootstrap();