* Delete yahoo and wangwang field.

db/update11.2.sql

@@ -1,3 +1,9 @@
 update `zt_build` set `deleted`='1' where `project`='0' and `id` in (select `build` from `zt_release` where `deleted`='1');
 ALTER TABLE `zt_productplan` ADD `parent` mediumint(9) NOT NULL DEFAULT '0' AFTER `branch`;
 ALTER TABLE `zt_action` CHANGE `actor` `actor` varchar(100) COLLATE 'utf8_general_ci' NOT NULL DEFAULT '' AFTER `project`;
+
+ALTER TABLE `zt_user`
+ADD `wechat` char(20) COLLATE 'utf8_general_ci' NOT NULL AFTER `qq`,
+ADD `dingding` char(20) COLLATE 'utf8_general_ci' NOT NULL AFTER `wechat`,
+ADD `slack` char(20) COLLATE 'utf8_general_ci' NOT NULL AFTER `dingding`,
+ADD `whatsapp` char(20) COLLATE 'utf8_general_ci' NOT NULL AFTER `slack`;

module/company/config.php

@@ -38,9 +38,7 @@ $config->company->browse->search['fields']['commiter'] = $lang->user->commiter;
 $config->company->browse->search['fields']['gender']   = $lang->user->gender;
 $config->company->browse->search['fields']['qq']       = $lang->user->qq;
 $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;
 $config->company->browse->search['fields']['address']  = $lang->user->address;
 $config->company->browse->search['fields']['zipcode']  = $lang->user->zipcode;
 
@@ -56,8 +54,6 @@ $config->company->browse->search['params']['commiter'] = array('operator' => 'in
 $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']['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' => '');
 $config->company->browse->search['params']['address']  = array('operator' => 'include',  'control' => 'input',  'values' => '');
 $config->company->browse->search['params']['zipcode']  = array('operator' => '=',        'control' => 'input',  'values' => '');

module/my/view/editprofile.html.php

@@ -64,22 +64,16 @@
     <table class='table table-form'>
       <caption><?php echo $lang->my->form->lblContact;?></caption>
       <tr>
-        <th class='w-90px'><?php echo $lang->user->skype;?></th>
-        <td><?php echo html::input('skype', $user->skype, "class='form-control'");?></td>
+        <th class='w-90px'><?php echo $lang->user->mobile;?></th>
+        <td><?php echo html::input('mobile', $user->mobile, "class='form-control'");?></td>
         <th class='w-90px'><?php echo $lang->user->qq;?></th>
         <td><?php echo html::input('qq', $user->qq, "class='form-control'");?></td>
       </tr>  
       <tr>
-        <th><?php echo $lang->user->yahoo;?></th>
-        <td><?php echo html::input('yahoo', $user->yahoo, "class='form-control'");?></td>
+        <th><?php echo $lang->user->skype;?></th>
+        <td><?php echo html::input('skype', $user->skype, "class='form-control'");?></td>
         <th><?php echo $lang->user->gtalk;?></th>
         <td><?php echo html::input('gtalk', $user->gtalk, "class='form-control'");?></td>
-      </tr>  
-       <tr>
-        <th><?php echo $lang->user->wangwang;?></th>
-        <td><?php echo html::input('wangwang', $user->wangwang, "class='form-control'");?></td>
-        <th><?php echo $lang->user->mobile;?></th>
-        <td><?php echo html::input('mobile', $user->mobile, "class='form-control'");?></td>
       </tr>  
        <tr>
         <th><?php echo $lang->user->phone;?></th>

module/my/view/profile.html.php

@@ -91,18 +91,10 @@
       <th><?php echo $lang->user->qq;?></th>
       <td><?php if($user->qq) echo html::a("tencent://message/?uin=$user->qq", $user->qq);?></td>
     </tr>  
-    <tr>
-      <th><?php echo $lang->user->yahoo;?></th>
-      <td><?php echo $user->yahoo;?></td>
-    </tr>
     <tr>
       <th><?php echo $lang->user->gtalk;?></th>
       <td><?php echo $user->gtalk;?></td>
     </tr>  
-    <tr>
-      <th><?php echo $lang->user->wangwang;?></th>
-      <td><?php echo $user->wangwang;?></td>
-    </tr>  
     <tr>
       <th><?php echo $lang->user->mobile;?></th>
       <td><?php echo $user->mobile;?></td>

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';

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';

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          = '通讯地址';

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          = '通訊地址';

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];

