Merge branch 'develop' into pr/member-phone-number

This commit is contained in:
Kijin Sung 2017-12-01 02:04:09 +09:00
commit 8f64e7c6b9
200 changed files with 2025 additions and 1785 deletions

View file

@ -20,7 +20,7 @@ class installAdminController extends install
function procInstallAdminInstall()
{
$module_name = Context::get('module_name');
if(!$module_name) return new object(-1, 'invalid_request');
if(!$module_name) return $this->setError('invalid_request');
$oInstallController = getController('install');
$oInstallController->installModule($module_name, './modules/'.$module_name);
@ -35,18 +35,21 @@ class installAdminController extends install
{
@set_time_limit(0);
$module_name = Context::get('module_name');
if(!$module_name) return new object(-1, 'invalid_request');
if(!$module_name) return $this->setError('invalid_request');
$oModule = getModule($module_name, 'class');
if(!$oModule)
{
$output = new Object(-1, 'invalid_request');
$output = return $this->setError('invalid_request');
}
Rhymix\Framework\Session::close();
$output = $oModule->moduleUpdate();
Rhymix\Framework\Session::start();
return $output;
if($output instanceof BaseObject && !$output->toBool())
{
return $output;
}
}
function procInstallAdminRemoveFTPInfo()