diff --git a/htdocs/admin/socialnetworks.php b/htdocs/admin/socialnetworks.php
index 9aba26b3fc4..959dd91f339 100644
--- a/htdocs/admin/socialnetworks.php
+++ b/htdocs/admin/socialnetworks.php
@@ -89,7 +89,7 @@ dol_fiche_head($head, 'setup', '', 0, 'user');
print '
';
-$arrayofsocialnetworks=array('skype'=>'Skype', 'twitter'=>'Twitter', 'facebook'=>'Facebook');
+$arrayofsocialnetworks=array('jabber'=>'Jabber', 'skype'=>'Skype', 'twitter'=>'Twitter', 'facebook'=>'Facebook');
foreach($arrayofsocialnetworks as $snkey => $snlabel)
{
diff --git a/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php b/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php
index 39c3604416b..bc3b30c29ad 100644
--- a/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php
+++ b/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php
@@ -125,11 +125,6 @@ echo $this->control->tpl['ajax_selectcountry'];
-
- | trans("IM"); ?> |
- |
-
-
| trans("ContactVisibility"); ?> |
control->tpl['select_visibility']; ?> |
diff --git a/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php b/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php
index c1d6de80964..bb9bc1d06b5 100644
--- a/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php
+++ b/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php
@@ -110,11 +110,6 @@ dol_htmloutput_errors($this->control->tpl['error'],$this->control->tpl['errors']
-
- | trans("IM"); ?> |
- control->tpl['jabberid']; ?> |
-
-
| trans("ContactVisibility"); ?> |
control->tpl['visibility']; ?> |
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index 770b19e5b75..15cbe110a6a 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -660,12 +660,14 @@ else
}
print '
';
- // Instant message and no email
- print ' | ';
- print 'jabberid).'"> |
';
-
if (! empty($conf->socialnetworks->enabled))
{
+ // Jabber
+ if (! empty($conf->global->SOCIALNETWORKS_JABBER))
+ {
+ print ' | ';
+ print 'jabberid).'"> |
';
+ }
// Skype
if (! empty($conf->global->SOCIALNETWORKS_SKYPE))
{
@@ -919,9 +921,8 @@ else
}
print '';
- // Jabberid
- print ' | ';
- print 'jabberid).'"> | ';
+ // Unsubscribe
+ print '
';
if (! empty($conf->mailing->enabled))
{
print ' | ';
@@ -935,6 +936,12 @@ else
if (! empty($conf->socialnetworks->enabled))
{
+ // Jabber ID
+ if (! empty($conf->global->SOCIALNETWORKS_JABBER))
+ {
+ print '
| ';
+ print 'jabberid).'"> |
';
+ }
// Skype
if (! empty($conf->global->SOCIALNETWORKS_SKYPE))
{
@@ -1153,8 +1160,7 @@ else
print ''.$object->getNbOfEMailings().' | ';
}
- // Instant message and no email
- print '| '.$langs->trans("IM").' | '.$object->jabberid.' |
';
+ // Unsubscribe
if (!empty($conf->mailing->enabled))
{
print '| '.$langs->trans("No_Email").' | '.yn($object->no_email).' |
';
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 237b82f78d5..9ac7d9e258d 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -158,6 +158,7 @@ $arrayfields=array(
'p.phone_mobile'=>array('label'=>"PhoneMobile", 'checked'=>1),
'p.fax'=>array('label'=>"Fax", 'checked'=>0),
'p.email'=>array('label'=>"EMail", 'checked'=>1),
+ 'p.jabberid'=>array('label'=>"Jabber", 'checked'=>1, 'enabled'=>(! empty($conf->socialnetworks->enabled))),
'p.skype'=>array('label'=>"Skype", 'checked'=>1, 'enabled'=>(! empty($conf->socialnetworks->enabled))),
'p.twitter'=>array('label'=>"Twitter", 'checked'=>1, 'enabled'=>(! empty($conf->socialnetworks->enabled))),
'p.facebook'=>array('label'=>"Facebook", 'checked'=>1, 'enabled'=>(! empty($conf->socialnetworks->enabled))),
@@ -822,12 +823,19 @@ while ($i < min($num,$limit))
print ''.dol_print_email($obj->email,$obj->rowid,$obj->socid,'AC_EMAIL',18).' | ';
if (! $i) $totalarray['nbfield']++;
}
+
// Skype
if (! empty($arrayfields['p.skype']['checked']))
{
if (! empty($conf->socialnetworks->enabled)) { print ''.dol_print_socialnetworks($obj->skype,$obj->rowid,$obj->socid,'skype').' | '; }
if (! $i) $totalarray['nbfield']++;
}
+ // Jabber
+ if (! empty($arrayfields['p.jabberid']['checked']))
+ {
+ if (! empty($conf->socialnetworks->enabled)) { print ''.dol_print_socialnetworks($obj->jabberid,$obj->rowid,$obj->socid,'jabberid').' | '; }
+ if (! $i) $totalarray['nbfield']++;
+ }
// Twitter
if (! empty($arrayfields['p.twitter']['checked']))
{
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 0e4bee78afb..8942bcaabb3 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -620,14 +620,10 @@ abstract class CommonObject
{
if ($this->skype) $out.=dol_print_socialnetworks($this->skype,$this->id,$object->id,'skype');
$outdone++;
- }
- if (! empty($conf->socialnetworks->enabled))
- {
+ if ($this->jabberid) $out.=dol_print_socialnetworks($this->jabberid,$this->id,$object->id,'jabber');
+ $outdone++;
if ($this->twitter) $out.=dol_print_socialnetworks($this->twitter,$this->id,$object->id,'twitter');
$outdone++;
- }
- if (! empty($conf->socialnetworks->enabled))
- {
if ($this->facebook) $out.=dol_print_socialnetworks($this->facebook,$this->id,$object->id,'facebook');
$outdone++;
}
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 9cc9f315e82..f280825af08 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3010,7 +3010,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
if (empty($srconly) && in_array($pictowithoutext, array(
'bank', 'close_title', 'delete', 'edit', 'ellipsis-h', 'filter', 'grip', 'grip_title', 'list', 'listlight', 'off', 'on', 'play', 'playdisabled', 'printer', 'resize',
'note','switch_off', 'switch_on', 'unlink', 'uparrow', '1downarrow', '1uparrow',
- 'skype','twitter','facebook'
+ 'jabber','skype','twitter','facebook'
)
)) {
$fakey = $pictowithoutext;
@@ -3093,10 +3093,14 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
elseif ($pictowithoutext == 'playdisabled') {
$fakey = 'fa-play';
$facolor = '#ccc';
- } elseif ($pictowithoutext == 'play') {
+ }
+ elseif ($pictowithoutext == 'play') {
$fakey = 'fa-play';
$facolor = '#444';
}
+ elseif ($pictowithoutext == 'jabber') {
+ $fakey = 'fa-comment-o';
+ }
else {
$fakey = 'fa-'.$pictowithoutext;
$facolor = '#444';