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

Checkstyle

Browse Source
This commit is contained in:
Laurent Destailleur 2012-07-04 12:01:45 +02:00
parent 59bd8ada73
commit df42899ecd
2 changed files with 57 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
scripts/emailings/cron-mailing-send.php
View File

@ -32,8 +32,8 @@ $path=dirname(__FILE__).'/';
// Test if batch mode // Test if batch mode
if (substr($sapi_type, 0, 3) == 'cgi') { if (substr($sapi_type, 0, 3) == 'cgi') {
echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n"; echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
exit; exit;
} }
require_once ($path."../../htdocs/master.inc.php"); require_once ($path."../../htdocs/master.inc.php");
@ -130,18 +130,18 @@ if ($resql)
$other4=$other[3]; $other4=$other[3];
$other5=$other[4]; $other5=$other[4];
$substitutionarray=array( $substitutionarray=array(
'__ID__' => $obj2->source_id, '__ID__' => $obj2->source_id,
'__EMAIL__' => $obj2->email, '__EMAIL__' => $obj2->email,
'__CHECK_READ__' => '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.$obj2->tag.'" width="1" height="1" style="width:1px;height:1px" border="0"/>', '__CHECK_READ__' => '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.$obj2->tag.'" width="1" height="1" style="width:1px;height:1px" border="0"/>',
'__UNSUSCRIBE__' => '<a href="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-unsubscribe.php?tag='.$obj2->tag.'&unsuscrib=1" target="_blank">'.$langs->trans("MailUnsubcribe").'</a>', '__UNSUSCRIBE__' => '<a href="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-unsubscribe.php?tag='.$obj2->tag.'&unsuscrib=1" target="_blank">'.$langs->trans("MailUnsubcribe").'</a>',
'__MAILTOEMAIL__' => '<a href="mailto:'.$obj2->email.'">'.$obj2->email.'</a>', '__MAILTOEMAIL__' => '<a href="mailto:'.$obj2->email.'">'.$obj2->email.'</a>',
'__LASTNAME__' => $obj2->lastname, '__LASTNAME__' => $obj2->lastname,
'__FIRSTNAME__' => $obj2->firstname, '__FIRSTNAME__' => $obj2->firstname,
'__OTHER1__' => $other1, '__OTHER1__' => $other1,
'__OTHER2__' => $other2, '__OTHER2__' => $other2,
'__OTHER3__' => $other3, '__OTHER3__' => $other3,
'__OTHER4__' => $other4, '__OTHER4__' => $other4,
'__OTHER5__' => $other5 '__OTHER5__' => $other5
); );
complete_substitutions_array($substitutionarray,$langs); complete_substitutions_array($substitutionarray,$langs);
@ -152,18 +152,18 @@ if ($resql)
// Fabrication du mail // Fabrication du mail
$mail = new CMailFile( $mail = new CMailFile(
$newsubject, $newsubject,
$sendto, $sendto,
$from, $from,
$newmessage, $newmessage,
array(), array(),
array(), array(),
array(), array(),
'', '',
'', '',
0, 0,
$msgishtml, $msgishtml,
$errorsto $errorsto
); );
if ($mail->error) if ($mail->error)

4
scripts/emailings/mailing-send.php
View File

@ -166,8 +166,8 @@ if ($resql)
array(), array(),
array(), array(),
array(), array(),
'', '',
'', '',
0, 0,
$msgishtml, $msgishtml,
$errorsto $errorsto