Skip to content

整合配置类的get和all方法 #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
moling3650 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

整合配置类的get和all方法 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
76716a6
整合配置类的get和all方法
moling3650 Sep 15, 2016
622f3af
conf类的使用变更
moling3650 Sep 15, 2016
4fdbaba
Merge pull request #1 from moling3650/moling3650-patch-1
moling3650 Sep 15, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 15 additions & 32 deletions core/ppphp/conf.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,46 +14,29 @@ class conf
static public $conf = array();

/**
* 加载系统配置,如果之前已经加载过,那么就直接返回
* @param string $name 配置名
* 加载系统配置文件,如果之前已经加载过,那么就直接返回所有配置或其中一个配置
* @param string $file 文件名
* @return mix
* @param string $name 配置名
* @return mixed 找不到配置时返回false，当$name为空时返回文件所有配置，否则只返回$name这配置项
*/
static public function get($name,$file='conf')
static public function get($file='conf', $name=null)
{
if(isset(self::$conf[$file][$name])) {
return self::$conf[$file][$name];
} else {
$conf = CORE.'config/'.$file.'.php';
if(is_file($conf)) {
self::$conf[$file] = include $conf;
return isset(self::$conf[$file][$name])?self::$conf[$file][$name]:false;
} else {
// 判断配置没有缓存的话就导入配置文件并缓存
if (!isset(self::$conf[$file]))
// 判断配置文件是否存在
$conf = CORE.'config/' . $file . '.php';
if (!is_file($conf)) {
return false;
}

self::$conf[$file] = include $conf;
}

}

/**
* 加载系统配置文件(直接加载整个配置文件),如果之前已经加载过,那么就直接返回
* @param string $name 配置名
* @param string $file 文件名
* @return mix
*/
static public function all($file)
{
if(isset(self::$conf[$file])) {
// 如果$name为null则返回所有的设置
if (is_null($name)) {
return self::$conf[$file];
} else {
$conf = CORE.'config/'.$file.'.php';
if(is_file($conf)) {
self::$conf[$file] = include $conf;
return self::$conf[$file];
} else {
return false;
}
}

// 判断配置项是否存在并返回
return isset(self::$conf[$file][$name]) ? self::$conf[$file][$name] : false;
}
}
8 changes: 4 additions & 4 deletions core/ppphp/route.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class route
public $route;
public function __construct()
{
$route = conf::all('route');
$route = conf::get('route');
if(isset($_SERVER['REQUEST_URI'])) {
$pathstr = str_replace($_SERVER['SCRIPT_NAME'],'',$_SERVER['REQUEST_URI']);
//丢掉?以及后面的参数
Expand Down Expand Up @@ -56,8 +56,8 @@ public function __construct()
}
} else {

$this->ctrl = conf::get('DEFAULT_CTRL','route');
$this->action = conf::get('DEFAULT_ACTION','route');
$this->ctrl = conf::get('route', 'DEFAULT_CTRL');
$this->action = conf::get('route', 'DEFAULT_ACTION');
}
}

Expand All @@ -69,4 +69,4 @@ public function urlVar($num,$default = false)
return $default;
}
}
}
}