From d12e3ca91fee9a149b8904bc2369bfb6d2aaed5d Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Sat, 28 Nov 2015 14:43:16 +0100
Subject: [PATCH] Finish work on better integration of skype
---
htdocs/admin/skype.php | 162 -----------------------
htdocs/contact/card.php | 8 +-
htdocs/core/class/commonobject.class.php | 4 +-
htdocs/core/lib/functions.lib.php | 12 +-
htdocs/core/modules/modSkype.class.php | 2 +-
htdocs/langs/en_US/admin.lang | 7 +-
htdocs/theme/common/skype_callbutton.png | Bin 989 -> 1377 bytes
htdocs/theme/common/skype_chatbutton.png | Bin 916 -> 1244 bytes
htdocs/user/card.php | 12 +-
9 files changed, 16 insertions(+), 191 deletions(-)
delete mode 100644 htdocs/admin/skype.php
diff --git a/htdocs/admin/skype.php b/htdocs/admin/skype.php
deleted file mode 100644
index db942beb8ad..00000000000
--- a/htdocs/admin/skype.php
+++ /dev/null
@@ -1,162 +0,0 @@
-<?php
-/* Copyright (C) 2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
- *
- * 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
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * \file htdocs/admin/skype.php
- * \ingroup Skype
- * \brief Skype module setup page
- */
-require('../main.inc.php');
-require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-
-$langs->load("admin");
-
-if (! $user->admin) accessforbidden();
-
-/*
- * Actions
- */
-if (preg_match('/set_(.*)/',$action,$reg))
-{
- $code=$reg[1];
- $value=(GETPOST($code) ? GETPOST($code) : 1);
- if (dolibarr_set_const($db, $code, $value, 'chaine', 0, '', $conf->entity) > 0)
- {
- Header("Location: ".$_SERVER["PHP_SELF"]);
- exit;
- }
- else
- {
- dol_print_error($db);
- }
-}
-
-else if (preg_match('/del_(.*)/',$action,$reg))
-{
- $code=$reg[1];
- if (dolibarr_del_const($db, $code, $conf->entity) > 0)
- {
- Header("Location: ".$_SERVER["PHP_SELF"]);
- exit;
- }
- else
- {
- dol_print_error($db);
- }
-}
-
-/*
- * View
- */
-$help_url='';
-llxHeader('', $langs->trans('Parameters'));
-
-$linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php">' . $langs->trans("BackToModuleList") . '</a>';
-print load_fiche_titre($langs->trans("SkypeSetup"), $linkback);
-
-$var=true;
-$form = new Form($db);
-
-// Configuration header
-$h = 0;
-$head = array ();
-
-$head[$h][0] = dol_buildpath('/admin/skype.php', 1);
-$head[$h][1] = $langs->trans("Configuration");
-$head[$h][2] = 'parameters';
-$h ++;
-
-dol_fiche_head($head, 'parameters', $langs->trans("Skype"), 0, "skype");
-
-print '<table class="noborder" width="100%">';
-print '<tr class="liste_titre">';
-print '<td colspan="3">' . $langs->trans('Parameters') . '</td>';
-print "</tr>\n";
-
-$var = ! $var;
-
-print '<tr ' . $bc[$var] . '>';
-print '<td>' . $langs->trans("SkypeDeactivateInUser") . '</td>';
-print '<td align="left">';
-if ($conf->use_javascript_ajax)
-{
- print ajax_constantonoff('SKYPE_DEACTIVATE_IN_USER');
-}
-else
-{
- if (empty($conf->global->SKYPE_DEACTIVATE_IN_USER))
- {
- print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_SKYPE_DEACTIVATE_IN_USER">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
- }
- else
- {
- print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_SKYPE_DEACTIVATE_IN_USER">'.img_picto($langs->trans("Enabled"),'switch_on').'</a>';
- }
-}
-print '</td>';
-print '</tr>';
-
-print '<tr ' . $bc[$var] . '>';
-print '<td>' . $langs->trans("SkypeDeactivateInContact") . '</td>';
-print '<td align="left">';
-if ($conf->use_javascript_ajax)
-{
- print ajax_constantonoff('SKYPE_DEACTIVATE_IN_CONTACT');
-}
-else
-{
- if (empty($conf->global->SKYPE_DEACTIVATE_IN_CONTACT))
- {
- print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_SKYPE_DEACTIVATE_IN_CONTACT">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
- }
- else
- {
- print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_SKYPE_DEACTIVATE_IN_CONTACT">'.img_picto($langs->trans("Enabled"),'switch_on').'</a>';
- }
-}
-print '</td>';
-print '</tr>';
-
-print '<tr ' . $bc[$var] . '>';
-print '<td>' . $langs->trans("SkypeDeactivateInMember") . '</td>';
-print '<td align="left">';
-if ($conf->use_javascript_ajax)
-{
- print ajax_constantonoff('SKYPE_DEACTIVATE_IN_MEMBER');
-}
-else
-{
- if (empty($conf->global->SKYPE_DEACTIVATE_IN_MEMBER))
- {
- print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_SKYPE_DEACTIVATE_IN_MEMBER">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
- }
- else
- {
- print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_SKYPE_DEACTIVATE_IN_MEMBER">'.img_picto($langs->trans("Enabled"),'switch_on').'</a>';
- }
-}
-print '</td>';
-print '</tr>';
-
-print "</table>\n";
-
-dol_fiche_end();
-
-print '</form>';
-
-llxFooter();
-$db->close();
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 <regis.houssin@capnetworks.com>
* Copyright (C) 2007 Franky Van Liedekerke <franky.van.liedekerke@telenet.be>
* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
- * Copyright (C) 2013 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2013-2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2014 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
*
@@ -1156,12 +1156,6 @@ else
print '<tr><td>'.$langs->trans("No_Email").'</td><td>'.yn($object->no_email).'</td></tr>';
}
- // Skype
- if (! empty($conf->skype->enabled))
- {
- print '<tr><td>'.$langs->trans("Skype").'</td><td>'.dol_print_skype($object->skype,0,$object->fk_soc,1).'</td></tr>';
- }
-
print '<tr><td>'.$langs->trans("ContactVisibility").'</td><td>';
print $object->LibPubPriv($object->priv);
print '</td></tr>';
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 9cb9a3d45ab..bba17f50d11 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -530,7 +530,9 @@ abstract class CommonObject
}
if (! empty($conf->skype->enabled))
{
- if ($this->skype) $out.=($outdone?'<br>':'').dol_print_skype($this->skype,$this->id,$object->id,'AC_SKYPE');
+ $out.='<div style="clear: both;"></div>';
+ if ($this->skype) $out.=dol_print_skype($this->skype,$this->id,$object->id,'AC_SKYPE');
+ $outdone++;
}
$out.='<!-- END Part to show address block -->';
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='<a href="skype:';
+ $newskype =img_picto($langs->trans("Skype"), 'object_skype.png');
+ $newskype.= ' ';
+ $newskype.=dol_trunc($skype,$max);
+ $newskype.= ' ';
+ $newskype.='<a href="skype:';
$newskype.=dol_trunc($skype,$max);
$newskype.='?call" alt="'.$langs->trans("Call").' '.$skype.'" title="'.$langs->trans("Call").' '.$skype.'">';
- $newskype.='<img src="../theme/common/skype_callbutton.png" border="0">';
- $newskype.='</a> <a href="skype:';
+ $newskype.='<img src="'.DOL_URL_ROOT.'/theme/common/skype_callbutton.png" border="0">';
+ $newskype.='</a> <a href="skype:';
$newskype.=dol_trunc($skype,$max);
$newskype.='?chat" alt="'.$langs->trans("Chat").' '.$skype.'" title="'.$langs->trans("Chat").' '.$skype.'">';
- $newskype.='<img src="../theme/common/skype_chatbutton.png" border="0">';
+ $newskype.='<img src="'.DOL_URL_ROOT.'/theme/common/skype_chatbutton.png" border="0">';
$newskype.='</a>';
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 2c7686d9349..d6017b06c16 100644
--- a/htdocs/core/modules/modSkype.class.php
+++ b/htdocs/core/modules/modSkype.class.php
@@ -61,7 +61,7 @@ class modSkype extends DolibarrModules
// Config pages
//-------------
- $this->config_page_url = array("skype.php");
+ $this->config_page_url = array();
// Dependancies
//-------------
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index fff2ea5c32f..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
@@ -1249,11 +1249,6 @@ AddSubscriptionIntoAccount=Suggest by default to create a bank transaction, in b
AdherentLoginRequired= Manage a Login for each member
AdherentMailRequired=EMail required to create a new member
MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
-##### Skype setup #####
-SkypeSetup=Skype module setup
-SkypeDeactivateInUser=Deactivate Skype in user card
-SkypeDeactivateInContact=Deactivate Skype in contact card
-SkypeDeactivateInMember=Deactivate Skype in member card
##### LDAP setup #####
LDAPSetup=LDAP Setup
LDAPGlobalParameters=Global parameters
diff --git a/htdocs/theme/common/skype_callbutton.png b/htdocs/theme/common/skype_callbutton.png
index dd76442627a8c261aef378eb4df40442c8a9f1a2..ceccf2858d2cc06e1dbeeefeda95a6ed3f3b19af 100644
GIT binary patch
literal 1377
zcmb_bZ%i9y9KJbcpkZp9ACxaUZ;9&>`sYe}wPy>oy~3JNY}z7ZW(h~{1uk%ZygO_Q
zX36$#nhh3olp%qL%MzRh_MwGt-HMx=LS-g)&PgJsi!w3lrzI{~#J7wxKUhEc=DmCW
z<awUo^LyXld)(jLxLZ@HK@eoO_W&J$<FkdYY$yC{b<YIh@S^HzQ-fls8ewFBI9ag+
zpkAKo0s+9Vu{Xa2b_CgpaiKP~&DTVQMPAPoF#0GjK{kTe>!K19?g1*=0lGNBf&Fpu
z3Wjp518cSTj6TT?y14`WG6?oJhr<0mVH=Cp)uQ$&1qFDZGH8_V6%;D!z&3R$I4^7)
zFmw~5_BgOdrrLad)Gf*YwdiYfVIx7HB&jFN7Lp{YQInA{8H})#I>Jm@NXleIw;Bec
z$!sSTpc}Sg!IcB+R#k~I7$T8~K2oC><t_tZv)Kw7CX)^#bV^K6nW#=s_7xRqpoC>k
zQaMpT3yMsK*rz%$==4zvytFMVC|kz_56lo{Bm<#07E&q#eZK#O^87YhQ3K$y-+vWW
zLNN�zeV_<S@Lr&V7YY66KZwql$7!6nl%O=<gO)QRx;X)Ey*IZ7V0RVno3=@jf5r
z6%>^b!oW*AFsPvCIF_<HU1sAePTFR%*$Bd8vC&q7CS5gdV*_C$tVEGZi{U;V2x^hb
zKIVE#ato!vOE5AGWbQ4%Hpn86Zl+9erM<XH>TPk^(q7ypxdv#)P`KECTy${@R!?EN
zUAAzsUHCwN)h@%bK6>Wh0DKZF{-%%zKbgQ!B&tp(aoDGFucz{j=X1v4ORrAcAjht@
zr&hJ2*Q-x2nB$qMk<XY*dGl=Ea_-i#?0PVLuXbvw?xSolxyq#T#Hl%QCa)d6fe$9f
zZ~u-D&Ap%dZSdy$k?gO*3*X^`^Z0Pu7QgH}`$hGs`Kl8Md~nVZUpSgwXHq}xpSW2S
zzjipY#xAUJsTJ+mqW-<Kc05}<yNVB83?x_IxUyzEooW3rL!SGF8cB!dex#>!z6*Dp
zXTNexW$~eTZTz}@27*(8^u2+lb<cEeV`C$zDPM+ZdeuO45HA0hhE$YIv_R2OFYOFP
zzYi_9Jbksk;>oY?NQ+s1F`KQpym9=D5W01L<USjFivDT;?2ca&>9rZn6Ynge<uA3H
z{7BiKN7{Eh$iI6ybge_W``UQ6W$CZag@?oZ2kzcOEqmm>1NFG|=Z7ejX*!6y7aWzN
z$z6vW<?Q6Qw_VdKU9Cg)OPT7(gXhnW*e8YXCz{DUFTZ`aq4DEb<#Xv>FCZ?(l&Bw@
Q+zU-2UQaXqsjL0i--u!+zyJUM
literal 989
zcmV<310wv1P)<h;3K|Lk000e1NJLTq001Wd000mO1^@s6mE2|^000A|Nkl<ZNXN~U
zTSyd97{|xFRZ>YNnVG5Vx^9`2`6MFI4Gif9;hU98K1dHmm{Ek4MK_`7hH2%hrMb7r
zG)RJcs0g}9V&-jkb|%dtR@c=mHNXC6_E;h7S})STZ<v{LzBxb6_nmWuXoDnxCE&cq
zAT?@@QoTwqrAJiT)-s~>ws5UU@@M@tuD;U-yDe55q_@kAGQ}7rnpa^ZpIe>er?Ze>
zsfA|hEPYGv+HS>~q@;iNaX3f;n?M}!nWFzna2y2k*nDt+HI!);F`0xLousO^(f$`-
z=t6TJ6*Sr@^-(u@-?UI@rRaz=%Nx{Fi|q$?FbswOfvhQFvUtBpkj$SQELEdS&Kt9o
za8ITd`*&j382!FZz3HU@os}Z=wqDGxW|9HCKq>!mA)k#{a1d<e?UTvv1Y;nC#|;2U
zK#lbVmRl*P%tCE_!-~v4%v@OEd)i`_e+i~N?jfP5onp;$F#>0}86b^|ZS^1#1oA);
zNOU8&2*iWIak)#gQD32VtRy){6p`ZAeo8DCNx0ZbDG$3T|CODRYPu-own!SI<V2u$
z!k|pH0n~aBivbqU1oWUAWb?Lkw{l2pu3B$ng-`42x~O~5CHM`r_K(noCI=;$KVXqq
zXqibSjcax`PZ)SU=m94^$c2IJJaz0{#{@jevHDn!L6>47_(LEbsmw!K&Ef#rhej3A
zk6%Y=2h!?$vr`d7%*F`=F94sx*(nO2^*h4FUUMdwLxE?`LCwWrMl6mIs*wjN;95Hg
zg)OMD4l-K@6v3)?Cke$J6s4Eg>?ONN>oZ{RAhw35wFTS&_rY_Ia;UjT)ZCb=%0^#?
zekdYWnjI8VW~Eit5<UI&Rryx%+D^jt4pwtaZm*lccku<0>833J)PedxzOlW`>TyBf
z=8FMOdm&}(9(0k|KTH#^`{E!4SBMmRM;uRU?j&2ubuM@fWPluC2B}=8m)Bhi@8{&P
zIsBcSR7w1KO!+Zt&L5j=tx(cIT7!*_ytI?9%}H0^IcRsoXPS#y48+M1hka1(3S8?U
zeTTp+Far9)J-)gFc`Dh)T+U@r@EBGmm3(2Tc>87LhbpkbEc<{HIJT@TeXPC|N;+v_
zrARm(#>EZ;@4q<0*wzv1<~!Tp=KSs1DzGC7wI?h$%7WG;M`Mxff$$l$9mSbjgtjMY
zSIuNk_rd>54kALdQJRH<kHfcZY|DUX23GPpJRbwAr&SL1{@?NwL8EVFti?ju00000
LNkvXXu0mjf{6f+Q
diff --git a/htdocs/theme/common/skype_chatbutton.png b/htdocs/theme/common/skype_chatbutton.png
index 750b49fa2213b1ac6bf9cc8c0e9b6e51253ecf85..d8135bb85a50e5b8a1d459a81365a0b1039df613 100644
GIT binary patch
literal 1244
zcmbVLU1$_n6rN%pf)KTR5Px2V3Guf(v$L6*IAb>H?%s{AW@Fr4aj8h1%-l`J?93f!
zZrn|veJG-c50*X%K9uT%2%-rDqtG<?hn5s7TA>A@H6%uiX(M7ZX=<|GNwR4lLJGai
z%>9}3ecw6fo^!IXVMp2Wb;~J=DvRv|2{Nzp-qK~{yUDjQNv5?pn#M_#!8z4|R7gin
zkdB#ZGfY5LZ$Huxt0`((#z>`cI$p16$YfQ|hRvHcK~q$9ZQfS3R*2~)*lbuq=4I~<
zhBovdvtNw+<8}nL7&|*0nCxgsX&tSatTVMWbah@K1SZ5Poj0?VtK@^sEU!Y=-Z96}
zvnIGT$jmvFjyKW~<Um?vD}9=u=V?h|c|nvU{$o1e=L4LdJd%$W6j4$FRrLH|h?=8k
zlmw`o*CM+h(}J<Ba9l2zV{?@(a+*0_mSvA45bzNTpWAL>HSe?B@*)F(uI3mvHjqVo
zjA|2V!$F34Iv0Xz$KwmcmOGy)k}@u@+8odNIn(swnzeRu0{-L1qSkJz-G*EOx~R?3
z$bDqWi(rzwrG-30;*GM$G03H;S%9=Q6IwV1f(-e?>V~cWSq#XsD99mMjEX!j1Heb+
zaEO;=!5<0<MUKU=ycDjA0Er;wI-ZY;Az7#bfy$^D2EsNF@)xl&%f+gt!J@7~bmy@|
zdI_u&aiEHklR_w4tboQAgpu2VY&w#Z=uP_#OGi0(vv)mn(E{igN1<NlAd{ZWuVO5s
z|KD-XVfFu$GmbdJdByRsVksVx3iOr>rB5~s%>ymcF%D^s3s*nAOWG>aSf7e+xI8%V
zZl<<pnC%)$^gTa(Z**(t&?nc1?~P1sygb<dVsd(>@Z;#DuWP7tVEob8U%kU`y9eKF
zzB2gP?HA*J&wO!zjO!Y@GBAGT*H_0LysYUNzB@8;@YcxQzUNZ+)2Znhq5El}P*}0=
z`fH-d;6y``Y?mHX*@HVrh;=pwLaF@Y?CBjVZu(10KKP;Hr;)y?!ngJN^aE$tmzVS&
zsvg*L?%CITzgQFg@cXa61I$1KTr9oGY>OJFetDAaTz@`yC-tQM(X@2pV7E~5d!KyV
x{^sGXOLd0>+m+Ry|8ex>Z_a@~uLVoiP>;8KbZ)Bl=iNk?ibWehXZX;U?*XFs&Ncu5
literal 916
zcmV;F18e+=P)<h;3K|Lk000e1NJLTq001oj000mO1^@s6g8ugD000A9Nkl<ZNXONd
zSx8h-7{_lal@^*=;;7?NE@|};5eWrtRFp40NKgcAFG6oY_0UR2frv?&^x{&cj_C+S
zJ2FXGp@t6$k?YKz+$PP;y<EQj=l0#{AUc}#paVZR=X__*{mpm3bIvGH#dd|+1+IWo
zz*`!hbLfq9K+zzg$WEb!YFD61Z3s50jjN07nHb+Yi^T)LMi3&6?FaGyL;AE3UR&~o
z0t#&8nbS<hLX~38c8bIg@V;*)p9fYE&zs?*%Rr4-Q{oZF>OjjZWj%nWF5NFOY=Ce$
zWQ&{oX=H4i^iM_m5N&_ls)<LN?Zwk994tx3fl#mooZ$FNP&rHK1`wr7Qv`6!ZlY3K
zzb5+3K0t}(4k~XOa>@r4sDzRcLVH{++zQ^ih`$B-zz<}Ba}(k|;5^6y2YAer_nCP1
zHE>W2mW87XmZA)7eIuISQ3xx^pGZmlOhw3i$KWWfL-_>aZD9WEDTLyAVRskOx!@x(
z0|(D9;g}o0g?`Y%v6H|H^nr0OAQB@cpNYf-kL+ejtL<@Sc4%~*a_jpjp{#>^bFJi;
zXVdB)^T#+N6NQq%&uLz99?OJre>eA+^N%%7SdX|ZV&B0gy*%!&!KPb<Y%3Y{wBt!D
zRd)O>3-PIR3~BWqWU}efhDn63gW+kU-+*^ge<f!zP8v%AFMt&^N^e0(Z`P$RhCNiZ
zqb|Fyml7*FNx5B5BKwCd4r=K6rHNmt`bJ7-qmcdqmP{gaT*}N;SU|bd59Rd?youXD
zDc5d_B<;o0TXpFe12PzbdeuMsp0|;5tB#cPda|?(YGaqHg>;ji>8MGB7PIs{7t*gd
z+j>77^h))vO0i>761=#cW97@G${nXiQcbs0+|fJYY^!J+P0rIpux$#dog5b%Et1b{
zu|cnLycRS`^CNk_ID^k}TV#EMbjFK$3%Gql#I-Nuoc2de4|`+79Y#q!RR^>aqx$PG
zUHZ^X(I_3U5o65Gg^Vt;8OL&6e37(+n;c68cci%nuHOLem+<$>c#mXAbC2+|Yn=~+
z(0bHy#X{VO?paORO}Gec1#NLt#{M}u1Zgw84E*`^|LY|Z;v(h?R!kO1fP6mwb6BuB
qU-G%y$v0B+ocP0plAU+VOX=SQUsKZw{}G`80000<MNUMnLSTYW@wD;)
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 '</td></tr>'."\n";
}
- // Skype
- if (! empty($conf->skype->enabled))
- {
- print '<tr><td>'.$langs->trans("Skype").'</td>';
- print '<td>'.dol_print_skype($object->skype,0,0,1).'</td>';
- print "</tr>\n";
- }
-
// Signature
print '<tr><td class="tdtop">'.$langs->trans('Signature').'</td><td>';
print dol_htmlentitiesbr($object->signature);
--
GitLab