From 3e7caa0da1a0820caa7b4cb82c4f7fcfcb785523 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Mon, 25 Feb 2019 08:43:53 +0800 Subject: [PATCH] * finish task #5271. --- db/update11.2.sql | 4 +++ db/zentao.sql | 6 ++-- module/company/config.php | 12 ++++--- module/custom/config.php | 2 +- module/custom/control.php | 5 +++ module/custom/lang/zh-cn.php | 7 ++-- module/custom/model.php | 2 ++ module/custom/view/set.html.php | 15 ++++++++ module/doc/js/create.js | 2 +- module/doc/lang/zh-cn.php | 14 ++++---- module/my/view/editprofile.html.php | 31 +++++----------- module/my/view/profile.html.php | 45 ++++++++++------------- module/user/config.php | 11 +++--- module/user/control.php | 22 +++++++++--- module/user/lang/zh-cn.php | 15 +++++++- module/user/model.php | 20 ++++++++--- module/user/view/batchcreate.html.php | 12 ++++--- module/user/view/batchedit.html.php | 12 ++++--- module/user/view/edit.html.php | 30 +++++----------- module/user/view/profile.html.php | 51 ++++++++++----------------- 20 files changed, 174 insertions(+), 144 deletions(-) diff --git a/db/update11.2.sql b/db/update11.2.sql index c049c96631..e54f25c50e 100644 --- a/db/update11.2.sql +++ b/db/update11.2.sql @@ -1,3 +1,7 @@ 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 `weixin` varchar(90) COLLATE 'utf8_general_ci' NOT NULL AFTER `phone`; +ALTER TABLE `zt_user` ADD `dingtalk` varchar(90) COLLATE 'utf8_general_ci' NOT NULL AFTER `weixin`; +ALTER TABLE `zt_user` ADD `slack` varchar(90) COLLATE 'utf8_general_ci' NOT NULL AFTER `dingtalk`; +ALTER TABLE `zt_user` ADD `whatsapp` varchar(90) COLLATE 'utf8_general_ci' NOT NULL AFTER `slack`; diff --git a/db/zentao.sql b/db/zentao.sql index cc2fadefda..3a42a0d590 100644 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -815,11 +815,13 @@ CREATE TABLE IF NOT EXISTS `zt_user` ( `email` char(90) NOT NULL default '', `skype` char(90) NOT NULL default '', `qq` char(20) NOT NULL default '', - `yahoo` char(90) NOT NULL default '', `gtalk` char(90) NOT NULL default '', - `wangwang` char(90) NOT NULL default '', `mobile` char(11) NOT NULL default '', `phone` char(20) NOT NULL default '', + `weixin` varchar(90) NOT NULL default '', + `dingtalk` varchar(90) NOT NULL default '', + `slack` varchar(90) NOT NULL default '', + `whatsapp` varchar(90) NOT NULL default '', `address` char(120) NOT NULL default '', `zipcode` char(10) NOT NULL default '', `join` date NOT NULL default '0000-00-00', diff --git a/module/company/config.php b/module/company/config.php index f26840fd9d..04b36fc68c 100644 --- a/module/company/config.php +++ b/module/company/config.php @@ -38,9 +38,11 @@ $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']['dingtalk'] = $lang->user->dingtalk; $config->company->browse->search['fields']['gtalk'] = $lang->user->gtalk; -$config->company->browse->search['fields']['wangwang'] = $lang->user->wangwang; +$config->company->browse->search['fields']['weixin'] = $lang->user->weixin; +$config->company->browse->search['fields']['slack'] = $lang->user->slack; +$config->company->browse->search['fields']['whatsapp'] = $lang->user->whatsapp; $config->company->browse->search['fields']['address'] = $lang->user->address; $config->company->browse->search['fields']['zipcode'] = $lang->user->zipcode; @@ -56,8 +58,10 @@ $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']['dingtalk'] = 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']['weixin'] = array('operator' => '=', 'control' => 'input', 'values' => ''); +$config->company->browse->search['params']['slack'] = array('operator' => '=', 'control' => 'input', 'values' => ''); +$config->company->browse->search['params']['whatsapp'] = 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' => ''); diff --git a/module/custom/config.php b/module/custom/config.php index a7bb9e1cda..ea6ba4acda 100644 --- a/module/custom/config.php +++ b/module/custom/config.php @@ -55,4 +55,4 @@ $config->custom->fieldList['testreport'] = 'begin,end,members,report $config->custom->fieldList['testtask'] = 'owner,pri,status,desc,comment'; $config->custom->fieldList['doc'] = 'keywords,content'; $config->custom->fieldList['user']['create'] = 'dept,role,email,commiter'; -$config->custom->fieldList['user']['edit'] = 'dept,role,email,commiter,skype,qq,mobile,phone,address,zipcode,wangwang,gtalk'; +$config->custom->fieldList['user']['edit'] = 'dept,role,email,commiter,skype,qq,mobile,phone,address,zipcode,dingtalk,gtalk,slack,whatsapp,weixin'; diff --git a/module/custom/control.php b/module/custom/control.php index 4d0680144f..5440ea9797 100644 --- a/module/custom/control.php +++ b/module/custom/control.php @@ -107,6 +107,11 @@ class custom extends control $data = fixer::input('post')->join('closed', ',')->get(); $this->loadModel('setting')->setItem('system.block.closed', zget($data, 'closed', '')); } + elseif($module == 'user' and $field == 'contactField') + { + $data = fixer::input('post')->join('contactField', ',')->get(); + $this->loadModel('setting')->setItem('system.user.contactField', $data->contactField); + } elseif($module == 'user' and $field == 'deleted') { $data = fixer::input('post')->get(); diff --git a/module/custom/lang/zh-cn.php b/module/custom/lang/zh-cn.php index 98b09eedd9..6b6e8dde8e 100644 --- a/module/custom/lang/zh-cn.php +++ b/module/custom/lang/zh-cn.php @@ -72,9 +72,10 @@ $lang->custom->todo->fields['typeList'] = '类型'; $lang->custom->todo->fields['statusList'] = '状态'; $lang->custom->user = new stdClass(); -$lang->custom->user->fields['roleList'] = '职位'; -$lang->custom->user->fields['statusList'] = '状态'; -$lang->custom->user->fields['deleted'] = '列出已删除用户'; +$lang->custom->user->fields['roleList'] = '职位'; +$lang->custom->user->fields['statusList'] = '状态'; +$lang->custom->user->fields['contactField'] = '可用联系方式'; +$lang->custom->user->fields['deleted'] = '列出已删除用户'; $lang->custom->block->fields['closed'] = '关闭的区块'; diff --git a/module/custom/model.php b/module/custom/model.php index f53f565e5e..fe3e0b1c59 100644 --- a/module/custom/model.php +++ b/module/custom/model.php @@ -440,8 +440,10 @@ class customModel extends model $fieldList = isset($customFields[$moduleName][$method]) ? $customFields[$moduleName][$method] : $customFields[$moduleName]; if(!is_string($fieldList)) return $fields; + if($moduleName == 'user' and $method == 'edit') $this->app->loadConfig('user'); foreach(explode(',', $fieldList) as $fieldName) { + if($moduleName == 'user' and $method == 'edit' and strpos($this->config->user->contactField, $fieldName) === false) continue; if($fieldName == 'comment') $fields[$fieldName] = $this->lang->comment; if(isset($moduleLang->$fieldName) and is_string($moduleLang->$fieldName)) $fields[$fieldName] = $moduleLang->$fieldName; } diff --git a/module/custom/view/set.html.php b/module/custom/view/set.html.php index 92ae3c6ab7..6ef62a37f3 100644 --- a/module/custom/view/set.html.php +++ b/module/custom/view/set.html.php @@ -113,6 +113,21 @@ EOT; + + app->loadConfig('user'); + $this->app->loadLang('user'); + ?> + + + + + + + + + +
custom->user->fields['contactField'];?>user->contactFieldList, $config->user->contactField, "class='form-control chosen' multiple");?>
diff --git a/module/doc/js/create.js b/module/doc/js/create.js index 1c163e90f4..5cc44c388a 100644 --- a/module/doc/js/create.js +++ b/module/doc/js/create.js @@ -1,7 +1,7 @@ $(function() { toggleAcl($('[name=acl]').val(), 'doc'); - setTimeout(function(){initPage(docType)}, 100); + setTimeout(function(){initPage(docType)}, 50); $('input[name="type"]').change(function() { var type = $(this).val(); diff --git a/module/doc/lang/zh-cn.php b/module/doc/lang/zh-cn.php index 1b3527de2f..cba554cbf7 100644 --- a/module/doc/lang/zh-cn.php +++ b/module/doc/lang/zh-cn.php @@ -165,17 +165,17 @@ $lang->doc->noEditedDoc = '您还没有编辑任何文档。'; $lang->doc->noOpenedDoc = '您还没有创建任何文档。'; $lang->doc->noCollectedDoc = '您还没有收藏任何文档。'; -$lang->doc->noticeAcl['lib']['product']['open'] = '所有人都可以访问，除非用户没有权限访问的关联产品。'; -$lang->doc->noticeAcl['lib']['product']['custom'] = '白名单和有权限访问的关联产品的用户可以访问。'; -$lang->doc->noticeAcl['lib']['product']['private'] = '创建人和有权限访问的关联产品的用户可以访问。'; -$lang->doc->noticeAcl['lib']['project']['open'] = '所有人都可以访问，除非用户没有权限访问的关联项目。'; -$lang->doc->noticeAcl['lib']['project']['custom'] = '白名单和有权限访问的关联项目的用户可以访问。'; -$lang->doc->noticeAcl['lib']['project']['private'] = '创建人和有权限访问的关联项目的用户可以访问。'; +$lang->doc->noticeAcl['lib']['product']['open'] = '除了没有关联产品权限的用户，都可以访问。'; +$lang->doc->noticeAcl['lib']['product']['custom'] = '白名单和有关联产品权限的用户可以访问。'; +$lang->doc->noticeAcl['lib']['product']['private'] = '创建人和有关联产品权限的用户可以访问。'; +$lang->doc->noticeAcl['lib']['project']['open'] = '除了没有关联项目权限的用户，都可以访问。'; +$lang->doc->noticeAcl['lib']['project']['custom'] = '白名单和有关联项目权限的用户可以访问。'; +$lang->doc->noticeAcl['lib']['project']['private'] = '创建人和有关联项目权限的用户可以访问。'; $lang->doc->noticeAcl['lib']['custom']['open'] = '所有人都可以访问。'; $lang->doc->noticeAcl['lib']['custom']['custom'] = '白名单的用户可以访问。'; $lang->doc->noticeAcl['lib']['custom']['private'] = '只有创建人可以访问。'; -$lang->doc->noticeAcl['doc']['open'] = '所有人都可以访问，除非用户没有所属文档库的权限。'; +$lang->doc->noticeAcl['doc']['open'] = '除了没有所属文档库权限的用户，都可以访问。'; $lang->doc->noticeAcl['doc']['custom'] = '白名单的用户可以访问。'; $lang->doc->noticeAcl['doc']['private'] = '只有自己可以访问。'; diff --git a/module/my/view/editprofile.html.php b/module/my/view/editprofile.html.php index 943ab8bc03..a61a2586c6 100644 --- a/module/my/view/editprofile.html.php +++ b/module/my/view/editprofile.html.php @@ -63,34 +63,19 @@
+ + user->contactField) as $field):?> + ';?> + + + + ';?> + - - - - - - - - - - - - - - - - - - - - - - -
my->form->lblContact;?>
user->$field;?>$field, "class='form-control'");?>
user->skype;?>skype, "class='form-control'");?>user->qq;?>qq, "class='form-control'");?>
user->yahoo;?>yahoo, "class='form-control'");?>user->gtalk;?>gtalk, "class='form-control'");?>
user->wangwang;?>wangwang, "class='form-control'");?>user->mobile;?>mobile, "class='form-control'");?>
user->phone;?>phone, "class='form-control'");?> user->address;?> address, "class='form-control'");?>
user->zipcode;?> zipcode, "class='form-control'");?>
diff --git a/module/my/view/profile.html.php b/module/my/view/profile.html.php index 4df8419a71..6981fc56f5 100644 --- a/module/my/view/profile.html.php +++ b/module/my/view/profile.html.php @@ -83,34 +83,27 @@ + user->contactField) as $field):?> - - - - - - - - - - - - - - - - - - - - - - - - - - + + + diff --git a/module/user/config.php b/module/user/config.php index 44eb60792e..f40c34a953 100644 --- a/module/user/config.php +++ b/module/user/config.php @@ -6,13 +6,14 @@ $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,dingtalk,gtalk,weixin,mobile,slack,whatsapp,phone,address,zipcode'; +$config->user->customBatchEditFields = 'dept,email,commiter,skype,qq,dingtalk,gtalk,weixin,mobile,slack,whatsapp,phone,address,zipcode'; $config->user->custom = new stdclass(); $config->user->custom->batchCreateFields = 'dept,join,email,gender'; $config->user->custom->batchEditFields = 'dept,join,email,commiter'; -$config->user->failTimes = 6; -$config->user->lockMinutes = 10; -$config->user->batchCreate = 10; +$config->user->contactField = 'skype,qq,dingtalk,gtalk,weixin,mobile,slack,whatsapp,phone'; +$config->user->failTimes = 6; +$config->user->lockMinutes = 10; +$config->user->batchCreate = 10; diff --git a/module/user/control.php b/module/user/control.php index f9ea324cd4..b2af1add19 100644 --- a/module/user/control.php +++ b/module/user/control.php @@ -456,9 +456,16 @@ class user extends control } /* Set custom. */ - foreach(explode(',', $this->config->user->customBatchCreateFields) as $field) $customFields[$field] = $this->lang->user->$field; + foreach(explode(',', $this->config->user->customBatchCreateFields) as $field) + { + if(!isset($this->lang->user->contactFieldList[$field]) or strpos($this->config->user->contactField, $field) !== false) $customFields[$field] = $this->lang->user->$field; + } + foreach(explode(',', $this->config->user->custom->batchCreateFields) as $field) + { + if(!isset($this->lang->user->contactFieldList[$field]) or strpos($this->config->user->contactField, $field) !== false) $showFields[$field] = $field; + } $this->view->customFields = $customFields; - $this->view->showFields = $this->config->user->custom->batchCreateFields; + $this->view->showFields = join(',', $showFields); $title = $this->lang->company->common . $this->lang->colon . $this->lang->user->batchCreate; $position[] = $this->lang->user->batchCreate; @@ -533,9 +540,16 @@ class user extends control $this->lang->user->menuOrder = $this->lang->company->menuOrder; /* Set custom. */ - foreach(explode(',', $this->config->user->customBatchEditFields) as $field) $customFields[$field] = $this->lang->user->$field; + foreach(explode(',', $this->config->user->customBatchEditFields) as $field) + { + if(!isset($this->lang->user->contactFieldList[$field]) or strpos($this->config->user->contactField, $field) !== false) $customFields[$field] = $this->lang->user->$field; + } + foreach(explode(',', $this->config->user->custom->batchEditFields) as $field) + { + if(!isset($this->lang->user->contactFieldList[$field]) or strpos($this->config->user->contactField, $field) !== false) $showFields[$field] = $field; + } $this->view->customFields = $customFields; - $this->view->showFields = $this->config->user->custom->batchEditFields; + $this->view->showFields = join(',', $showFields); $this->view->title = $this->lang->company->common . $this->lang->colon . $this->lang->user->batchEdit; $this->view->position[] = $this->lang->user->batchEdit; diff --git a/module/user/lang/zh-cn.php b/module/user/lang/zh-cn.php index 77be8eb808..7999b5d7e1 100644 --- a/module/user/lang/zh-cn.php +++ b/module/user/lang/zh-cn.php @@ -30,11 +30,14 @@ $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->weixin = '微信'; +$lang->user->dingtalk = '钉钉'; +$lang->user->slack = 'Slack'; +$lang->user->whatsapp = 'WhatsApp'; $lang->user->address = '通讯地址'; $lang->user->zipcode = '邮编'; $lang->user->join = '入职日期'; @@ -151,6 +154,16 @@ $lang->user->error->reserved = "【ID %s】的用户名已被系统预留"; $lang->user->error->verifyPassword = "验证失败，请检查您的系统登录密码是否正确"; $lang->user->error->originalPassword = "原密码不正确"; +$lang->user->contactFieldList['skype'] = $lang->user->skype; +$lang->user->contactFieldList['qq'] = $lang->user->qq; +$lang->user->contactFieldList['dingtalk'] = $lang->user->dingtalk; +$lang->user->contactFieldList['gtalk'] = $lang->user->gtalk; +$lang->user->contactFieldList['weixin'] = $lang->user->weixin; +$lang->user->contactFieldList['mobile'] = $lang->user->mobile; +$lang->user->contactFieldList['slack'] = $lang->user->slack; +$lang->user->contactFieldList['whatsapp'] = $lang->user->whatsapp; +$lang->user->contactFieldList['phone'] = $lang->user->phone; + $lang->user->contacts = new stdclass(); $lang->user->contacts->common = '联系人'; $lang->user->contacts->listName = '列表名称'; diff --git a/module/user/model.php b/module/user/model.php index 9d4ba6d0ae..535b85e4a9 100644 --- a/module/user/model.php +++ b/module/user/model.php @@ -300,10 +300,12 @@ 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]->dingtalk = $users->dingtalk[$i]; $data[$i]->gtalk = $users->gtalk[$i]; - $data[$i]->wangwang = $users->wangwang[$i]; + $data[$i]->weixin = $users->weixin[$i]; $data[$i]->mobile = $users->mobile[$i]; + $data[$i]->slack = $users->slack[$i]; + $data[$i]->whatsapp = $users->whatsapp[$i]; $data[$i]->phone = $users->phone[$i]; $data[$i]->address = $users->address[$i]; $data[$i]->zipcode = $users->zipcode[$i]; @@ -387,10 +389,16 @@ class userModel extends model dao::$errors['verifyPassword'][] = $this->lang->user->error->verifyPassword; return false; } + $requiredFields = array(); + foreach(explode(',', $this->config->user->edit->requiredFields) as $field) + { + if(!isset($this->lang->user->contactFieldList[$field]) or strpos($this->config->user->contactField, $field) !== false) $requiredFields[$field] = $field; + } + $requiredFields = join(',', $requiredFields); $this->dao->update(TABLE_USER)->data($user) ->autoCheck() - ->batchCheck($this->config->user->edit->requiredFields, 'notempty') + ->batchCheck($requiredFields, 'notempty') ->check('account', 'unique', "id != '$userID'") ->check('account', 'account') ->checkIF($this->post->email != '', 'email', 'email') @@ -474,10 +482,12 @@ 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]['dingtalk'] = $data->dingtalk[$id]; $users[$id]['gtalk'] = $data->gtalk[$id]; - $users[$id]['wangwang'] = $data->wangwang[$id]; + $users[$id]['weixin'] = $data->weixin[$id]; $users[$id]['mobile'] = $data->mobile[$id]; + $users[$id]['slack'] = $data->slack[$id]; + $users[$id]['whatsapp'] = $data->whatsapp[$id]; $users[$id]['phone'] = $data->phone[$id]; $users[$id]['address'] = $data->address[$id]; $users[$id]['zipcode'] = $data->zipcode[$id]; diff --git a/module/user/view/batchcreate.html.php b/module/user/view/batchcreate.html.php index 33dd92e7fc..878da7e928 100644 --- a/module/user/view/batchcreate.html.php +++ b/module/user/view/batchcreate.html.php @@ -47,10 +47,12 @@ - + - + + + @@ -82,10 +84,12 @@ - + - + + + diff --git a/module/user/view/batchedit.html.php b/module/user/view/batchedit.html.php index b1298b43d0..018b7d31e4 100644 --- a/module/user/view/batchedit.html.php +++ b/module/user/view/batchedit.html.php @@ -43,10 +43,12 @@ - + - + + + @@ -73,10 +75,12 @@ - + - + + + diff --git a/module/user/view/edit.html.php b/module/user/view/edit.html.php index d898d57dcc..23f5bb8b7d 100644 --- a/module/user/view/edit.html.php +++ b/module/user/view/edit.html.php @@ -76,31 +76,17 @@
user->last;?> last;?>
user->skype;?>skype) echo html::a("callto://$user->skype", $user->skype);?>
user->qq;?>qq) echo html::a("tencent://message/?uin=$user->qq", $user->qq);?>
user->yahoo;?>yahoo;?>
user->gtalk;?>gtalk;?>
user->wangwang;?>wangwang;?>
user->mobile;?>mobile;?>
user->phone;?>phone;?>user->$field;?> + $field) + { + echo html::a("callto://$user->skype", $user->skype); + } + elseif($field == 'qq' and $user->$field) + { + echo html::a("tencent://message/?uin=$user->qq", $user->qq); + } + else + { + echo $user->$field; + } + ?> +
user->address;?> address;?>'> user->join;?> '> user->skype;?> '> user->qq;?>'> user->yahoo;?>'>user->dingtalk;?> '> user->gtalk;?>'>user->wangwang;?>'> user->weixin;?> '> user->mobile;?>'> user->slack;?>'>user->whatsapp;?> '> user->phone;?> '> user->address;?> '> user->zipcode;?>'> '> '> '> '> '> '>'> '> '> '> '> '> '> '> user->join;?> '> user->skype;?> '> user->qq;?>'> user->yahoo;?>'> user->dingtalk;?> '> user->gtalk;?>'> user->wangwang;?>'> user->weixin;?> '> user->mobile;?>'> user->slack;?>'> user->whatsapp;?> '> user->phone;?> '> user->address;?> '> user->zipcode;?>'> 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->dingtalk, "class='form-control'");?> '> id]", $user->gtalk, "class='form-control'");?>'>id]", $user->wangwang, "class='form-control'");?>'> id]", $user->weixin, "class='form-control'");?> '> id]", $user->mobile, "class='form-control'");?>'> id]", $user->slack, "class='form-control'");?>'>id]", $user->whatsapp, "class='form-control'");?> '> id]", $user->phone, "class='form-control'");?> '> id]", $user->address, "class='form-control'");?> '> id]", $user->zipcode, "class='form-control'");?>
+ + user->contactField) as $field):?> + ';?> + + + + ';?> + - - - - - - - - - - - - - - - - - - - - - - diff --git a/module/user/view/profile.html.php b/module/user/view/profile.html.php index c02bed9610..c5bba5ba88 100644 --- a/module/user/view/profile.html.php +++ b/module/user/view/profile.html.php @@ -69,12 +69,6 @@ - @@ -91,34 +85,27 @@ + user->contactField) as $field):?> - - - - - - - - - - - - - - - - - - - - - - - - - - + + +
user->contactInfo;?>
user->$field;?>$field, "class='form-control'");?>
user->skype;?>skype, "class='form-control'");?>user->qq;?>qq, "class='form-control'");?>
user->yahoo;?>yahoo, "class='form-control'");?>user->gtalk;?>gtalk, "class='form-control'");?>
user->wangwang;?>wangwang, "class='form-control'");?>user->mobile;?>mobile, "class='form-control'");?>
user->phone;?>phone, "class='form-control'");?> user->address;?> address, "class='form-control'");?>
user->zipcode;?> zipcode, "class='form-control'");?>
user->commiter;?> commiter;?>
user->email;?> email;?>user->last;?> last;?>
user->skype;?>skype) echo html::a("callto://$user->skype", $user->skype);?>
user->qq;?>qq) echo html::a("tencent://message/?uin=$user->qq", $user->qq);?>
user->yahoo;?>yahoo;?>
user->gtalk;?>gtalk;?>
user->wangwang;?>wangwang;?>
user->mobile;?>mobile;?>
user->phone;?>phone;?>user->$field;?> + $field) + { + echo html::a("callto://$user->skype", $user->skype); + } + elseif($field == 'qq' and $user->$field) + { + echo html::a("tencent://message/?uin=$user->qq", $user->qq); + } + else + { + echo $user->$field; + } + ?> +
user->address;?> address;?>