lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #15566 from frederic34/mailingcard

Browse Source 
remove warnings
This commit is contained in:
Laurent Destailleur 2020-12-27 14:11:04 +01:00 committed by GitHub
commit 56ff2ef010
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 273 additions and 297 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

531
htdocs/comm/mailing/card.php
View File

File diff suppressed because it is too large Load Diff

20
htdocs/comm/mailing/class/mailing.class.php
View File

@ -118,36 +118,48 @@ class Mailing extends CommonObject
/** /**
* @var int id of user create * @var int id of user create
* @deprecated
*/ */
public $user_creation; public $user_creation;
/** /**
* @var int id of user create * @var int id of user create
* @deprecated
*/ */
public $user_creat; public $user_creat;
/** /**
* @var int id of user validate * @var int id of user validate
* @deprecated
*/ */
public $user_validation; public $user_validation;
/** /**
* @var int id of user validate * @var int id of user validate
* @deprecated
*/ */
public $user_valid; public $user_valid;
/** /**
* @var integer|string date_creation * @var integer|string date_creation
* @deprecated
*/ */
public $date_creat; public $date_creat;
/**
* @var integer|string date_creation
*/
public $date_creation;
/** /**
* @var int date validate * @var int date validate
* @deprecated
*/ */
public $date_valid; public $date_valid;
/**
* @var int date validate
*/
public $date_validation;
/** /**
* @var array extraparams * @var array extraparams
*/ */
@ -314,10 +326,14 @@ class Mailing extends CommonObject
$this->email_errorsto = $obj->email_errorsto; $this->email_errorsto = $obj->email_errorsto;
$this->user_creat = $obj->fk_user_creat; $this->user_creat = $obj->fk_user_creat;
$this->user_creation = $obj->fk_user_creat;
$this->user_valid = $obj->fk_user_valid; $this->user_valid = $obj->fk_user_valid;
$this->user_validation = $obj->fk_user_valid;
$this->date_creat = $this->db->jdate($obj->date_creat); $this->date_creat = $this->db->jdate($obj->date_creat);
$this->date_creation = $this->db->jdate($obj->date_creat);
$this->date_valid = $this->db->jdate($obj->date_valid); $this->date_valid = $this->db->jdate($obj->date_valid);
$this->date_validation = $this->db->jdate($obj->date_valid);
$this->date_envoi = $this->db->jdate($obj->date_envoi); $this->date_envoi = $this->db->jdate($obj->date_envoi);
$this->extraparams = (array) json_decode($obj->extraparams, true); $this->extraparams = (array) json_decode($obj->extraparams, true);

19
htdocs/comm/mailing/info.php
View File

@ -33,8 +33,9 @@ $id = GETPOST('id', 'int');
$langs->load("mails"); $langs->load("mails");
// Security check // Security check
if (!$user->rights->mailing->lire || $user->socid > 0) if (!$user->rights->mailing->lire || $user->socid > 0) {
accessforbidden(); accessforbidden();
}
@ -48,8 +49,7 @@ $form = new Form($db);
$object = new Mailing($db); $object = new Mailing($db);
if ($object->fetch($id) >= 0) if ($object->fetch($id) >= 0) {
{
$head = emailing_prepare_head($object); $head = emailing_prepare_head($object);
print dol_get_fiche_head($head, 'info', $langs->trans("Mailing"), -1, 'email'); print dol_get_fiche_head($head, 'info', $langs->trans("Mailing"), -1, 'email');
@ -58,13 +58,14 @@ if ($object->fetch($id) >= 0)
$morehtmlright = ''; $morehtmlright = '';
$nbtry = $nbok = 0; $nbtry = $nbok = 0;
if ($object->statut == 2 || $object->statut == 3) if ($object->statut == 2 || $object->statut == 3) {
{
$nbtry = $object->countNbOfTargets('alreadysent'); $nbtry = $object->countNbOfTargets('alreadysent');
$nbko = $object->countNbOfTargets('alreadysentko'); $nbko = $object->countNbOfTargets('alreadysentko');
$morehtmlright .= ' ('.$nbtry.'/'.$object->nbemail; $morehtmlright .= ' ('.$nbtry.'/'.$object->nbemail;
if ($nbko) $morehtmlright .= ' - '.$nbko.' '.$langs->trans("Error"); if ($nbko) {
$morehtmlright .= ' - '.$nbko.' '.$langs->trans("Error");
}
$morehtmlright .= ')   '; $morehtmlright .= ')   ';
} }
@ -73,10 +74,6 @@ if ($object->fetch($id) >= 0)
print '<div class="underbanner clearboth"></div><br>'; print '<div class="underbanner clearboth"></div><br>';
//print '<table width="100%"><tr><td>'; //print '<table width="100%"><tr><td>';
$object->user_creation = $object->user_creat;
$object->date_creation = $object->date_creat;
$object->user_validation = $object->user_valid;
$object->date_validation = $object->date_valid;
dol_print_object_info($object, 0); dol_print_object_info($object, 0);
//print '</td></tr></table>'; //print '</td></tr></table>';