From 3dd3693e7ccbd94213e19ef4523fcee97afac749 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sat, 6 Oct 2018 11:06:20 +0200 Subject: [PATCH] reduce linelength --- htdocs/datapolicies/admin/setupmail.php | 23 ++++++++----------- .../class/actions_datapolicies.class.php | 4 ++-- .../class/datapoliciescron.class.php | 1 + 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/htdocs/datapolicies/admin/setupmail.php b/htdocs/datapolicies/admin/setupmail.php index 4728298a09e..a6560c1f7d5 100644 --- a/htdocs/datapolicies/admin/setupmail.php +++ b/htdocs/datapolicies/admin/setupmail.php @@ -1,7 +1,8 @@ - * Copyright (C) 2018 Nicolas ZABOURI +/* Copyright (C) 2004-2017 Laurent Destailleur + * Copyright (C) 2018 Nicolas ZABOURI + * Copyright (C) 2018 Frédéric France * * 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 @@ -23,12 +24,8 @@ require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php'; require_once DOL_DOCUMENT_ROOT . '/core/class/html.formadmin.class.php'; require_once '../lib/datapolicies.lib.php'; -//require_once "../class/myclass.class.php"; // Translations -$langs->load('admin'); -$langs->load('companies'); -$langs->load('members'); -$langs->load('datapolicies@datapolicies'); +$langs->loadLangs(array('admin', 'companies', 'members', 'datapolicies')); // Parameters @@ -121,32 +118,32 @@ $linkr = 'TXTLINKDATAPOLICIESREFUSE_' . $l; $content = 'DATAPOLICIESCONTENT_' . $l; $acc = 'DATAPOLICIESACCEPT_' . $l; $ref = 'DATAPOLICIESREFUSE_' . $l; -print ''; +print ''; print $langs->trans('DATAPOLICIESSUBJECTMAIL') . ''; print ''; print ''; -print ''; +print ''; print $langs->trans('DATAPOLICIESCONTENTMAIL').''; print $langs->trans('DATAPOLICIESSUBSITUTION');echo'__LINKACCEPT__,__LINKREFUSED__,__FIRSTNAME__,__NAME__,__CIVILITY__'; $doleditor = new DolEditor($content, $conf->global->$content, '', 250, 'Full', '', false, true, 1, 200, 70); $doleditor->Create(); print ''; -print ''; +print ''; print $langs->trans('TXTLINKDATAPOLICIESACCEPT') . ''; print ''; print ''; -print ''; +print ''; print $langs->trans('TXTLINKDATAPOLICIESREFUSE') . ''; print ''; print ''; -print ''; +print ''; print $langs->trans('DATAPOLICIESACCEPT').''; $doleditor = new DolEditor($acc, $conf->global->$acc, '', 250, 'Full', '', false, true, 1, 200, 70); $doleditor->Create(); print ''; -print ''; +print ''; print $langs->trans('DATAPOLICIESREFUSE').''; print $langs->trans(''); diff --git a/htdocs/datapolicies/class/actions_datapolicies.class.php b/htdocs/datapolicies/class/actions_datapolicies.class.php index 49b7edd172d..839d3f8ae07 100644 --- a/htdocs/datapolicies/class/actions_datapolicies.class.php +++ b/htdocs/datapolicies/class/actions_datapolicies.class.php @@ -1,6 +1,6 @@ +/* Copyright (C) 2018 SuperAdmin + * Copyright (C) 2018 Frédéric France * * 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 diff --git a/htdocs/datapolicies/class/datapoliciescron.class.php b/htdocs/datapolicies/class/datapoliciescron.class.php index b85626f8c2a..0de8e0b0635 100644 --- a/htdocs/datapolicies/class/datapoliciescron.class.php +++ b/htdocs/datapolicies/class/datapoliciescron.class.php @@ -1,5 +1,6 @@ * * 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