Mascali
/
raspisms
mirror of https://github.com/RaspbianFrance/raspisms.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use global descartes loader

This commit is contained in:
osaajani 2019-10-29 18:34:37 +01:00
parent d3408e0600
commit 1d69b5dfce
2 changed files with 15 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
console.php
View File

@ -1,39 +1,19 @@
#!/usr/bin/php #!/usr/bin/php
<?php <?php
require_once(__DIR__ . '/descartes/load.php');
############### #####################
# ENVIRONMENT # # RASPISMS SETTINGS #
############### #####################
define('ENVIRONMENT', 'dev'); $bdd = descartes\Model::connect(DATABASE_HOST, DATABASE_NAME, DATABASE_USER, DATABASE_PASSWORD);
define('FROM_WEB', true); $internal_setting = new \controllers\internals\Setting($bdd);
require_once(__DIR__ . '/descartes/load-environment.php');
############## $settings = $internal_setting->all();
# INCLUSIONS #
##############
require_once(PWD . '/descartes/autoload.php');
require_once(PWD . '/vendor/autoload.php');
require_once(PWD . '/descartes/Console.php');
require_once(PWD . '/routes.php');
#########
# MODEL #
#########
#Define raspisms settings
$bdd = Model::connect(DATABASE_HOST, DATABASE_NAME, DATABASE_USER, DATABASE_PASSWORD);
$model_setting = new \models\Setting($bdd);
$settings = $model_setting->all();
foreach ($settings as $setting) foreach ($settings as $setting)
{ {
define('RASPISMS_SETTINGS_' . mb_convert_case($setting['name'], MB_CASE_UPPER), $setting['value']); define('RASPISMS_SETTINGS_' . mb_convert_case($setting['name'], MB_CASE_UPPER), $setting['value']);
} }
########### //Execute command
# ROUTAGE # descartes\Console::execute_command($argv);
###########
//Partie gérant l'appel des controlleurs
$console = new \Console($argv);
$console->executeCommand($console->getCommand());

25
index.php
View File

@ -1,13 +1,5 @@
<?php <?php
############### require_once(__DIR__ . '/descartes/load.php');
# ENVIRONMENT #
###############
require_once(__DIR__ . '/descartes/load-environment.php');
###########
# ROUTING #
###########
require_once(PWD . '/routes.php'); //Include routes
############ ############
# SESSIONS # # SESSIONS #
@ -21,15 +13,10 @@
$_SESSION['csrf'] = str_shuffle(uniqid().uniqid()); $_SESSION['csrf'] = str_shuffle(uniqid().uniqid());
} }
############## #####################
# INCLUDE # # RASPISMS SETTINGS #
############## #####################
//Use autoload $bdd = descartes\Model::connect(DATABASE_HOST, DATABASE_NAME, DATABASE_USER, DATABASE_PASSWORD);
require_once(PWD . '/descartes/autoload.php');
require_once(PWD . '/vendor/autoload.php');
#Define raspisms settings
$bdd = Model::connect(DATABASE_HOST, DATABASE_NAME, DATABASE_USER, DATABASE_PASSWORD);
$internal_setting = new \controllers\internals\Setting($bdd); $internal_setting = new \controllers\internals\Setting($bdd);
$settings = $internal_setting->all(); $settings = $internal_setting->all();
@ -39,4 +26,4 @@
} }
//Routing current query //Routing current query
Router::route(ROUTES, $_SERVER['REQUEST_URI']); descartes\Router::route(ROUTES, $_SERVER['REQUEST_URI']);