mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-04-30 07:42:11 +09:00
Merge branch 'release/1.7.8' into develop
Conflicts: classes/context/Context.class.php config/config.inc.php
This commit is contained in:
bnu
commit
4506ea440e
50 changed files with 4086 additions and 126 deletions
|
|
@ -850,6 +850,20 @@
|
|||
<value xml:lang="tr"><![CDATA[Son Giriş Tarihi (basit)]]></value>
|
||||
<value xml:lang="vi"><![CDATA[Đăng nhập ít nhất]]></value>
|
||||
</item>
|
||||
<item name="birthday">
|
||||
<value xml:lang="ko"><![CDATA[생일]]></value>
|
||||
<value xml:lang="en"><![CDATA[Birthday]]></value>
|
||||
<value xml:lang="jp"><![CDATA[誕生日]]></value>
|
||||
<value xml:lang="zh-CN"><![CDATA[生日]]></value>
|
||||
<value xml:lang="zh-TW"><![CDATA[生日]]></value>
|
||||
<value xml:lang="fr"><![CDATA[Anniversaire]]></value>
|
||||
<value xml:lang="de"><![CDATA[Geburtstag]]></value>
|
||||
<value xml:lang="ru"><![CDATA[Дата рождения]]></value>
|
||||
<value xml:lang="es"><![CDATA[Fecha de Nacimiento]]></value>
|
||||
<value xml:lang="tr"><![CDATA[Doğum günü]]></value>
|
||||
<value xml:lang="vi"><![CDATA[Sinh nhật]]></value>
|
||||
<value xml:lang="mn"><![CDATA[Төрсөн өдөр]]></value>
|
||||
</item>
|
||||
<item name="extra_vars">
|
||||
<value xml:lang="ko"><![CDATA[사용자 정의]]></value>
|
||||
<value xml:lang="en"><![CDATA[User Defined]]></value>
|
||||
|
|
|
|||
|
|
@ -98,6 +98,9 @@ class memberAdminModel extends member
|
|||
case 'last_login_less' :
|
||||
$args->s_last_login_less = substr(preg_replace("/[^0-9]/","",$search_keyword) . '00000000000000',0,14);
|
||||
break;
|
||||
case 'birthday' :
|
||||
$args->s_birthday = preg_replace("/[^0-9]/","",$search_keyword);
|
||||
break;
|
||||
case 'extra_vars' :
|
||||
$args->s_extra_vars = $search_keyword;
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -716,18 +716,29 @@ class memberController extends member
|
|||
// Get a target path to save
|
||||
$target_path = sprintf('files/member_extra_info/profile_image/%s', getNumberingPath($member_srl));
|
||||
FileHandler::makeDir($target_path);
|
||||
|
||||
// Get file information
|
||||
list($width, $height, $type, $attrs) = @getimagesize($target_file);
|
||||
if($type == 3) $ext = 'png';
|
||||
elseif($type == 2) $ext = 'jpg';
|
||||
else $ext = 'gif';
|
||||
if(IMG_PNG == $type) $ext = 'png';
|
||||
elseif(IMG_JPG == $type) $ext = 'jpg';
|
||||
elseif(IMG_GIF == $type) $ext = 'gif';
|
||||
else
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
FileHandler::removeFilesInDir($target_path);
|
||||
|
||||
$target_filename = sprintf('%s%d.%s', $target_path, $member_srl, $ext);
|
||||
// Convert if the image size is larger than a given size or if the format is not a gif
|
||||
if($width > $max_width || $height > $max_height || $type!=1) FileHandler::createImageFile($target_file, $target_filename, $max_width, $max_height, $ext);
|
||||
else @copy($target_file, $target_filename);
|
||||
if(($width > $max_width || $height > $max_height ) && $type != 1)
|
||||
{
|
||||
FileHandler::createImageFile($target_file, $target_filename, $max_width, $max_height, $ext);
|
||||
}
|
||||
else
|
||||
{
|
||||
@copy($target_file, $target_filename);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -1011,7 +1022,7 @@ class memberController extends member
|
|||
$oMail->setTitle( Context::getLang('msg_find_account_title') );
|
||||
$oMail->setContent($content);
|
||||
$oMail->setSender( $member_config->webmaster_name?$member_config->webmaster_name:'webmaster', $member_config->webmaster_email);
|
||||
$oMail->setReceiptor( $member_info->nick_name, $member_info->email_address );
|
||||
$oMail->setReceiptor( $member_info->user_name, $member_info->email_address );
|
||||
$oMail->send();
|
||||
// Return message
|
||||
$msg = sprintf(Context::getLang('msg_auth_mail_sent'), $member_info->email_address);
|
||||
|
|
@ -1183,7 +1194,7 @@ class memberController extends member
|
|||
$oMail->setTitle( Context::getLang('msg_confirm_account_title') );
|
||||
$oMail->setContent($content);
|
||||
$oMail->setSender( $member_config->webmaster_name?$member_config->webmaster_name:'webmaster', $member_config->webmaster_email);
|
||||
$oMail->setReceiptor( $member_info->nick_name, $member_info->email_address );
|
||||
$oMail->setReceiptor( $member_info->user_name, $member_info->email_address );
|
||||
$oMail->send();
|
||||
// Return message
|
||||
$msg = sprintf(Context::getLang('msg_auth_mail_sent'), $member_info->email_address);
|
||||
|
|
@ -1266,7 +1277,7 @@ class memberController extends member
|
|||
$oMail->setTitle( Context::getLang('msg_confirm_account_title') );
|
||||
$oMail->setContent($content);
|
||||
$oMail->setSender( $member_config->webmaster_name?$member_config->webmaster_name:'webmaster', $member_config->webmaster_email);
|
||||
$oMail->setReceiptor( $args->email_address, $args->email_address );
|
||||
$oMail->setReceiptor( $args->user_name, $args->email_address );
|
||||
$oMail->send();
|
||||
|
||||
$msg = sprintf(Context::getLang('msg_confirm_mail_sent'), $args->email_address);
|
||||
|
|
@ -1393,7 +1404,7 @@ class memberController extends member
|
|||
$oMail->setTitle( Context::getLang('msg_confirm_account_title') );
|
||||
$oMail->setContent($content);
|
||||
$oMail->setSender( $member_config->webmaster_name?$member_config->webmaster_name:'webmaster', $member_config->webmaster_email);
|
||||
$oMail->setReceiptor( $member_info->nick_name, $member_info->email_address );
|
||||
$oMail->setReceiptor( $member_info->user_name, $member_info->email_address );
|
||||
$oMail->send();
|
||||
}
|
||||
|
||||
|
|
@ -2275,7 +2286,7 @@ class memberController extends member
|
|||
// Create a model object
|
||||
$oMemberModel = getModel('member');
|
||||
// Bringing the user's information
|
||||
if(!$this->memberInfo)
|
||||
if(!$this->memberInfo || $this->memberInfo->member_srl != $member_srl || !isset($this->memberInfo->is_admin))
|
||||
{
|
||||
$columnList = array('member_srl', 'is_admin');
|
||||
$this->memberInfo = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList);
|
||||
|
|
@ -2462,7 +2473,7 @@ class memberController extends member
|
|||
$oMail->setReceiptor( $member_info->nick_name, $newEmail );
|
||||
$result = $oMail->send();
|
||||
|
||||
$msg = sprintf(Context::getLang('msg_change_mail_sent'), $newEmail);
|
||||
$msg = sprintf(Context::getLang('msg_confirm_mail_sent'), $newEmail);
|
||||
$this->setMessage($msg);
|
||||
|
||||
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', '');
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
<condition operation="like" column="nick_name" var="s_nick_name" pipe="or" />
|
||||
<condition operation="like" column="nick_name" var="html_nick_name" pipe="or" />
|
||||
<condition operation="like" column="email_address" var="s_email_address" pipe="or" />
|
||||
<condition operation="like" column="birthday" var="s_birthday" pipe="or" />
|
||||
<condition operation="like" column="extra_vars" var="s_extra_vars" pipe="or" />
|
||||
<condition operation="like_prefix" column="regdate" var="s_regdate" pipe="or" />
|
||||
<condition operation="like_prefix" column="last_login" var="s_last_login" pipe="or" />
|
||||
|
|
|
|||
|
|
@ -22,7 +22,8 @@
|
|||
<condition operation="like" column="member.nick_name" var="s_nick_name" pipe="or" />
|
||||
<condition operation="like" column="member.nick_name" var="html_nick_name" pipe="or" />
|
||||
<condition operation="like" column="member.email_address" var="s_email_address" pipe="or" />
|
||||
<condition operation="like" column="extra_vars" var="s_extra_vars" pipe="or" />
|
||||
<condition operation="like" column="member.birthday" var="s_birthday" pipe="or" />
|
||||
<condition operation="like" column="member.extra_vars" var="s_extra_vars" pipe="or" />
|
||||
<condition operation="like_prefix" column="member.regdate" var="s_regdate" pipe="or" />
|
||||
<condition operation="like_prefix" column="member.last_login" var="s_last_login" pipe="or" />
|
||||
<condition operation="more" column="member.regdate" var="s_regdate_more" pipe="or" />
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
<load target="js/krzip_search.js" />
|
||||
<load target="js/member_admin.js" />
|
||||
<!--%load_js_plugin("ui.datepicker")-->
|
||||
<script>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue