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

php7.2호환을 위해 변경한 클래스 Object 를 BaseObject으로 변경

Browse source
This commit is contained in:
BJRambo 2017-11-28 20:01:28 +09:00
parent f4c19a3e0f
commit f3f40f6859
109 changed files with 976 additions and 976 deletions
Download patch file Download diff file Expand all files Collapse all files

8
modules/importer/extract.class.php
View file

@ -124,7 +124,7 @@ class extract
// If local file
if(strncasecmp('http://', $this->filename, 7) !== 0)
{
if(!file_exists($this->filename)) return new Object(-1,'msg_no_xml_file');
if(!file_exists($this->filename)) return new BaseObject(-1,'msg_no_xml_file');
$this->fd = fopen($this->filename,"r");
// If remote file
}
@ -135,7 +135,7 @@ class extract
if(!$url_info['path']) $url_info['path'] = '/';
$this->fd = @fsockopen($url_info['host'], $url_info['port']);
if(!$this->fd) return new Object(-1,'msg_no_xml_file');
if(!$this->fd) return new BaseObject(-1,'msg_no_xml_file');
// If the file name contains Korean, do urlencode(iconv required)
$path = $url_info['path'];
if(preg_match('/[\xEA-\xED][\x80-\xFF]{2}/', $path)&&function_exists('iconv'))
@ -157,7 +157,7 @@ class extract
$buff .= $str = fgets($this->fd, 1024);
if(!trim($str)) break;
}
if(preg_match('/404 Not Found/i',$buff)) return new Object(-1,'msg_no_xml_file');
if(preg_match('/404 Not Found/i',$buff)) return new BaseObject(-1,'msg_no_xml_file');
}
if($this->startTag)
@ -181,7 +181,7 @@ class extract
$this->isFinished = false;
}
return new Object();
return new BaseObject();
}
/**

6
modules/importer/importer.admin.controller.php
View file

@ -292,12 +292,12 @@ class importerAdminController extends importer
$this->unit_count = Context::get('unit_count');
// Check if an index file exists
$index_file = './files/cache/importer/'.$key.'/index';
if(!file_exists($index_file)) return new Object(-1, 'msg_invalid_xml_file');
if(!file_exists($index_file)) return new BaseObject(-1, 'msg_invalid_xml_file');
switch($type)
{
case 'ttxml' :
if(!$target_module) return new Object(-1,'msg_invalid_request');
if(!$target_module) return new BaseObject(-1,'msg_invalid_request');
$oModuleModel = getModel('module');
$columnList = array('module_srl', 'module');
@ -317,7 +317,7 @@ class importerAdminController extends importer
break;
case 'module' :
// Check if the target module exists
if(!$target_module) return new Object(-1,'msg_invalid_request');
if(!$target_module) return new BaseObject(-1,'msg_invalid_request');
$cur = $this->importModule($key, $cur, $index_file, $target_module);
break;
}

4
modules/importer/importer.class.php
View file

@ -16,7 +16,7 @@ class importer extends ModuleObject
*/
function moduleInstall()
{
return new Object();
return new BaseObject();
}
/**
@ -34,7 +34,7 @@ class importer extends ModuleObject
*/
function moduleUpdate()
{
return new Object();
return new BaseObject();
}
/**