fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-09 03:52:15 +09:00
Code Issues Projects Releases Packages Wiki Activity

Remove remaining references to getDBInfo()

Browse source
This commit is contained in:
Kijin Sung 2016-02-05 15:18:31 +09:00
parent 9895699591
commit f7aad28d2c
12 changed files with 25 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/member/member.admin.model.php
View file

@ -296,10 +296,8 @@ class memberAdminModel extends member
*/
function getMemberAdminIPCheck()
{
$db_info = Context::getDBInfo();
$admin_ip_list = $db_info->admin_ip_list;
$admin_ip_list = config('admin.allow');
if(!$admin_ip_list) return true;
if(!is_array($admin_ip_list)) $admin_ip_list = explode(',',$admin_ip_list);
if(!count($admin_ip_list) || IpFilter::filter($admin_ip_list)) return true;
else return false;
}

6
modules/member/member.model.php
View file

@ -92,8 +92,7 @@ class memberModel extends member
return FileHandler::readFile($agreement_file);
}
$db_info = Context::getDBInfo();
$agreement_file = _XE_PATH_.'files/member_extra_info/agreement_' . $db_info->lang_type . '.txt';
$agreement_file = _XE_PATH_.'files/member_extra_info/agreement_' . config('locale.default_lang') . '.txt';
if(is_readable($agreement_file))
{
return FileHandler::readFile($agreement_file);
@ -295,8 +294,7 @@ class memberModel extends member
$args = new stdClass();
$db_info = Context::getDBInfo ();
if($db_info->master_db['db_type'] == "cubrid")
if(config('db.master.type') == 'cubrid')
{
$args->email_address = strtolower($email_address);
$output = executeQuery('member.getMemberInfoByEmailAddressForCubrid', $args);