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 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 ''.$langs->trans("Skype").''; - print ''.dol_print_skype($object->skype,0,0,1).''; - print "\n"; - } - // Signature print ''.$langs->trans('Signature').''; print dol_htmlentitiesbr($object->signature);