module/user/view/batchcreate.html.php

@@ -47,9 +47,7 @@
             <th class='w-120px<?php echo zget($visibleFields, 'join', ' hidden')?>'>    <?php echo $lang->user->join;?></th>
             <th class='w-120px<?php echo zget($visibleFields, 'skype', ' hidden')?>'>   <?php echo $lang->user->skype;?></th>
             <th class='w-120px<?php echo zget($visibleFields, 'qq', ' hidden')?>'>      <?php echo $lang->user->qq;?></th>
-            <th class='w-120px<?php echo zget($visibleFields, 'yahoo', ' hidden')?>'>   <?php echo $lang->user->yahoo;?></th>
             <th class='w-120px<?php echo zget($visibleFields, 'gtalk', ' hidden')?>'>   <?php echo $lang->user->gtalk;?></th>
-            <th class='w-120px<?php echo zget($visibleFields, 'wangwang', ' hidden')?>'><?php echo $lang->user->wangwang;?></th>
             <th class='w-120px<?php echo zget($visibleFields, 'mobile', ' hidden')?>'>  <?php echo $lang->user->mobile;?></th>
             <th class='w-120px<?php echo zget($visibleFields, 'phone', ' hidden')?>'>   <?php echo $lang->user->phone;?></th>
             <th class='w-120px<?php echo zget($visibleFields, 'address', ' hidden')?>'> <?php echo $lang->user->address;?></th>
@@ -82,9 +80,7 @@
           <td class='<?php echo zget($visibleFields, 'join', 'hidden')?>'>    <?php echo html::input("join[$i]",     '', "class='form-control form-date'");?></td>
           <td class='<?php echo zget($visibleFields, 'skype', 'hidden')?>'>   <?php echo html::input("skype[$i]",    '', "class='form-control'");?></td>
           <td class='<?php echo zget($visibleFields, 'qq', 'hidden')?>'>      <?php echo html::input("qq[$i]",       '', "class='form-control'");?></td>
-          <td class='<?php echo zget($visibleFields, 'yahoo', 'hidden')?>'>   <?php echo html::input("yahoo[$i]",    '', "class='form-control'");?></td>
           <td class='<?php echo zget($visibleFields, 'gtalk', 'hidden')?>'>   <?php echo html::input("gtalk[$i]",    '', "class='form-control'");?></td>
-          <td class='<?php echo zget($visibleFields, 'wangwang', 'hidden')?>'><?php echo html::input("wangwang[$i]", '', "class='form-control'");?></td>
           <td class='<?php echo zget($visibleFields, 'mobile', 'hidden')?>'>  <?php echo html::input("mobile[$i]",   '', "class='form-control'");?></td>
           <td class='<?php echo zget($visibleFields, 'phone', 'hidden')?>'>   <?php echo html::input("phone[$i]",    '', "class='form-control'");?></td>
           <td class='<?php echo zget($visibleFields, 'address', 'hidden')?>'> <?php echo html::input("address[$i]",  '', "class='form-control'");?></td>

module/user/view/batchedit.html.php

@@ -43,9 +43,7 @@
             <th class='w-120px<?php echo zget($visibleFields, 'join', ' hidden')?>'>         <?php echo $lang->user->join;?></th>
             <th class='w-120px<?php echo zget($visibleFields, 'skype', ' hidden')?>'>        <?php echo $lang->user->skype;?></th>
             <th class='w-120px<?php echo zget($visibleFields, 'qq', ' hidden')?>'>           <?php echo $lang->user->qq;?></th>
-            <th class='w-120px<?php echo zget($visibleFields, 'yahoo', ' hidden')?>'>        <?php echo $lang->user->yahoo;?></th>
             <th class='w-120px<?php echo zget($visibleFields, 'gtalk', ' hidden')?>'>        <?php echo $lang->user->gtalk;?></th>
-            <th class='w-120px<?php echo zget($visibleFields, 'wangwang', ' hidden')?>'>     <?php echo $lang->user->wangwang;?></th>
             <th class='w-120px<?php echo zget($visibleFields, 'mobile', ' hidden')?>'>       <?php echo $lang->user->mobile;?></th>
             <th class='w-120px<?php echo zget($visibleFields, 'phone', ' hidden')?>'>        <?php echo $lang->user->phone;?></th>
             <th class='w-120px<?php echo zget($visibleFields, 'address', ' hidden')?>'>      <?php echo $lang->user->address;?></th>
