From 5a4b5dcc2682e40970f7ee6537ba191edabff8a0 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 14 Dec 2013 14:21:27 +0100 Subject: [PATCH] Fix: Missing condition --- htdocs/adherents/fiche.php | 37 +++++++++++++++++++++---------------- htdocs/admin/modules.php | 2 +- 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php index 399cc7122971b..0847af47624da 100644 --- a/htdocs/adherents/fiche.php +++ b/htdocs/adherents/fiche.php @@ -285,7 +285,7 @@ $object->phone_perso = trim($_POST["phone_perso"]); $object->phone_mobile= trim($_POST["phone_mobile"]); $object->email = trim($_POST["email"]); - $object->skype = trim($_POST["skype"]); + $object->skype = trim($_POST["skype"]); $object->birth = $birthdate; $object->typeid = $_POST["typeid"]; @@ -428,7 +428,7 @@ $phone=$_POST["phone"]; $phone_perso=$_POST["phone_perso"]; $phone_mobile=$_POST["phone_mobile"]; - $skype=$_POST["member_skype"]; + $skype=$_POST["member_skype"]; $email=$_POST["member_email"]; $login=$_POST["member_login"]; $pass=$_POST["password"]; @@ -453,7 +453,7 @@ $object->phone = $phone; $object->phone_perso = $phone_perso; $object->phone_mobile= $phone_mobile; - $object->skype = $skype; + $object->skype = $skype; $object->email = $email; $object->login = $login; $object->pass = $pass; @@ -861,11 +861,11 @@ function initfieldrequired() // Tel mobile print ''.$langs->trans("PhoneMobile").''; - // Skype - if (! empty($conf->skype->enabled)) - { - print ''.$langs->trans("Skype").''; - } + // Skype + if (! empty($conf->skype->enabled)) + { + print ''.$langs->trans("Skype").''; + } // Birthday print "".$langs->trans("Birthday")."\n"; @@ -1103,10 +1103,11 @@ function initfieldrequired() // Tel mobile print ''.$langs->trans("PhoneMobile").'phone_mobile).'">'; - // Skype - if (! empty($conf->skype->enabled)) { - print ''.$langs->trans("Skype").'skype).'">'; - } + // Skype + if (! empty($conf->skype->enabled)) + { + print ''.$langs->trans("Skype").'skype).'">'; + } // Birthday print "".$langs->trans("Birthday")."\n"; @@ -1327,7 +1328,7 @@ function initfieldrequired() /* * Confirm add in spip - */ + */ if ($action == 'add_spip') { print $form->formconfirm("fiche.php?rowid=".$rowid, $langs->trans('AddIntoSpip'), $langs->trans('AddIntoSpipConfirmation'), 'confirm_add_spip'); @@ -1335,7 +1336,7 @@ function initfieldrequired() /* * Confirm removed from spip - */ + */ if ($action == 'del_spip') { print $form->formconfirm("fiche.php?rowid=$rowid", $langs->trans('DeleteIntoSpip'), $langs->trans('DeleteIntoSpipConfirmation'), 'confirm_del_spip'); @@ -1344,6 +1345,7 @@ function initfieldrequired() $rowspan=17; if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) $rowspan++; if (! empty($conf->societe->enabled)) $rowspan++; + if (! empty($conf->skype->enabled)) $rowspan++; print ''; @@ -1426,8 +1428,11 @@ function initfieldrequired() // Tel mobile print ''; - // Skype - print ''; + // Skype + if (! empty($conf->skype->enabled)) + { + print ''; + } // Birthday print ''; diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php index 0b0c9db4f1724..7c3b1f6c47915 100644 --- a/htdocs/admin/modules.php +++ b/htdocs/admin/modules.php @@ -159,7 +159,7 @@ if ($objMod->version == 'experimental' && (empty($conf->global->$const_name) && ($conf->global->MAIN_FEATURES_LEVEL < 1))) $modulequalified=0; // We discard modules according to property disabled if (isset($objMod->hidden) && $objMod->hidden) $modulequalified=false; - + // Define array $categ with categ with at least one qualified module if ($modulequalified) {
'.$langs->trans("PhoneMobile").''.dol_print_phone($object->phone_mobile,$object->country_code,0,$object->fk_soc,1).'
'.$langs->trans("Skype").''.dol_print_skype($object->skype,0,$object->fk_soc,1).'
'.$langs->trans("Skype").''.dol_print_skype($object->skype,0,$object->fk_soc,1).'
'.$langs->trans("Birthday").''.dol_print_date($object->birth,'day').'