diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php index f998c2f08a3..503eddfbbb7 100644 --- a/htdocs/adherents/card.php +++ b/htdocs/adherents/card.php @@ -1400,7 +1400,6 @@ else $rowspan=17; if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) $rowspan++; if (! empty($conf->societe->enabled)) $rowspan++; - if (! empty($conf->skype->enabled)) $rowspan++; $linkback = ''.$langs->trans("BackToList").''; @@ -1445,12 +1444,6 @@ else print ''; } - // Skype - if (! empty($conf->skype->enabled)) - { - print ''.$langs->trans("Skype").''.dol_print_skype($object->skype,0,$object->fk_soc,1).''; - } - print ''; print ''; diff --git a/htdocs/adherents/card_subscriptions.php b/htdocs/adherents/card_subscriptions.php index 9d86f618618..38c6f254bda 100644 --- a/htdocs/adherents/card_subscriptions.php +++ b/htdocs/adherents/card_subscriptions.php @@ -610,12 +610,6 @@ if ($rowid > 0) print ''; } - // Skype - if (! empty($conf->skype->enabled)) - { - print ''.$langs->trans("Skype").''.dol_print_skype($object->skype,0,$object->fk_soc,1).''; - } - print ''; print ''; diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php index af708ef2f20..e2fc32f3bcb 100644 --- a/htdocs/adherents/type.php +++ b/htdocs/adherents/type.php @@ -242,15 +242,14 @@ if ($action == 'create') print '
'; print ''; + print ''; dol_fiche_head(''); print ''; print ''; - print ''; - - print ''; + print ''; print ''; } - // Skype - if (! empty($conf->skype->enabled)) - { - print ''; - } - print ''; diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 388f51e7dc5..bba17f50d11 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -9,6 +9,7 @@ * Copyright (C) 2012-2015 Marcos García * Copyright (C) 2012-2015 Raphaël Doursenaud * Copyright (C) 2012 Cedric Salvador + * Copyright (C) 2015 Alexandre Spangaro * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -529,7 +530,9 @@ abstract class CommonObject } if (! empty($conf->skype->enabled)) { - if ($this->skype) $out.=($outdone?'
':'').dol_print_skype($this->skype,$this->id,$object->id,'AC_SKYPE'); + $out.='
'; + if ($this->skype) $out.=dol_print_skype($this->skype,$this->id,$object->id,'AC_SKYPE'); + $outdone++; } $out.=''; diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index e9251da148e..82d5c52c575 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -1520,14 +1520,18 @@ function dol_print_skype($skype,$cid=0,$socid=0,$addlink=0,$max=64) if (! empty($addlink)) { - $newskype='trans("Call").' '.$skype.'" title="'.$langs->trans("Call").' '.$skype.'">'; - $newskype.=''; - $newskype.='    '; + $newskype.='   '; - $newskype.=''; + $newskype.=''; $newskype.=''; if (($cid || $socid) && ! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create) diff --git a/htdocs/core/modules/modSkype.class.php b/htdocs/core/modules/modSkype.class.php index 280b871e475..d6017b06c16 100644 --- a/htdocs/core/modules/modSkype.class.php +++ b/htdocs/core/modules/modSkype.class.php @@ -42,8 +42,8 @@ class modSkype extends DolibarrModules $this->db = $db; $this->numero = 3100; - // Family can be 'crm','financial','hr','projects','products','ecm','technic','other' - // It is used to group modules in module setup page + // Family can be 'crm','financial','hr','projects','products','ecm','technic','other' + // It is used to group modules in module setup page $this->family = "crm"; // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module) $this->name = preg_replace('/^mod/i','',get_class($this)); diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index b497bb45fc7..232eb3e573f 100755 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -540,7 +540,7 @@ Module2800Desc=FTP Client Module2900Name=GeoIPMaxmind Module2900Desc=GeoIP Maxmind conversions capabilities Module3100Name=Skype -Module3100Desc=Add a Skype button into card of adherents / third parties / contacts +Module3100Desc=Add a Skype button into card of users / third parties / contacts / members Module4000Name=HRM Module4000Desc=Human resources management Module5000Name=Multi-company diff --git a/htdocs/theme/common/skype_callbutton.png b/htdocs/theme/common/skype_callbutton.png index dd76442627a..ceccf2858d2 100644 Binary files a/htdocs/theme/common/skype_callbutton.png and b/htdocs/theme/common/skype_callbutton.png differ diff --git a/htdocs/theme/common/skype_chatbutton.png b/htdocs/theme/common/skype_chatbutton.png index 750b49fa221..d8135bb85a5 100644 Binary files a/htdocs/theme/common/skype_chatbutton.png and b/htdocs/theme/common/skype_chatbutton.png differ diff --git a/htdocs/user/card.php b/htdocs/user/card.php index 62c2e5c9498..9cd92248b87 100644 --- a/htdocs/user/card.php +++ b/htdocs/user/card.php @@ -193,7 +193,7 @@ if (empty($reshook)) { $object->office_phone = GETPOST("office_phone", 'alpha'); $object->office_fax = GETPOST("office_fax", 'alpha'); $object->user_mobile = GETPOST("user_mobile"); - $object->skype = GETPOST("skype"); + $object->skype = GETPOST("skype", 'alpha'); $object->email = GETPOST("email", 'alpha'); $object->job = GETPOST("job", 'alpha'); $object->signature = GETPOST("signature"); @@ -330,7 +330,7 @@ if (empty($reshook)) { $object->office_phone = GETPOST("office_phone", 'alpha'); $object->office_fax = GETPOST("office_fax", 'alpha'); $object->user_mobile = GETPOST("user_mobile"); - $object->skype = GETPOST("skype"); + $object->skype = GETPOST("skype", 'alpha'); $object->email = GETPOST("email", 'alpha'); $object->job = GETPOST("job", 'alpha'); $object->signature = GETPOST("signature"); @@ -1325,14 +1325,6 @@ else print ''."\n"; } - // Skype - if (! empty($conf->skype->enabled)) - { - print ''; - print ''; - print "\n"; - } - // Signature print '
'.$langs->trans("Label").'
'.$langs->trans("Label").'
'.$langs->trans("SubscriptionRequired").''; print $form->selectyesno("cotisation",1,1); diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php index e49b52b8a90..8022c17de67 100644 --- a/htdocs/contact/card.php +++ b/htdocs/contact/card.php @@ -5,7 +5,7 @@ * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2007 Franky Van Liedekerke * Copyright (C) 2013 Florian Henry - * Copyright (C) 2013 Alexandre Spangaro + * Copyright (C) 2013-2015 Alexandre Spangaro * Copyright (C) 2014 Juanjo Menent * Copyright (C) 2015 Jean-François Ferry * @@ -1156,12 +1156,6 @@ else print '
'.$langs->trans("No_Email").''.yn($object->no_email).'
'.$langs->trans("Skype").''.dol_print_skype($object->skype,0,$object->fk_soc,1).'
'.$langs->trans("ContactVisibility").''; print $object->LibPubPriv($object->priv); print '
'.$langs->trans("Skype").''.dol_print_skype($object->skype,0,0,1).'
'.$langs->trans('Signature').''; print dol_htmlentitiesbr($object->signature);