@@ -73,9 +71,7 @@
           <td class='<?php echo zget($visibleFields, 'join', 'hidden')?>'>    <?php echo html::input("join[$user->id]",     $user->join, "class='form-control form-date'");?></td>
           <td class='<?php echo zget($visibleFields, 'skype', 'hidden')?>'>   <?php echo html::input("skype[$user->id]",    $user->skype, "class='form-control'");?></td>
           <td class='<?php echo zget($visibleFields, 'qq', 'hidden')?>'>      <?php echo html::input("qq[$user->id]",       $user->qq, "class='form-control'");?></td>
-          <td class='<?php echo zget($visibleFields, 'yahoo', 'hidden')?>'>   <?php echo html::input("yahoo[$user->id]",    $user->yahoo, "class='form-control'");?></td>
           <td class='<?php echo zget($visibleFields, 'gtalk', 'hidden')?>'>   <?php echo html::input("gtalk[$user->id]",    $user->gtalk, "class='form-control'");?></td>
-          <td class='<?php echo zget($visibleFields, 'wangwang', 'hidden')?>'><?php echo html::input("wangwang[$user->id]", $user->wangwang, "class='form-control'");?></td>
           <td class='<?php echo zget($visibleFields, 'mobile', 'hidden')?>'>  <?php echo html::input("mobile[$user->id]",   $user->mobile, "class='form-control'");?></td>
           <td class='<?php echo zget($visibleFields, 'phone', 'hidden')?>'>   <?php echo html::input("phone[$user->id]",    $user->phone, "class='form-control'");?></td>
           <td class='<?php echo zget($visibleFields, 'address', 'hidden')?>'> <?php echo html::input("address[$user->id]",  $user->address, "class='form-control'");?></td>

module/user/view/edit.html.php

@@ -77,22 +77,16 @@
       <table align='center' class='table table-form'>
         <caption class='text-left text-muted'><?php echo $lang->user->contactInfo;?></caption>
         <tr>
-          <th class='w-90px'><?php echo $lang->user->skype;?></th>
-          <td class='w-p40'><?php echo html::input('skype', $user->skype, "class='form-control'");?></td>
+          <th class='w-90px'><?php echo $lang->user->mobile;?></th>
+          <td class='w-p40'><?php echo html::input('mobile', $user->mobile, "class='form-control'");?></td>
           <th class='w-90px'><?php echo $lang->user->qq;?></th>
           <td><?php echo html::input('qq', $user->qq, "class='form-control'");?></td>
         </tr>
         <tr>
-          <th><?php echo $lang->user->yahoo;?></th>
-          <td><?php echo html::input('yahoo', $user->yahoo, "class='form-control'");?></td>
           <th><?php echo $lang->user->gtalk;?></th>
           <td><?php echo html::input('gtalk', $user->gtalk, "class='form-control'");?></td>
-        </tr>
-        <tr>
-          <th><?php echo $lang->user->wangwang;?></th>
-          <td><?php echo html::input('wangwang', $user->wangwang, "class='form-control'");?></td>
-          <th><?php echo $lang->user->mobile;?></th>
-          <td><?php echo html::input('mobile', $user->mobile, "class='form-control'");?></td>
+          <th><?php echo $lang->user->skype;?></th>
+          <td><?php echo html::input('skype', $user->skype, "class='form-control'");?></td>
         </tr>
         <tr>
           <th><?php echo $lang->user->phone;?></th>

module/user/view/profile.html.php

@@ -99,18 +99,10 @@
       <th><?php echo $lang->user->qq;?></th>
       <td><?php if($user->qq) echo html::a("tencent://message/?uin=$user->qq", $user->qq);?></td>
     </tr>
-    <tr>
-      <th><?php echo $lang->user->yahoo;?></th>
-      <td><?php echo $user->yahoo;?></td>
-    </tr>
     <tr>
       <th><?php echo $lang->user->gtalk;?></th>
       <td><?php echo $user->gtalk;?></td>
     </tr>
-    <tr>
-      <th><?php echo $lang->user->wangwang;?></th>
-      <td><?php echo $user->wangwang;?></td>
-    </tr>
     <tr>
       <th><?php echo $lang->user->mobile;?></th>
       <td><?php echo $user->mobile;?></td>