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

Fix uninitialized stdClass in rarely used method

Browse source
This commit is contained in:
BJRambo 2016-05-27 07:57:58 +09:00
parent 3bd25f9538
commit 508b6ed340
24 changed files with 68 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -122,6 +122,7 @@ class importerAdminController extends importer
$total_count = 0;
foreach ($output->data as $val)
{
$args = new stdClass();
$args->user_id = $val->user_id;
$args->member_srl = $val->member_srl;
$tmp = executeQuery ('importer.updateDocumentSyncForCUBRID'.$postFix, $args);
@ -145,6 +146,7 @@ class importerAdminController extends importer
$total_count = 0;
foreach ($output->data as $val)
{
$args = new stdClass();
$args->user_id = $val->user_id;
$args->member_srl = $val->member_srl;
$tmp = executeQuery ('importer.updateCommentSyncForCUBRID'.$postFix, $args);
@ -516,7 +518,7 @@ class importerAdminController extends importer
FileHandler::removeFile($target_file);
if(!$xmlObj) continue;
// List objects
$obj = null;
$obj = new stdClass();
$obj->receiver = base64_decode($xmlObj->message->receiver->body);
$obj->sender = base64_decode($xmlObj->message->sender->body);
$obj->title = base64_decode($xmlObj->message->title->body);
@ -526,25 +528,26 @@ class importerAdminController extends importer
$obj->readed_date = base64_decode($xmlObj->message->readed_date->body);
// Get member_srl of sender/recipient (If not exists, pass)
if(!$obj->sender) continue;
$sender_args = new stdClass();
$sender_args->user_id = $obj->sender;
$sender_output = executeQuery('member.getMemberInfo',$sender_args);
$sender_srl = $sender_output->data->member_srl;
if(!$sender_srl)
{
unset($sender_args);
$sender_args = new stdClass();
$sender_args->email_address = $obj->sender;
$sender_output = executeQuery('member.getMemberInfoByEmailAddress',$sender_args);
$sender_srl = $sender_output->data->member_srl;
}
if(!$sender_srl) continue;
$receiver_args = new stdClass();
$receiver_args->user_id = $obj->receiver;
if(!$obj->receiver) continue;
$receiver_output = executeQuery('member.getMemberInfo',$receiver_args);
$receiver_srl = $receiver_output->data->member_srl;
if(!$receiver_srl)
{
unset($receiver_args);
$receiver_args = new stdClass();
$receiver_args->email_address = $obj->receiver;
$receiver_output = executeQuery('member.getMemberInfoByEmailAddress',$receiver_args);
$receiver_srl = $receiver_output->data->member_srl;
@ -645,6 +648,7 @@ class importerAdminController extends importer
$category_list = $oDocumentModel->getCategoryList($module_srl);
if(count($category_list)) foreach($category_list as $key => $val) $category_titles[$val->title] = $val->category_srl;
$ek_args = new stdClass();
$ek_args->module_srl = $module_srl;
$output = executeQueryArray('document.getDocumentExtraKeys', $ek_args);
if($output->data)
@ -783,7 +787,7 @@ class importerAdminController extends importer
foreach($extra_vars as $key => $val)
{
if(!$val->value) continue;
unset($e_args);
$e_args = new stdClass;
$e_args->module_srl = $module_srl;
$e_args->document_srl = $obj->document_srl;
$e_args->var_idx = $val->var_idx;
@ -793,7 +797,7 @@ class importerAdminController extends importer
// Create a key for extra vars if not exists (except vars for title and content)
if(!preg_match('/^(title|content)_(.+)$/i',$e_args->eid) && !$extra_keys[$e_args->eid])
{
unset($ek_args);
$ek_args = new stdClass();
$ek_args->module_srl = $module_srl;
$ek_args->var_idx = $val->var_idx;
$ek_args->var_name = $val->eid;
@ -962,6 +966,7 @@ class importerAdminController extends importer
else
{
// Get parent comment infomation
$parent_args = new stdClass();
$parent_args->comment_srl = $obj->parent_srl;
$parent_output = executeQuery('comment.getCommentListItem', $parent_args);
// Return if parent comment doesn't exist

2
modules/importer/ttimport.class.php
View file

@ -240,6 +240,7 @@ class ttimport
if($module_name == 'textyle')
{
$args = new stdClass();
$args->document_srl = $obj->document_srl;
$args->module_srl = $obj->module_srl;
$args->logs = serialize(null);
@ -674,6 +675,7 @@ class ttimport
else
{
// Get parent_srl
$parent_args = new stdClass();
$parent_args->comment_srl = $tobj->parent_srl;
$parent_output = executeQuery('comment.getCommentListItem', $parent_args);
// Return if parent comment doesn't exist