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

Merge time zone setup page with admin user setup page

Browse source
This commit is contained in:
Kijin Sung 2016-01-06 11:14:50 +09:00
parent d7f154f3e0
commit 2cdcfd13cf
8 changed files with 35 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

26
modules/install/install.view.php
View file

@ -159,19 +159,25 @@ class installView extends install
/**
* @brief Display a screen to enter DB and administrator's information
*/
function dispInstallConfigForm()
function dispInstallManagerForm()
{
// Display check_env if not installable
if(!$this->install_enable) return $this->dispInstallCheckEnv();
if(!$this->install_enable)
{
return $this->dispInstallCheckEnv();
}
include _XE_PATH_.'files/config/tmpDB.config.php';
Context::set('use_rewrite', $_SESSION['use_rewrite']);
Context::set('time_zone', $GLOBALS['time_zone']);
Context::set('db_type', $db_info->db_type);
$this->setTemplateFile('config_form');
$this->setTemplateFile('admin_form');
}
/**
* @brief Check whether this server supports mod_rewrite
*/
function useRewriteModule()
{
if(function_exists('apache_get_modules') && in_array('mod_rewrite',apache_get_modules()))
@ -186,20 +192,6 @@ class installView extends install
return (strpos($output->body, '<?xml') !== 0);
}
/**
* @brief Display a screen to enter DB and administrator's information
*/
function dispInstallManagerForm()
{
// Display check_env if not installable
if(!$this->install_enable)
{
return $this->dispInstallCheckEnv();
}
$this->setTemplateFile('admin_form');
}
}
/* End of file install.view.php */
/* Location: ./modules/install/install.view.php */