From d12e3ca91fee9a149b8904bc2369bfb6d2aaed5d Mon Sep 17 00:00:00 2001 From: aspangaro 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 @@ - - * - * 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 . - */ - -/** - * \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 = '' . $langs->trans("BackToModuleList") . ''; -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 ''; -print ''; -print ''; -print "\n"; - -$var = ! $var; - -print ''; -print ''; -print ''; -print ''; - -print ''; -print ''; -print ''; -print ''; - -print ''; -print ''; -print ''; -print ''; - -print "
' . $langs->trans('Parameters') . '
' . $langs->trans("SkypeDeactivateInUser") . ''; -if ($conf->use_javascript_ajax) -{ - print ajax_constantonoff('SKYPE_DEACTIVATE_IN_USER'); -} -else -{ - if (empty($conf->global->SKYPE_DEACTIVATE_IN_USER)) - { - print ''.img_picto($langs->trans("Disabled"),'switch_off').''; - } - else - { - print ''.img_picto($langs->trans("Enabled"),'switch_on').''; - } -} -print '
' . $langs->trans("SkypeDeactivateInContact") . ''; -if ($conf->use_javascript_ajax) -{ - print ajax_constantonoff('SKYPE_DEACTIVATE_IN_CONTACT'); -} -else -{ - if (empty($conf->global->SKYPE_DEACTIVATE_IN_CONTACT)) - { - print ''.img_picto($langs->trans("Disabled"),'switch_off').''; - } - else - { - print ''.img_picto($langs->trans("Enabled"),'switch_on').''; - } -} -print '
' . $langs->trans("SkypeDeactivateInMember") . ''; -if ($conf->use_javascript_ajax) -{ - print ajax_constantonoff('SKYPE_DEACTIVATE_IN_MEMBER'); -} -else -{ - if (empty($conf->global->SKYPE_DEACTIVATE_IN_MEMBER)) - { - print ''.img_picto($langs->trans("Disabled"),'switch_off').''; - } - else - { - print ''.img_picto($langs->trans("Enabled"),'switch_on').''; - } -} -print '
\n"; - -dol_fiche_end(); - -print ''; - -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 * 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).''; } - // Skype - if (! empty($conf->skype->enabled)) - { - print ''.$langs->trans("Skype").''.dol_print_skype($object->skype,0,$object->fk_soc,1).''; - } - print ''.$langs->trans("ContactVisibility").''; print $object->LibPubPriv($object->priv); print ''; 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?'
':'').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 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!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>k zQaMpT3yMsK*rz%$==4zvytFMVC|kz_56lo{Bm<#07E&q#eZK#O^87YhQ3K$y-+vWW zLNN�zeV_^b!oW*AFsPvCIF_TPk^(q7ypxdv#)P`KECTy${@R!?EN zUAAzsUHCwN)h@%bK6>Wh0DKZF{-%%zKbgQ!B&tp(aoDGFucz{j=X1v4ORrAcAjht@ zr&hJ2*Q-x2nB$qMk!z6*Dp zXTNexW$~eTZTz}@27*(8^u2+lboY?NQ+s1F`KQpym9=D5W01L9rZn6Ynge1NFG|=Z7ejX*!6y7aWzN z$z6vWFCZ?(l&Bw@ Q+zU-2UQaXqsjL0i--u!+zyJUM literal 989 zcmV<310wv1P)YNnVG5Vx^9`2`6MFI4Gif9;hU98K1dHmm{Ek4MK_`7hH2%hrMb7r zG)RJcs0g}9V&-jkb|%dtR@c=mHNXC6_E;h7S})STZws5UU@@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#{a1d0}86b^|ZS^1#1oA); zNOU8&2*iWIak)#gQD32VtRy){6p`ZAeo8DCNx0ZbDG$3T|CODRYPu-own!SI47_(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~Eit5833J)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>54kALdQJRHH?%s{AW@Fr4aj8h1%-l`J?93f! zZrn|veJG-c50*X%K9uT%2%-rDqtGA@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~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<0rB5~s%>ymcF%D^s3s*nAOWG>aSf7e+xI8%V zZl<@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)OjjZWj%nWF5NFOY=Ce$ zWQ&{oX=H4i^iM_m5N&_ls)@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*%!&!KPb3-PIR3~BWqWU}efhDn63gW+kU-+*^ge;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`80000office_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 ''.$langs->trans("Skype").''; - print ''.dol_print_skype($object->skype,0,0,1).''; - print "\n"; - } - // Signature print ''.$langs->trans('Signature').''; print dol_htmlentitiesbr($object->signature);