diff --git a/modules/member/conf/module.xml b/modules/member/conf/module.xml index b106fbff7..738944c88 100644 --- a/modules/member/conf/module.xml +++ b/modules/member/conf/module.xml @@ -73,7 +73,7 @@ - + diff --git a/modules/member/member.admin.controller.php b/modules/member/member.admin.controller.php index bce143fdf..3389b6676 100644 --- a/modules/member/member.admin.controller.php +++ b/modules/member/member.admin.controller.php @@ -238,7 +238,6 @@ function _createSignupRuleset($signupForm, $agreement = null){ $xml_file = './files/ruleset/insertMember.xml'; - $admin_xml_file = './files/ruleset/insertAdmintMember.xml'; $buff = '' .'' .'' @@ -249,7 +248,7 @@ $fields = array(); if ($agreement){ - $fields[] = ''; + $fields[] = ''; } foreach($signupForm as $formInfo){ if ($formInfo->required || $formInfo->mustRequired){ @@ -259,12 +258,14 @@ $fields[] = ''; $fields[] = ''; }else if($formInfo->name == 'find_account_question'){ - $fields[100] = ''; - $fields[101] = ''; + $fields[] = ''; + $fields[] = ''; }else if($formInfo->name == 'email_address'){ $fields[] = sprintf('', $formInfo->name); }else if($formInfo->name == 'user_id'){ $fields[] = sprintf('', $formInfo->name); + }else if(strpos($formInfo->name, 'image') !== false){ + $fields[] = sprintf('', $formInfo->name, $formInfo->name); }else{ $fields[] = sprintf('', $formInfo->name); } @@ -275,21 +276,9 @@ FileHandler::writeFile($xml_file, $xml_buff); unset($xml_buff); - $adminFields = $fields; - $adminFields[100] = ''; - $adminFields[101] = ''; - - $xml_buff = sprintf($buff, implode('', $adminFields)); - FileHandler::writeFile($admin_xml_file, $xml_buff); - unset($xml_buff); - $validator = new Validator($xml_file); $validator->setCacheDir('files/cache'); $validator->getJsPath(); - - $adminValidator = new Validator($admin_xml_file); - $adminValidator->setCacheDir('files/cache'); - $adminValidator->getJsPath(); } function _createLoginRuleset($identifier){ diff --git a/modules/member/member.admin.view.php b/modules/member/member.admin.view.php index 9aee2d108..920f15747 100644 --- a/modules/member/member.admin.view.php +++ b/modules/member/member.admin.view.php @@ -222,7 +222,8 @@ $functionName = 'doDeleteImageMark'; } if($target->src){ - $inputTag = sprintf('

%s

' + $inputTag = sprintf('

%s

' + ,$formInfo->name ,$formInfo->name.'tag' ,$target->src ,$formInfo->title @@ -230,7 +231,8 @@ ,$memberInfo['member_srl'] ,$lang->cmd_delete); } - $inputTag .= sprintf('

%s : %dpx, %s : %dpx

' + $inputTag .= sprintf('

%s : %dpx, %s : %dpx

' + ,$formInfo->name ,$formInfo->name ,$formInfo->name ,$lang->{$formInfo->name.'_max_width'} diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php index 04f62fdf6..024a40d2d 100644 --- a/modules/member/member.controller.php +++ b/modules/member/member.controller.php @@ -1995,6 +1995,7 @@ $pointModuleConfig = $oModuleModel->getModuleConfig('point'); $pointGroup = $pointModuleConfig->point_group; + $levelGroup = array(); if(is_array($pointGroup) && count($pointGroup)>0) { $levelGroup = array_flip($pointGroup); diff --git a/modules/member/tpl/insert_member.html b/modules/member/tpl/insert_member.html index 81d03d177..4fe8dd779 100644 --- a/modules/member/tpl/insert_member.html +++ b/modules/member/tpl/insert_member.html @@ -9,7 +9,7 @@

{$XE_VALIDATOR_MESSAGE}

-
+