diff --git a/module/company/config.php b/module/company/config.php index addadee1ec..19d5006649 100644 --- a/module/company/config.php +++ b/module/company/config.php @@ -40,7 +40,7 @@ $config->company->browse->search['fields']['commiter'] = $lang->user->commiter; $config->company->browse->search['fields']['birthday'] = $lang->user->birthyear; $config->company->browse->search['fields']['gender'] = $lang->user->gender; $config->company->browse->search['fields']['qq'] = $lang->user->qq; -$config->company->browse->search['fields']['msn'] = $lang->user->msn; +$config->company->browse->search['fields']['skype'] = $lang->user->skype; $config->company->browse->search['fields']['yahoo'] = $lang->user->yahoo; $config->company->browse->search['fields']['gtalk'] = $lang->user->gtalk; $config->company->browse->search['fields']['wangwang'] = $lang->user->wangwang; @@ -59,7 +59,7 @@ $config->company->browse->search['params']['commiter'] = array('operator' => 'in $config->company->browse->search['params']['birthday'] = array('operator' => '>=', 'control' => 'input', 'values' => '', 'class' => 'date'); $config->company->browse->search['params']['gender'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->user->genderList); $config->company->browse->search['params']['qq'] = array('operator' => '=', 'control' => 'input', 'values' => ''); -$config->company->browse->search['params']['msn'] = array('operator' => '=', 'control' => 'input', 'values' => ''); +$config->company->browse->search['params']['skype'] = array('operator' => '=', 'control' => 'input', 'values' => ''); $config->company->browse->search['params']['yahoo'] = array('operator' => '=', 'control' => 'input', 'values' => ''); $config->company->browse->search['params']['gtalk'] = array('operator' => '=', 'control' => 'input', 'values' => ''); $config->company->browse->search['params']['wangwang'] = array('operator' => '=', 'control' => 'input', 'values' => ''); diff --git a/module/my/view/editprofile.html.php b/module/my/view/editprofile.html.php index b5da7dfc69..9d403f91f4 100644 --- a/module/my/view/editprofile.html.php +++ b/module/my/view/editprofile.html.php @@ -56,8 +56,8 @@ - user->msn;?> - msn);?> + user->skype;?> + skype);?> diff --git a/module/my/view/profile.html.php b/module/my/view/profile.html.php index b50003ac6c..80fedc3359 100644 --- a/module/my/view/profile.html.php +++ b/module/my/view/profile.html.php @@ -96,8 +96,8 @@ last;?> - user->msn;?> - msn;?> + user->skype;?> + skype;?> user->qq;?> diff --git a/module/user/lang/en.php b/module/user/lang/en.php index be117f1a00..4e551e1630 100644 --- a/module/user/lang/en.php +++ b/module/user/lang/en.php @@ -25,7 +25,7 @@ $lang->user->avatar = 'Avatar'; $lang->user->birthyear = 'Birth year'; $lang->user->gender = 'Gender'; $lang->user->email = 'Email'; -$lang->user->msn = 'MSN'; +$lang->user->skype = 'SKYPE'; $lang->user->qq = 'QQ'; $lang->user->yahoo = 'Yahoo!'; $lang->user->gtalk = 'GTalk'; diff --git a/module/user/lang/zh-cn.php b/module/user/lang/zh-cn.php index 846f181330..f81b3d6b8d 100644 --- a/module/user/lang/zh-cn.php +++ b/module/user/lang/zh-cn.php @@ -25,7 +25,7 @@ $lang->user->avatar = '头像'; $lang->user->birthyear = '出生年'; $lang->user->gender = '性别'; $lang->user->email = '邮箱'; -$lang->user->msn = 'MSN'; +$lang->user->skype = 'SKYPE'; $lang->user->qq = 'QQ'; $lang->user->yahoo = '雅虎通'; $lang->user->gtalk = 'GTalk'; diff --git a/module/user/lang/zh-tw.php b/module/user/lang/zh-tw.php index ab7e6b52c0..823031fb9e 100644 --- a/module/user/lang/zh-tw.php +++ b/module/user/lang/zh-tw.php @@ -25,7 +25,7 @@ $lang->user->avatar = '頭像'; $lang->user->birthyear = '出生年'; $lang->user->gender = '性別'; $lang->user->email = '郵箱'; -$lang->user->msn = 'MSN'; +$lang->user->skype = 'MSN'; $lang->user->qq = 'QQ'; $lang->user->yahoo = '雅虎通'; $lang->user->gtalk = 'GTalk'; diff --git a/module/user/model.php b/module/user/model.php index 4ebfe7c744..e2625690f8 100644 --- a/module/user/model.php +++ b/module/user/model.php @@ -318,7 +318,7 @@ class userModel extends model ->setDefault('join', '0000-00-00') ->setIF($this->post->password1 != false, 'password', md5($this->post->password1)) ->remove('password1, password2') - ->specialChars('msn,qq,yahoo,gtalk,wangwang,mobile,phone,address,zipcode') + ->specialChars('skype,qq,yahoo,gtalk,wangwang,mobile,phone,address,zipcode') ->get(); $this->dao->update(TABLE_USER)->data($user) diff --git a/module/user/view/edit.html.php b/module/user/view/edit.html.php index a209fbf3d8..eb0588fb1a 100644 --- a/module/user/view/edit.html.php +++ b/module/user/view/edit.html.php @@ -56,8 +56,8 @@ - user->msn;?> - msn, "class='text-3'");?> + user->skype;?> + skype, "class='text-3'");?> user->qq;?> diff --git a/module/user/view/profile.html.php b/module/user/view/profile.html.php index 29e9a2c675..c645d5e14a 100644 --- a/module/user/view/profile.html.php +++ b/module/user/view/profile.html.php @@ -96,8 +96,8 @@ last;?> - user->msn;?> - msn;?> + user->skype;?> + skype;?> user->qq;?>