gnh1201/reasonableframework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update base.php

Browse Source
This commit is contained in:
Namhyeon Go 2018-06-11 11:50:20 +09:00 committed by GitHub
parent 9d8b3c688c
commit eedf469841
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
system/base.php
View File

@ -34,9 +34,7 @@ if(!function_exists("get_scope")) {
if(!function_exists("register_loaded")) { if(!function_exists("register_loaded")) {
function register_loaded($k, $v) { function register_loaded($k, $v) {
global $scope; global $scope;
if(array_key_exists($k, $scope['loaded'])) { $scope['loaded'][$k][] = $v;
array_push($scope['loaded'][$k], $v);
}
} }
} }
@ -58,8 +56,8 @@ if(!function_exists("renderView")) {
foreach($views as $name2) { foreach($views as $name2) {
$viewfile = './view/' . $name2 . '.php'; $viewfile = './view/' . $name2 . '.php';
if(file_exists($viewfile)) { if(file_exists($viewfile)) {
register_loaded("view", $name2);
$flag = $flag && !include_isolate($viewfile, $data); $flag = $flag && !include_isolate($viewfile, $data);
register_loaded("view", $viewfile);
} }
} }
return !$flag; return !$flag;
@ -74,8 +72,8 @@ if(!function_exists("loadModule")) {
foreach($modules as $name2) { foreach($modules as $name2) {
$systemfile = './system/' . $name2 . '.php'; $systemfile = './system/' . $name2 . '.php';
if(file_exists($systemfile)) { if(file_exists($systemfile)) {
register_loaded("system", $name2);
$flag = $flag && !include_isolate($systemfile); $flag = $flag && !include_isolate($systemfile);
register_loaded("system", $systemfile);
} else { } else {
set_error("Module " . $name . "dose not exists"); set_error("Module " . $name . "dose not exists");
} }
@ -92,8 +90,8 @@ if(!function_exists("loadHelper")) {
foreach($helpers as $name2) { foreach($helpers as $name2) {
$helperfile = './helper/' . $name2 . '.php'; $helperfile = './helper/' . $name2 . '.php';
if(file_exists($helperfile)) { if(file_exists($helperfile)) {
register_loaded("helper", $name2);
$flag = $flag && !include_isolate($helperfile); $flag = $flag && !include_isolate($helperfile);
register_loaded("helper", $helperfile);
} else { } else {
set_error("Helper " . $name . "dose not exists"); set_error("Helper " . $name . "dose not exists");
} }
@ -108,10 +106,10 @@ if(!function_exists("loadRoute")) {
$flag = true; $flag = true;
$routes = explode(";", $name); $routes = explode(";", $name);
foreach($routes as $name2) { foreach($routes as $name2) {
$routefile = './route/' . $name . '.php'; $routefile = './route/' . $name2 . '.php';
if(file_exists($routefile)) { if(file_exists($routefile)) {
register_loaded("route", $name2);
$flag = $flag && !include_isolate($routefile, $data); $flag = $flag && !include_isolate($routefile, $data);
register_loaded("route", $routefile);
} else { } else {
set_error("Route " . $name . "dose not exists"); set_error("Route " . $name . "dose not exists");
} }
@ -126,7 +124,7 @@ if(!function_exists("array_key_empty")) {
if(is_array($array)) { if(is_array($array)) {
if(array_key_exists($key, $array)) { if(array_key_exists($key, $array)) {
$empty = $empty && empty($array[$key]); $empty = $empty && empty($array[$key]);
} }
} }
@ -139,8 +137,8 @@ if(!function_exists("array_key_equals")) {
$equals = false; $equals = false;
if(is_array($array)) { if(is_array($array)) {
if(!array_key_exists($key, $array)) { if(array_key_exists($key, $array)) {
$equals = ($array[$array] == $value); $equals = ($array[$key] == $value);
} }
} }
@ -255,6 +253,13 @@ if(!function_exists("get_property_value")) {
} }
} }
if(!function_exists("get_routes")) {
function get_routes() {
$loaded = get_scope("loaded");
return $loaded['route'];
}
}
$scope = array(); $scope = array();