From f59eec72f0598019fae0427325fb3a60b5e1166a Mon Sep 17 00:00:00 2001 From: devjin Date: Fri, 3 Aug 2012 10:05:40 +0000 Subject: [PATCH] issue 873 retouch. git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@10974 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/member/member.model.php | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/modules/member/member.model.php b/modules/member/member.model.php index 348ec3ce5..7a26c2cac 100644 --- a/modules/member/member.model.php +++ b/modules/member/member.model.php @@ -35,8 +35,7 @@ } // Get terms of user - $agreement_file = _XE_PATH_.'files/member_extra_info/agreement_' . Context::get('lang_type') . '.txt'; - if(is_readable($agreement_file)) $config->agreement = FileHandler::readFile($agreement_file); + $config->agreement = $this->_getAgreement(); if(!$config->webmaster_name) $config->webmaster_name = 'webmaster'; if(!$config->image_name_max_width) $config->image_name_max_width = 90; @@ -57,6 +56,34 @@ return $config; } + function _getAgreement() + { + $agreement_file = _XE_PATH_.'files/member_extra_info/agreement_' . Context::get('lang_type') . '.txt'; + if(is_readable($agreement_file)) + { + return FileHandler::readFile($agreement_file); + } + + $db_info = Context::getDBInfo(); + $agreement_file = _XE_PATH_.'files/member_extra_info/agreement_' . $db_info->lang_type . '.txt'; + if(is_readable($agreement_file)) + { + return FileHandler::readFile($agreement_file); + } + + $lang_selected = Context::loadLangSelected(); + foreach($lang_selected as $key => $val) + { + $agreement_file = _XE_PATH_.'files/member_extra_info/agreement_' . $key . '.txt'; + if(is_readable($agreement_file)) + { + return FileHandler::readFile($agreement_file); + } + } + + return null; + } + /** * @brief Display menus of the member **/