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 '
'; - print "".$langs->trans("NewAttribute").""; + print '
".$langs->trans("NewAttribute").'
'; print "
"; } diff --git a/htdocs/adherents/admin/adherent_type_extrafields.php b/htdocs/adherents/admin/adherent_type_extrafields.php index 6048bb684ef..416be0d9f63 100644 --- a/htdocs/adherents/admin/adherent_type_extrafields.php +++ b/htdocs/adherents/admin/adherent_type_extrafields.php @@ -118,7 +118,7 @@ dol_fiche_end(); if ($action != 'create' && $action != 'edit') { print '
'; - print "".$langs->trans("NewAttribute").""; + print '
".$langs->trans("NewAttribute").'
'; print "
"; } diff --git a/htdocs/adherents/agenda.php b/htdocs/adherents/agenda.php index 0a894f087b8..f6646f33349 100644 --- a/htdocs/adherents/agenda.php +++ b/htdocs/adherents/agenda.php @@ -139,9 +139,7 @@ if ($object->id > 0) if (! empty($conf->agenda->enabled)) { - // FIXME socid parameters is not valid, a member is not a thirparty - //print ''.$langs->trans("AddAction").''; - print ''.$langs->trans("AddAction").''; + print '
'.$langs->trans("AddAction").'
'; } print ''; diff --git a/htdocs/adherents/card_subscriptions.php b/htdocs/adherents/card_subscriptions.php index bed822274ed..6bef7622a2b 100644 --- a/htdocs/adherents/card_subscriptions.php +++ b/htdocs/adherents/card_subscriptions.php @@ -642,8 +642,8 @@ if ($rowid) { print '
'; - if ($object->statut > 0) print ''.$langs->trans("AddSubscription").""; - else print ''.$langs->trans("AddSubscription").''; + if ($object->statut > 0) print '
'.$langs->trans("AddSubscription")."
"; + else print '
'.$langs->trans("AddSubscription").'
'; 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 '
'.$langs->trans("Modify")."
"; } 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 '
'.$langs->trans("Validate")."
\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 '
'.$langs->trans("Reenable")."
\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 '
'.$langs->trans("SendCardByMail")."
\n"; + else print '
'.$langs->trans("SendCardByMail")."
\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 '
'.$langs->trans("Resiliate")."
\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 ''.$langs->trans("CreateDolibarrThirdParty").''; - else print ''.$langs->trans("CreateDolibarrThirdParty").''; + if ($object->statut != -1) print '
'.$langs->trans("CreateDolibarrThirdParty").'
'; + else print '
'.$langs->trans("CreateDolibarrThirdParty").'
'; } 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 ''.$langs->trans("CreateDolibarrLogin").''; - else print ''.$langs->trans("CreateDolibarrLogin").''; + if ($object->statut != -1) print '
'.$langs->trans("CreateDolibarrLogin").'
'; + else print '
'.$langs->trans("CreateDolibarrLogin").'
'; } 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 '
'.$langs->trans("Delete")."
\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 '
'.$langs->trans("DeleteIntoSpip")."
\n"; } if ($isinspip == 0) { - print "id&action=add_spip\">".$langs->trans("AddIntoSpip")."\n"; - } - if ($isinspip == -1) - { - print '

'.$langs->trans('SPIPConnectionFailed').': '.$mailmanspip->error.''; + print '
'.$langs->trans("AddIntoSpip")."
\n"; } } } print '
'; + + if ($isinspip == -1) + { + print '

'.$langs->trans('SPIPConnectionFailed').': '.$mailmanspip->error.''; + } print "
\n"; } diff --git a/htdocs/adherents/fiche_subscription.php b/htdocs/adherents/fiche_subscription.php index 65f3544d99a..ba322457eea 100644 --- a/htdocs/adherents/fiche_subscription.php +++ b/htdocs/adherents/fiche_subscription.php @@ -371,18 +371,18 @@ if ($rowid && $action != 'edit') { if (! $bankline->rappro) { - print "id."&action=edit\">".$langs->trans("Modify").""; + print '
".$langs->trans("Modify")."
"; } else { - print "trans("BankLineConciliated")."\" href=\"#\">".$langs->trans("Modify").""; + print '
".$langs->trans("Modify")."
"; } } // Supprimer if ($user->rights->adherent->cotisation->creer) { - print "id."&action=delete\">".$langs->trans("Delete")."\n"; + print '
".$langs->trans("Delete")."
\n"; } print ''; diff --git a/htdocs/adherents/ldap.php b/htdocs/adherents/ldap.php index 86667b20122..5d33432c067 100644 --- a/htdocs/adherents/ldap.php +++ b/htdocs/adherents/ldap.php @@ -169,7 +169,7 @@ print '
'; if (! empty($conf->global->LDAP_MEMBER_ACTIVE) && $conf->global->LDAP_MEMBER_ACTIVE != 'ldap2dolibarr') { - print ''.$langs->trans("ForceSynchronize").''; + print '
'.$langs->trans("ForceSynchronize").'
'; } print "
\n"; diff --git a/htdocs/adherents/note.php b/htdocs/adherents/note.php index 35c8d40b8b8..c021ab5a373 100644 --- a/htdocs/adherents/note.php +++ b/htdocs/adherents/note.php @@ -167,7 +167,7 @@ if ($id) if ($user->rights->adherent->creer && $action != 'edit') { - print "id."&action=edit\">".$langs->trans('Modify').""; + print '
'.$langs->trans('Modify')."
"; } print ""; diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php index 72fc3cc2a37..deb32ce29d0 100644 --- a/htdocs/adherents/type.php +++ b/htdocs/adherents/type.php @@ -86,7 +86,7 @@ if ($action == 'add' && $user->rights->adherent->configurer) $adht->note = trim($_POST["comment"]); $adht->mail_valid = trim($_POST["mail_valid"]); $adht->vote = trim($_POST["vote"]); - + // Fill array 'array_options' with data from add form $ret = $extrafields->setOptionalsFromPost($extralabels,$adht); @@ -126,7 +126,7 @@ if ($action == 'update' && $user->rights->adherent->configurer) // Fill array 'array_options' with data from add form $ret = $extrafields->setOptionalsFromPost($extralabels,$adht); - + $adht->update($user->id); header("Location: ".$_SERVER["PHP_SELF"]."?rowid=".$_POST["rowid"]); @@ -218,7 +218,7 @@ if (! $rowid && $action != 'create' && $action != 'edit') // New type if ($user->rights->adherent->configurer) { - print ''.$langs->trans("NewType").''; + print '
'.$langs->trans("NewType").'
'; } print ""; @@ -264,7 +264,7 @@ if ($action == 'create') $doleditor=new DolEditor('mail_valid',$adht->mail_valid,'',280,'dolibarr_notes','',false,true,$conf->fckeditor->enabled,15,90); $doleditor->Create(); print ''; - + // Other attributes $parameters=array(); $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$act,$action); // Note that $action and $object may have been modified by hook @@ -273,7 +273,7 @@ if ($action == 'create') print $adht->showOptionals($extrafields,'edit'); } print "\n"; - + print '
'; print '
    '; print '
'; @@ -352,16 +352,16 @@ if ($rowid > 0) // Edit if ($user->rights->adherent->configurer) { - print ''.$langs->trans("Modify").''; + print '
'.$langs->trans("Modify").'
'; } // Add - print ''.$langs->trans("AddMember").''; + print '
'.$langs->trans("AddMember").'
'; // Delete if ($user->rights->adherent->configurer) { - print ''.$langs->trans("DeleteType").''; + print '
'.$langs->trans("DeleteType").'
'; } print ""; @@ -370,7 +370,7 @@ if ($rowid > 0) // Show list of members (nearly same code than in page liste.php) $membertypestatic=new AdherentType($db); - + $now=dol_now(); $sql = "SELECT d.rowid, d.login, d.firstname, d.lastname, d.societe, "; @@ -662,13 +662,13 @@ if ($rowid > 0) $doleditor=new DolEditor('mail_valid',$adht->mail_valid,'',280,'dolibarr_notes','',false,true,$conf->fckeditor->enabled,15,90); $doleditor->Create(); print ""; - + // Other attributes $parameters=array(); $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$act,$action); // Note that $action and $object may have been modified by hook print ''; - + //Extra field if (empty($reshook) && ! empty($extrafields->attribute_label)) { diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php index 55a8a8b8b60..a3696b7a24d 100644 --- a/htdocs/admin/company.php +++ b/htdocs/admin/company.php @@ -997,7 +997,7 @@ else // Actions buttons print '
'; - print ''.$langs->trans("Modify").''; + print '
'.$langs->trans("Modify").'
'; print '
'; print '
'; diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php index 2851e55dfd9..7eb136047db 100644 --- a/htdocs/comm/action/fiche.php +++ b/htdocs/comm/action/fiche.php @@ -397,7 +397,7 @@ if ($action == 'create') } dol_set_focus("#label"); - + if (! empty($conf->use_javascript_ajax)) { print "\n".'