diff --git a/htdocs/adherents/admin/adherent_extrafields.php b/htdocs/adherents/admin/adherent_extrafields.php
index b0996ba457d..d94686da7ef 100755
--- a/htdocs/adherents/admin/adherent_extrafields.php
+++ b/htdocs/adherents/admin/adherent_extrafields.php
@@ -117,7 +117,7 @@ dol_fiche_end();
if ($action != 'create' && $action != 'edit')
{
print '
';
- if ($object->statut > 0) print '
'.$langs->trans("AddSubscription")."";
- else print '
'.$langs->trans("AddSubscription").'';
+ if ($object->statut > 0) print '
";
+ else print '
';
print "
\n";
diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php
index 058894c5be9..dda805ec113 100644
--- a/htdocs/adherents/fiche.php
+++ b/htdocs/adherents/fiche.php
@@ -286,7 +286,7 @@ if ($action == 'update' && ! $_POST["cancel"] && $user->rights->adherent->creer)
$object->public = $_POST["public"];
// Fill array 'array_options' with data from add form
- $ret = $extrafields->setOptionalsFromPost($extralabels,$object);
+ $ret = $extrafields->setOptionalsFromPost($extralabels,$object);
// Check if we need to also synchronize user information
$nosyncuser=0;
@@ -458,7 +458,7 @@ if ($action == 'add' && $user->rights->adherent->creer)
$object->public = $public;
// Fill array 'array_options' with data from add form
- $ret = $extrafields->setOptionalsFromPost($extralabels,$object);
+ $ret = $extrafields->setOptionalsFromPost($extralabels,$object);
// Check parameters
if (empty($morphy) || $morphy == "-1") {
@@ -1528,11 +1528,11 @@ else
// Modify
if ($user->rights->adherent->creer)
{
- print "
".$langs->trans("Modify")."";
+ print '
";
}
else
{
- print "
trans("NotEnoughPermissions"))."\">".$langs->trans("Modify")."";
+ print '
'.$langs->trans("Modify").'
';
}
// Valider
@@ -1540,11 +1540,11 @@ else
{
if ($user->rights->adherent->creer)
{
- print "
".$langs->trans("Validate")."\n";
+ print '
\n";
}
else
{
- print "
trans("NotEnoughPermissions"))."\">".$langs->trans("Validate")."";
+ print '
'.$langs->trans("Validate").'
';
}
}
@@ -1553,11 +1553,11 @@ else
{
if ($user->rights->adherent->creer)
{
- print "
".$langs->trans("Reenable")."\n";
+ print '
\n";
}
else
{
- print "
trans("NotEnoughPermissions"))."\">".$langs->trans("Reenable")."";
+ print '
'.$langs->trans("Reenable")."
";
}
}
@@ -1566,17 +1566,17 @@ else
{
if ($object->statut >= 1)
{
- if ($object->email) print "
id&action=sendinfo\">".$langs->trans("SendCardByMail")."\n";
- else print "
trans("NoEMail"))."\">".$langs->trans("SendCardByMail")."\n";
+ if ($object->email) print '
\n";
+ else print '
\n";
}
else
{
- print "
trans("ValidateBefore"))."\">".$langs->trans("SendCardByMail")."";
+ print '
'.$langs->trans("SendCardByMail")."
";
}
}
else
{
- print "
trans("NotEnoughPermissions"))."\">".$langs->trans("SendCardByMail")."";
+ print '
'.$langs->trans("SendCardByMail")."
";
}
// Resilier
@@ -1584,11 +1584,11 @@ else
{
if ($user->rights->adherent->supprimer)
{
- print "
".$langs->trans("Resiliate")."\n";
+ print '
\n";
}
else
{
- print "
trans("NotEnoughPermissions"))."\">".$langs->trans("Resiliate")."";
+ print '
'.$langs->trans("Resiliate")."
";
}
}
@@ -1597,12 +1597,12 @@ else
{
if ($user->rights->societe->creer)
{
- if ($object->statut != -1) print '
id.'&action=create_thirdparty">'.$langs->trans("CreateDolibarrThirdParty").'';
- else print '
'.$langs->trans("CreateDolibarrThirdParty").'';
+ if ($object->statut != -1) print '
';
+ else print '
';
}
else
{
- print "
trans("NotEnoughPermissions"))."\">".$langs->trans("CreateDolibarrThirdParty")."";
+ print '
'.$langs->trans("CreateDolibarrThirdParty")."
";
}
}
@@ -1611,23 +1611,23 @@ else
{
if ($user->rights->user->user->creer)
{
- if ($object->statut != -1) print '
id.'&action=create_user">'.$langs->trans("CreateDolibarrLogin").'';
- else print '
'.$langs->trans("CreateDolibarrLogin").'';
+ if ($object->statut != -1) print '
';
+ else print '
';
}
else
{
- print "
trans("NotEnoughPermissions"))."\">".$langs->trans("CreateDolibarrLogin")."";
+ print '
'.$langs->trans("CreateDolibarrLogin")."
";
}
}
// Delete
if ($user->rights->adherent->supprimer)
{
- print "
id&action=delete\">".$langs->trans("Delete")."\n";
+ print '
\n";
}
else
{
- print "
trans("NotEnoughPermissions"))."\">".$langs->trans("Delete")."";
+ print '
'.$langs->trans("Delete")."
";
}
// Action SPIP
@@ -1637,21 +1637,22 @@ else
if ($isinspip == 1)
{
- print "
id&action=del_spip\">".$langs->trans("DeleteIntoSpip")."\n";
+ print '
\n";
}
if ($isinspip == 0)
{
- print "
id&action=add_spip\">".$langs->trans("AddIntoSpip")."\n";
- }
- if ($isinspip == -1)
- {
- print '
'.$langs->trans('SPIPConnectionFailed').': '.$mailmanspip->error.'';
+ print '
\n";
}
}
}
print '
';
+
+ if ($isinspip == -1)
+ {
+ print '