From 3fe63903e9979859985b746301aa5188615e9582 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Je=CC=81ro=CC=82me=20Schneider?= Date: Tue, 8 May 2012 00:29:27 +0200 Subject: [PATCH] Working on web admin Former-commit-id: 39159221a57125433feb19360f0526e53a27f670 --- .../BaikalAdmin/Controller/Dashboard.php | 2 +- .../BaikalAdmin/Controller/Login.php | 1 + .../Frameworks/BaikalAdmin/WWWRoot/index.php | 5 +- .../BaikalAdmin/WWWRoot/install/index.php | 5 +- .../0.2.0/Frameworks/Flake/Core/Bootstrap.php | 146 ---------------- .../0.2.0/Frameworks/Flake/Core/Framework.php | 2 +- .../Frameworks/Flake/Core/Requester/Sql.php | 2 +- .../0.2.0/Frameworks/Flake/Framework.php | 156 ++++++++++++++++++ CoreVersions/0.2.0/WWWRoot/cal.php | 5 +- CoreVersions/0.2.0/WWWRoot/card.php | 5 +- CoreVersions/0.2.0/WWWRoot/index.php | 3 +- Specific/db/baikal.sqlite | Bin 14336 -> 14336 bytes 12 files changed, 174 insertions(+), 158 deletions(-) delete mode 100755 CoreVersions/0.2.0/Frameworks/Flake/Core/Bootstrap.php create mode 100755 CoreVersions/0.2.0/Frameworks/Flake/Framework.php diff --git a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Dashboard.php b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Dashboard.php index 5f03791..4758b9a 100755 --- a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Dashboard.php +++ b/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(); } diff --git a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Login.php b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Login.php index e907480..fcae27f 100755 --- a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Login.php +++ b/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( diff --git a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/WWWRoot/index.php b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/WWWRoot/index.php index d3eae50..a552947 100755 --- a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/WWWRoot/index.php +++ b/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(); diff --git a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/WWWRoot/install/index.php b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/WWWRoot/install/index.php index 12c5a81..97d169d 100755 --- a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/WWWRoot/install/index.php +++ b/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(); diff --git a/CoreVersions/0.2.0/Frameworks/Flake/Core/Bootstrap.php b/CoreVersions/0.2.0/Frameworks/Flake/Core/Bootstrap.php deleted file mode 100755 index 4f65cd5..0000000 --- a/CoreVersions/0.2.0/Frameworks/Flake/Core/Bootstrap.php +++ /dev/null @@ -1,146 +0,0 @@ - -* 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); \ No newline at end of file diff --git a/CoreVersions/0.2.0/Frameworks/Flake/Core/Framework.php b/CoreVersions/0.2.0/Frameworks/Flake/Core/Framework.php index 8816fea..c14b0af 100755 --- a/CoreVersions/0.2.0/Frameworks/Flake/Core/Framework.php +++ b/CoreVersions/0.2.0/Frameworks/Flake/Core/Framework.php @@ -26,6 +26,6 @@ namespace Flake\Core; -class Framework extends \Flake\Core\FLObject { +class Framework { } \ No newline at end of file diff --git a/CoreVersions/0.2.0/Frameworks/Flake/Core/Requester/Sql.php b/CoreVersions/0.2.0/Frameworks/Flake/Core/Requester/Sql.php index 62e5ffc..e332547 100755 --- a/CoreVersions/0.2.0/Frameworks/Flake/Core/Requester/Sql.php +++ b/CoreVersions/0.2.0/Frameworks/Flake/Core/Requester/Sql.php @@ -225,7 +225,7 @@ class Sql extends \Flake\Core\FLObject { public function count() { $sSql = $this->getCountQuery(); - + $rSql = $GLOBALS["DB"]->query($sSql); if(($aRs = $rSql->fetch()) !== FALSE) { return intval($aRs["nbitems"]); diff --git a/CoreVersions/0.2.0/Frameworks/Flake/Framework.php b/CoreVersions/0.2.0/Frameworks/Flake/Framework.php new file mode 100755 index 0000000..2dc1585 --- /dev/null +++ b/CoreVersions/0.2.0/Frameworks/Flake/Framework.php @@ -0,0 +1,156 @@ + +* 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); + } +} \ No newline at end of file diff --git a/CoreVersions/0.2.0/WWWRoot/cal.php b/CoreVersions/0.2.0/WWWRoot/cal.php index e6a61d8..2fe8cec 100755 --- a/CoreVersions/0.2.0/WWWRoot/cal.php +++ b/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(); diff --git a/CoreVersions/0.2.0/WWWRoot/card.php b/CoreVersions/0.2.0/WWWRoot/card.php index 3898d68..c3631d7 100755 --- a/CoreVersions/0.2.0/WWWRoot/card.php +++ b/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(); diff --git a/CoreVersions/0.2.0/WWWRoot/index.php b/CoreVersions/0.2.0/WWWRoot/index.php index e1b4b43..62ba432 100755 --- a/CoreVersions/0.2.0/WWWRoot/index.php +++ b/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(); diff --git a/Specific/db/baikal.sqlite b/Specific/db/baikal.sqlite index 92b4dbb62fc691068f0ab990f862743351e43c43..db968cac30072d76bac2868986668c6910123112 100755 GIT binary patch delta 945 zcmbV~F>ljA6vusbM2aQ1Dq?{k6cz@=CFk?q*^U9pi5(PZoscFOkRnhVTZ#&#sv{6x zsH=8?h006EPN+-}74ZcsJ_%od&MaI~2Qh$%Dn04my?cM@{qFs@H?}w4=fJ`KwF)>G zKm8yroC?xssUe<@IS>9TkmRL8LaZp1$C0Xys6 zj8t~-*Su1vVmBQ{?zqjhTHPyY$&2NyZ|r`5Gl-&mc{p6pvw~VIx}GBQS8KF697L97 zDRR{-O)q&(k(+L(gprCNq7dmVj7vNyeyqstno}YM3sl4ci2Pm;5*0IOYDk5YhKMkg zhQ4nqvghuq$x+2e`NSSi+08E%(osa1?UtJVg{FqVkG=En89~TRK zW?&P+J`OcVbb~^J>J)0Gj(JdBrAEqi@60*#C}v!WAP6Ey6L&#&KmKtEycPDeF34~z z?riZj?p;aVEpDw~j1e}{pEj#5v#CiSBaA@8PzBmtEp9ebti z-gWGjJGCRCs+v4nx^6u?IXpR>G_AGlX6r9)D1BUQq{69-G15@-ap@MEXNJPSk23Y6 S2cM327r%;N;n-UKcJmiD;P9US delta 92 zcmV-i0HgnaaDZ@-8v%}y976$)v0$bH2=V{}umey6^09&B0ts9L2LLZM8($5R`UX{# yPzSW51QY}Y0Rn^o0)(-FZUU413=0TJf_VW40EHKm4h?#<1rId>0S2=>5yd857#m>#