forks/baikal
1
0
Fork 0
Code Releases Activity

Now using the composer autoloader.

Browse source 
Former-commit-id: e847ac3e94
This commit is contained in:
Evert Pot 2013-02-09 13:18:57 +00:00
parent bcbaf5f128
commit a53633fd94
7 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Core/Frameworks/Baikal/Framework.php
View file

@ -80,8 +80,6 @@ class Framework extends \Flake\Core\Framework {
set_error_handler("\Baikal\Framework::exception_error_handler");
# SabreDAV Autoloader
require_once(BAIKAL_PATH_SABREDAV . 'autoload.php');
}
}
}

8
Core/Frameworks/Baikal/WWWRoot/cal.php
View file

@ -35,10 +35,10 @@ if(file_exists(getcwd() . "/Core")) {
define("PROJECT_PATH_ROOT", dirname(getcwd()) . "/"); #../
}
# Bootstraping Flake
require_once(PROJECT_PATH_ROOT . "Core/Frameworks/Flake/Framework.php");
\Flake\Framework::bootstrap();
require PROJECT_PATH_ROOT . '/vendor/autoload.php';
# Bootstraping Flake
\Flake\Framework::bootstrap();
# Bootstrapping Baïkal
\Baikal\Framework::bootstrap();
@ -67,4 +67,4 @@ $server->addPlugin(new \Sabre\DAVACL\Plugin());
$server->addPlugin(new \Sabre\CalDAV\Plugin());
# And off we go!
$server->exec();
$server->exec();

5
Core/Frameworks/Baikal/WWWRoot/card.php
View file

@ -35,8 +35,9 @@ if(file_exists(getcwd() . "/Core")) {
define("PROJECT_PATH_ROOT", dirname(getcwd()) . "/"); #../
}
require PROJECT_PATH_ROOT . '/vendor/autoload.php';
# Bootstraping Flake
require_once(PROJECT_PATH_ROOT . "Core/Frameworks/Flake/Framework.php");
\Flake\Framework::bootstrap();
# Bootstrapping Baïkal
@ -67,4 +68,4 @@ $server->addPlugin(new \Sabre\CardDAV\Plugin());
$server->addPlugin(new \Sabre\DAVACL\Plugin());
# And off we go!
$server->exec();
$server->exec();

3
Core/Frameworks/Baikal/WWWRoot/index.php
View file

@ -34,8 +34,9 @@ if(file_exists(getcwd() . "/Core")) {
define("PROJECT_PATH_ROOT", dirname(getcwd()) . "/"); #../
}
require PROJECT_PATH_ROOT . '/vendor/autoload.php';
# Bootstraping Flake
require_once(PROJECT_PATH_ROOT . "Core/Frameworks/Flake/Framework.php");
\Flake\Framework::bootstrap();
# Bootstrapping Baïkal

5
Core/Frameworks/BaikalAdmin/WWWRoot/index.php
View file

@ -31,7 +31,7 @@ define("BAIKAL_CONTEXT", TRUE);
define("BAIKAL_CONTEXT_ADMIN", TRUE);
define("PROJECT_CONTEXT_BASEURI", "/admin/");
if(file_exists(dirname(getcwd()) . "/Core")) {
if(file_exists(getcwd(). "/Core")) {
# Flat FTP mode
define("PROJECT_PATH_ROOT", dirname(getcwd()) . "/"); #../
} else {
@ -39,8 +39,9 @@ if(file_exists(dirname(getcwd()) . "/Core")) {
define("PROJECT_PATH_ROOT", dirname(dirname(getcwd())) . "/"); #../../
}
require PROJECT_PATH_ROOT . '/vendor/autoload.php';
# Bootstraping Flake
require_once(PROJECT_PATH_ROOT . "Core/Frameworks/Flake/Framework.php"); # ../../
\Flake\Framework::bootstrap();
# Bootstrap BaikalAdmin

4
Core/Frameworks/BaikalAdmin/WWWRoot/install/index.php
View file

@ -40,7 +40,7 @@ if(file_exists(dirname(dirname(getcwd())) . "/Core")) {
}
# Bootstraping Flake
require_once(PROJECT_PATH_ROOT . "Core/Frameworks/Flake/Framework.php");
require PROJECT_PATH_ROOT . "vendor/autoload.php";
\Flake\Framework::bootstrap();
# Bootstrap BaikalAdmin
@ -74,4 +74,4 @@ if(!defined("BAIKAL_CONFIGURED_VERSION")) {
}
# Render the page
echo $oPage->render();
echo $oPage->render();

4
composer.json
View file

@ -18,7 +18,9 @@
},
"autoload": {
"psr-0" : {
"Baikal" : "Core/Frameworks/"
"Baikal" : "Core/Frameworks/",
"Flake" : "Core/Frameworks/",
"Formal" : "Core/Frameworks/"
}
},
"support" : {