fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-05 11:32:12 +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

33
modules/install/install.controller.php
View file

@ -77,26 +77,6 @@ class installController extends install
// Create a db temp config file
if(!$this->makeDBConfigFile()) return new Object(-1, 'msg_install_failed');
if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
{
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'act', 'dispInstallConfigForm');
header('location:'.$returnUrl);
return;
}
}
/**
* @brief division install step... rewrite, time_zone Config temp file create
*/
function procConfigSetting()
{
// Get variables
$config_info = Context::gets('use_rewrite','time_zone');
if($config_info->use_rewrite!='Y') $config_info->use_rewrite = 'N';
// Create a db temp config file
if(!$this->makeEtcConfigFile($config_info)) return new Object(-1, 'msg_install_failed');
if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
{
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'act', 'dispInstallManagerForm');
@ -111,8 +91,19 @@ class installController extends install
function procInstall()
{
// Check if it is already installed
if(Context::isInstalled()) return new Object(-1, 'msg_already_installed');
if(Context::isInstalled())
{
return new Object(-1, 'msg_already_installed');
}
// Save rewrite and time zone settings
$config_info = Context::gets('use_rewrite','time_zone');
if($config_info->use_rewrite!='Y') $config_info->use_rewrite = 'N';
if(!$this->makeEtcConfigFile($config_info))
{
return new Object(-1, 'msg_install_failed');
}
// Assign a temporary administrator when installing
$logged_info = new stdClass();
$logged_info->is_admin = 'Y';