| user->mobile;?> |
mobile;?> |
diff --git a/module/user/config.php b/module/user/config.php
index 44eb60792e..afb00d80a7 100644
--- a/module/user/config.php
+++ b/module/user/config.php
@@ -6,8 +6,8 @@ $config->user->edit = new stdclass();
$config->user->create->requiredFields = 'account,realname,password,password1,password2';
$config->user->edit->requiredFields = 'account,realname';
-$config->user->customBatchCreateFields = 'dept,email,gender,commiter,join,skype,qq,yahoo,gtalk,wangwang,mobile,phone,address,zipcode';
-$config->user->customBatchEditFields = 'dept,email,commiter,skype,qq,yahoo,gtalk,wangwang,mobile,phone,address,zipcode';
+$config->user->customBatchCreateFields = 'dept,email,gender,commiter,join,skype,qq,gtalk,mobile,phone,address,zipcode';
+$config->user->customBatchEditFields = 'dept,email,commiter,skype,qq,gtalk,mobile,phone,address,zipcode';
$config->user->custom = new stdclass();
$config->user->custom->batchCreateFields = 'dept,join,email,gender';
diff --git a/module/user/lang/en.php b/module/user/lang/en.php
index ca47dd68ea..ea2cd16027 100644
--- a/module/user/lang/en.php
+++ b/module/user/lang/en.php
@@ -30,9 +30,7 @@ $lang->user->verify = 'Verification';
$lang->user->contactInfo = 'Contact';
$lang->user->skype = 'Skype';
$lang->user->qq = 'QQ';
-$lang->user->yahoo = 'Yahoo!';
$lang->user->gtalk = 'GTalk';
-$lang->user->wangwang = 'Wangwang';
$lang->user->mobile = 'Mobile';
$lang->user->phone = 'Phone';
$lang->user->address = 'Address';
diff --git a/module/user/lang/zh-cn.php b/module/user/lang/zh-cn.php
index 77be8eb808..4aed2b9eb2 100644
--- a/module/user/lang/zh-cn.php
+++ b/module/user/lang/zh-cn.php
@@ -30,9 +30,7 @@ $lang->user->verify = '安全验证';
$lang->user->contactInfo = '联系信息';
$lang->user->skype = 'Skype';
$lang->user->qq = 'QQ';
-$lang->user->yahoo = '雅虎通';
$lang->user->gtalk = 'GTalk';
-$lang->user->wangwang = '旺旺';
$lang->user->mobile = '手机';
$lang->user->phone = '电话';
$lang->user->address = '通讯地址';
diff --git a/module/user/lang/zh-tw.php b/module/user/lang/zh-tw.php
index 46b8da6f03..151e0cfdfd 100644
--- a/module/user/lang/zh-tw.php
+++ b/module/user/lang/zh-tw.php
@@ -30,9 +30,7 @@ $lang->user->verify = '安全驗證';
$lang->user->contactInfo = '聯繫信息';
$lang->user->skype = 'Skype';
$lang->user->qq = 'QQ';
-$lang->user->yahoo = '雅虎通';
$lang->user->gtalk = 'GTalk';
-$lang->user->wangwang = '旺旺';
$lang->user->mobile = '手機';
$lang->user->phone = '電話';
$lang->user->address = '通訊地址';
diff --git a/module/user/model.php b/module/user/model.php
index 9d4ba6d0ae..78a8c92e92 100644
--- a/module/user/model.php
+++ b/module/user/model.php
@@ -300,9 +300,7 @@ class userModel extends model
$data[$i]->join = empty($users->join[$i]) ? '0000-00-00' : ($users->join[$i]);
$data[$i]->skype = $users->skype[$i];
$data[$i]->qq = $users->qq[$i];
- $data[$i]->yahoo = $users->yahoo[$i];
$data[$i]->gtalk = $users->gtalk[$i];
- $data[$i]->wangwang = $users->wangwang[$i];
$data[$i]->mobile = $users->mobile[$i];
$data[$i]->phone = $users->phone[$i];
$data[$i]->address = $users->address[$i];
@@ -474,9 +472,7 @@ class userModel extends model
$users[$id]['join'] = $data->join[$id];
$users[$id]['skype'] = $data->skype[$id];
$users[$id]['qq'] = $data->qq[$id];
- $users[$id]['yahoo'] = $data->yahoo[$id];
$users[$id]['gtalk'] = $data->gtalk[$id];
- $users[$id]['wangwang'] = $data->wangwang[$id];
$users[$id]['mobile'] = $data->mobile[$id];
$users[$id]['phone'] = $data->phone[$id];
$users[$id]['address'] = $data->address[$id];
diff --git a/module/user/view/batchcreate.html.php b/module/user/view/batchcreate.html.php
index 33dd92e7fc..53f86ffa9c 100644
--- a/module/user/view/batchcreate.html.php
+++ b/module/user/view/batchcreate.html.php
@@ -47,9 +47,7 @@
'> user->join;?> |
'> user->skype;?> |
'> user->qq;?> |
- '> user->yahoo;?> |
'> user->gtalk;?> |
- '>user->wangwang;?> |
'> user->mobile;?> |
'> user->phone;?> |
'> user->address;?> |
@@ -82,9 +80,7 @@
'> |
'> |
'> |
- '> |
'> |
- '> |
'> |
'> |
'> |
diff --git a/module/user/view/batchedit.html.php b/module/user/view/batchedit.html.php
index b1298b43d0..2d3bc3093f 100644
--- a/module/user/view/batchedit.html.php
+++ b/module/user/view/batchedit.html.php
@@ -43,9 +43,7 @@
'> user->join;?> |
'> user->skype;?> |
'> user->qq;?> |
- '> user->yahoo;?> |
'> user->gtalk;?> |
- '> user->wangwang;?> |
'> user->mobile;?> |
'> user->phone;?> |
'> user->address;?> |
@@ -73,9 +71,7 @@
'> id]", $user->join, "class='form-control form-date'");?> |
'> id]", $user->skype, "class='form-control'");?> |
'> id]", $user->qq, "class='form-control'");?> |
- '> id]", $user->yahoo, "class='form-control'");?> |
'> id]", $user->gtalk, "class='form-control'");?> |
- '>id]", $user->wangwang, "class='form-control'");?> |
'> id]", $user->mobile, "class='form-control'");?> |
'> id]", $user->phone, "class='form-control'");?> |
'> id]", $user->address, "class='form-control'");?> |
diff --git a/module/user/view/edit.html.php b/module/user/view/edit.html.php
index d898d57dcc..274433ba1e 100644
--- a/module/user/view/edit.html.php
+++ b/module/user/view/edit.html.php
@@ -77,22 +77,16 @@