Skip to content

Commit dc24620

Browse files
committed
Updated Handler
1 parent 79e2de7 commit dc24620

File tree

2 files changed

+47
-15
lines changed

2 files changed

+47
-15
lines changed

src/Core/Cruzer.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -314,11 +314,11 @@ function __css( $links, $defer = false, $version = false ){
314314

315315
if( !function_exists('_url')){
316316
function _url( $url, $absolute = true, array $options = array() ){
317-
if( $absolute === true && SITE_UNDER_DIR === false){
317+
if( $absolute === true && APP_UNDER_DIR === false){
318318
return $url;
319319
}
320320

321-
return SITE_URL.$url;
321+
return APP_URL.$url;
322322
}
323323
}
324324

src/Core/Handler.php

Lines changed: 45 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,55 @@
1313
class Handler {
1414
protected $debugbar;
1515

16-
public function serve( $routeInfo ) {
17-
list( $controller, $action ) = explode('@', $routeInfo[1]);
18-
$params = $routeInfo[2];
19-
$controllerStr = "\\".APP_DIR."\\".CONTROLLER_DIR."\\".$controller;
20-
$controllerObj = new $controllerStr();
21-
$controllerObj->$action($params);
16+
public function initilize( ) {
17+
//get dotenv
18+
$dotenv = new \Dotenv\Dotenv(ROOT_DIR);
19+
$dotenv->load();
20+
21+
date_default_timezone_set( env('APP_TIMEZONE', 'Asia/Calcutta'));
22+
define('ERROR_LEVEL', env('APP_ENV', 'production'));
23+
define('DEBUG_ERROR', env('APP_DEBUG', 'On'));
24+
25+
switch (ERROR_LEVEL) {
26+
case 'development':
27+
ini_set('display_startup_errors',1);
28+
ini_set('display_errors', DEBUG_ERROR);
29+
error_reporting(E_ALL);
30+
break;
31+
case 'testing' : error_reporting( E_ALL ^ E_NOTICE );
32+
ini_set('display_errors', DEBUG_ERROR); break;
33+
case 'production' : ini_set('display_errors', DEBUG_ERROR); break;
34+
default : error_reporting( E_ALL );
35+
ini_set('display_errors', DEBUG_ERROR); break;
36+
}
37+
38+
if(!defined('DS')) define('DS', DIRECTORY_SEPARATOR);
39+
define('APP_DIR', env('APP_DIR','App'));
40+
define('APP_URL', env('APP_URL'));
41+
define('APP_UNDER_DIR', env('APP_UNDER_DIR'));
42+
define('APP_TITLE', env('APP_NAME'));
43+
define('VIEW_DIR', env('VIEW_DIR','Views'));
44+
define('CONTROLLER_DIR', env('CONTROLLER_DIR','Controllers'));
45+
define('UPLOAD_DIR', env('UPLOAD_DIR'));
46+
define('THEME_DIR', env('THEME_DIR'));
47+
define('THEME_PATH', APP_URL.APP_DIR.DS.THEME_DIR.DS);
48+
define('MODULE_DIR', env('MODULE_DIR'));
49+
define('META_DESCRIPTION', 'Cruzer Framework');
50+
define('META_KEYWORDS', 'Cruzer Framework');
51+
define('COPYRIGHT', env('APP_NAME'));
52+
define('COPYRIGHT_URL', 'https://www.cruzersoftwares.com');
53+
define('ADMIN_DIR', env('ADMIN_DIR'));
54+
define('ADMIN_PATH', APP_URL.DS.ADMIN_DIR.DS);
55+
define('ADMIN_LOGIN_REDIRECT', ADMIN_PATH.'dashboard');
56+
define('ADMIN_LOGOUT_REDIRECT', ADMIN_PATH.'auth');
57+
require_once APP_DIR.DS."Config".DS."app.php";
2258
}
2359

24-
public function initilize( ) {
60+
public function enableDebuger( ) {
2561
//include tracy
2662
Debugger::enable(Debugger::DETECT, LOG_DIR);
2763
Debugger::$strictMode = true;
28-
64+
$this->getDebuger();
2965
// Debugger::$logSeverity = E_NOTICE | E_WARNING;
3066
// Debugger::$email = 'admin@example.com';
3167

@@ -55,13 +91,9 @@ public function initilize( ) {
5591
// $logger->error('Bar');
5692
// $logger->info('My logger is now ready');
5793
// $logger->info('Adding a new user', array('username' => 'Seldaek'));
58-
59-
//get dotenv
60-
$dotenv = new \Dotenv\Dotenv(DIR);
61-
$dotenv->load();
6294
}
6395

64-
public function enableDebuger(){
96+
public function getDebuger(){
6597
return $this->debugbar = new StandardDebugBar();
6698
}
6799

0 commit comments

Comments
 (0)