fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-26 13:52:24 +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

7
modules/admin/admin.admin.model.php
View file

@ -401,7 +401,6 @@ class adminAdminModel extends admin
, 'widgetstyle' => array(),
);
$info = array();
$db_info = Context::getDBInfo();
$info['type'] = ($type != 'INSTALL' ? 'WORKING' : 'INSTALL');
$info['location'] = _XE_LOCATION_;
@ -412,9 +411,9 @@ class adminAdminModel extends admin
$info['php'] = phpversion();
$info['db_type'] = Context::getDBType();
$info['use_rewrite'] = $db_info->use_rewrite;
$info['use_db_session'] = $db_info->use_db_session == 'Y' ? 'Y' : 'N';
$info['use_ssl'] = $db_info->use_ssl;
$info['use_rewrite'] = config('use_rewrite') ? 'Y' : 'N';
$info['use_db_session'] = config('session.use_db') ? 'Y' : 'N';
$info['use_ssl'] = config('url.ssl') ?: 'none';
$info['phpext'] = '';
foreach(get_loaded_extensions() as $ext)

17
modules/admin/admin.admin.view.php
View file

@ -26,17 +26,7 @@ class adminAdminView extends admin
function __construct()
{
$db_info = Context::getDBInfo();
if(strpos($db_info->default_url, 'xn--') !== FALSE)
{
$xe_default_url = Context::decodeIdna($db_info->default_url);
}
else
{
$xe_default_url = $db_info->default_url;
}
Context::set('xe_default_url', $xe_default_url);
Context::set('xe_default_url', Context::getDefaultUrl());
}
/**
@ -238,9 +228,6 @@ class adminAdminView extends admin
*/
function dispAdminIndex()
{
$db_info = Context::getDBInfo();
Context::set('db_info',$db_info);
// Get statistics
$args = new stdClass();
$args->date = date("Ymd000000", $_SERVER['REQUEST_TIME'] - 60 * 60 * 24);
@ -410,7 +397,7 @@ class adminAdminView extends admin
Context::set('selected_timezone', Rhymix\Framework\Config::get('locale.default_timezone'));
// Mobile view
Context::set('use_mobile_view', $db_info->use_mobile_view == 'Y' ? 'Y' : 'N');
Context::set('use_mobile_view', config('use_mobile_view') ? 'Y' : 'N');
// Favicon and mobicon
$oAdminModel = getAdminModel('admin');