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

Qual: Factorize code

Browse Source
This commit is contained in:
Laurent Destailleur 2009-05-04 18:38:01 +00:00
parent 4759b06d2b
commit ce47ff029d
7 changed files with 322 additions and 333 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

584
htdocs/admin/mails.php
View File

@ -32,7 +32,7 @@ $langs->load("admin");
$langs->load("mails"); $langs->load("mails");
if (!$user->admin) if (!$user->admin)
accessforbidden(); accessforbidden();
$substitutionarrayfortest=array( $substitutionarrayfortest=array(
'__ID__' => 'TESTIdRecord', '__ID__' => 'TESTIdRecord',
@ -43,8 +43,8 @@ $substitutionarrayfortest=array(
/* /*
* Actions * Actions
*/ */
if (isset($_POST["action"]) && $_POST["action"] == 'update') if (isset($_POST["action"]) && $_POST["action"] == 'update')
{ {
@ -72,26 +72,26 @@ if ($_POST['addfile'] || $_POST['addfilehtml'])
if (! empty($_FILES['addedfile']['tmp_name'])) if (! empty($_FILES['addedfile']['tmp_name']))
{ {
if (! is_dir($upload_dir)) create_exdir($upload_dir); if (! is_dir($upload_dir)) create_exdir($upload_dir);
if (is_dir($upload_dir)) if (is_dir($upload_dir))
{ {
if (dol_move_uploaded_file($_FILES['addedfile']['tmp_name'], $upload_dir . "/" . $_FILES['addedfile']['name'],0) > 0) if (dol_move_uploaded_file($_FILES['addedfile']['tmp_name'], $upload_dir . "/" . $_FILES['addedfile']['name'],0) > 0)
{ {
$message = '<div class="ok">'.$langs->trans("FileTransferComplete").'</div>'; $message = '<div class="ok">'.$langs->trans("FileTransferComplete").'</div>';
//print_r($_FILES); //print_r($_FILES);
include_once(DOL_DOCUMENT_ROOT.'/html.formmail.class.php'); include_once(DOL_DOCUMENT_ROOT.'/html.formmail.class.php');
$formmail = new FormMail($db); $formmail = new FormMail($db);
$formmail->add_attached_files($upload_dir . "/" . $_FILES['addedfile']['name'],$_FILES['addedfile']['name'],$_FILES['addedfile']['type']); $formmail->add_attached_files($upload_dir . "/" . $_FILES['addedfile']['name'],$_FILES['addedfile']['name'],$_FILES['addedfile']['type']);
} }
else else
{ {
// Echec transfert (fichier d<>passant la limite ?) // Echec transfert (fichier d<>passant la limite ?)
$message = '<div class="error">'.$langs->trans("ErrorFileNotUploaded").'</div>'; $message = '<div class="error">'.$langs->trans("ErrorFileNotUploaded").'</div>';
// print_r($_FILES); // print_r($_FILES);
} }
} }
} }
if ($_POST['addfile']) $_GET["action"]='test'; if ($_POST['addfile']) $_GET["action"]='test';
if ($_POST['addfilehtml']) $_GET["action"]='testhtml'; if ($_POST['addfilehtml']) $_GET["action"]='testhtml';
@ -101,7 +101,7 @@ if ($_POST['addfile'] || $_POST['addfilehtml'])
* Send mail * Send mail
*/ */
if (($_POST['action'] == 'send' || $_POST['action'] == 'sendhtml') if (($_POST['action'] == 'send' || $_POST['action'] == 'sendhtml')
&& ! $_POST['addfile'] && ! $_POST['addfilehtml'] && ! $_POST['cancel']) && ! $_POST['addfile'] && ! $_POST['addfilehtml'] && ! $_POST['cancel'])
{ {
$error=0; $error=0;
@ -122,9 +122,9 @@ if (($_POST['action'] == 'send' || $_POST['action'] == 'sendhtml')
$formmail = new FormMail($db); $formmail = new FormMail($db);
$attachedfiles=$formmail->get_attached_files(); $attachedfiles=$formmail->get_attached_files();
$filepath = $attachedfiles['paths']; $filepath = $attachedfiles['paths'];
$filename = $attachedfiles['names']; $filename = $attachedfiles['names'];
$mimetype = $attachedfiles['mimes']; $mimetype = $attachedfiles['mimes'];
if (empty($_POST["frommail"])) if (empty($_POST["frommail"]))
{ {
@ -138,41 +138,41 @@ if (($_POST['action'] == 'send' || $_POST['action'] == 'sendhtml')
$_GET["action"]='test'; $_GET["action"]='test';
$error++; $error++;
} }
if (! $error) if (! $error)
{ {
// Le message est-il en html // Le message est-il en html
$msgishtml=0; // Message is not HTML $msgishtml=0; // Message is not HTML
if ($_POST['action'] == 'sendhtml') $msgishtml=1; // Force message to HTML if ($_POST['action'] == 'sendhtml') $msgishtml=1; // Force message to HTML
// Pratique les substitutions sur le sujet et message // Pratique les substitutions sur le sujet et message
$subject=make_substitutions($subject,$substitutionarrayfortest); $subject=make_substitutions($subject,$substitutionarrayfortest);
$body=make_substitutions($body,$substitutionarrayfortest); $body=make_substitutions($body,$substitutionarrayfortest);
require_once(DOL_DOCUMENT_ROOT."/lib/CMailFile.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/CMailFile.class.php");
$mailfile = new CMailFile($subject,$sendto,$email_from,$body, $mailfile = new CMailFile($subject,$sendto,$email_from,$body,
$filepath,$mimetype,$filename, $filepath,$mimetype,$filename,
$sendtocc, $sendtoccc, $deliveryreceipt, $msgishtml,$errors_to); $sendtocc, $sendtoccc, $deliveryreceipt, $msgishtml,$errors_to);
$result=$mailfile->sendfile(); $result=$mailfile->sendfile();
if ($result) if ($result)
{ {
$message='<div class="ok">'.$langs->trans("MailSuccessfulySent",$email_from,$sendto).'</div>'; $message='<div class="ok">'.$langs->trans("MailSuccessfulySent",$email_from,$sendto).'</div>';
} }
else else
{ {
$message='<div class="error">'.$langs->trans("ResultKo").'<br>'.$mailfile->error.' '.$result.'</div>'; $message='<div class="error">'.$langs->trans("ResultKo").'<br>'.$mailfile->error.' '.$result.'</div>';
} }
$_GET["action"]=''; $_GET["action"]='';
} }
} }
/* /*
* View * View
*/ */
$linuxlike=1; $linuxlike=1;
if (eregi('^win',PHP_OS)) $linuxlike=0; if (eregi('^win',PHP_OS)) $linuxlike=0;
@ -203,30 +203,30 @@ if ($message) print $message.'<br>';
if (isset($_GET["action"]) && $_GET["action"] == 'edit') if (isset($_GET["action"]) && $_GET["action"] == 'edit')
{ {
$html=new Form($db); $html=new Form($db);
print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">'; print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
print '<input type="hidden" name="action" value="update">'; print '<input type="hidden" name="action" value="update">';
clearstatcache(); clearstatcache();
$var=true; $var=true;
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>'; print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
// Disable // Disable
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_DISABLE_ALL_MAILS").'</td><td>'; print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_DISABLE_ALL_MAILS").'</td><td>';
print $html->selectyesno('MAIN_DISABLE_ALL_MAILS',$conf->global->MAIN_DISABLE_ALL_MAILS,1); print $html->selectyesno('MAIN_DISABLE_ALL_MAILS',$conf->global->MAIN_DISABLE_ALL_MAILS,1);
print '</td></tr>'; print '</td></tr>';
// Method // Method
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_SENDMODE").'</td><td>'; print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_SENDMODE").'</td><td>';
$listofmethods=array(); $listofmethods=array();
$listofmethods['mail']='PHP mail function'; $listofmethods['mail']='PHP mail function';
$listofmethods['smtps']='SMTP/SMTPS socket library'; $listofmethods['smtps']='SMTP/SMTPS socket library';
// SuperAdministrator access only // SuperAdministrator access only
if ((!$conf->global->MAIN_MODULE_MULTICOMPANY) || ($conf->global->MAIN_MODULE_MULTICOMPANY && $user->admin && !$user->entity)) if ((empty($conf->global->MAIN_MODULE_MULTICOMPANY)) || ($user->admin && !$user->entity))
{ {
print $html->select_array('MAIN_MAIL_SENDMODE',$listofmethods,$conf->global->MAIN_MAIL_SENDMODE); print $html->select_array('MAIN_MAIL_SENDMODE',$listofmethods,$conf->global->MAIN_MAIL_SENDMODE);
} }
@ -236,189 +236,189 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit')
elseif ($conf->global->MAIN_MAIL_SENDMODE == 'smtps') $text = 'SMTPS library'; elseif ($conf->global->MAIN_MAIL_SENDMODE == 'smtps') $text = 'SMTPS library';
else { $text = $langs->trans("Undefined"); } else { $text = $langs->trans("Undefined"); }
$htmltext = $langs->trans("ContactSuperAdminForChange"); $htmltext = $langs->trans("ContactSuperAdminForChange");
print $html->textwithredstar($text,$htmltext); print $html->textwithpicto($text,$htmltext,1,0,'superadmin');
} }
print '</td></tr>'; print '</td></tr>';
// Server
$var=!$var;
print '<tr '.$bc[$var].'><td>';
if ($linuxlike && $conf->global->MAIN_MAIL_SENDMODE == 'mail')
{
print $langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike");
print '</td><td>';
print $langs->trans("SeeLocalSendMailSetup");
}
else
{
$smtpserver = ini_get('SMTP')?ini_get('SMTP'):$langs->transnoentities("Undefined");
print $langs->trans("MAIN_MAIL_SMTP_SERVER",$smtpserver);
print '</td><td>';
// SuperAdministrator access only
if ((!$conf->global->MAIN_MODULE_MULTICOMPANY) || ($conf->global->MAIN_MODULE_MULTICOMPANY && $user->admin && !$user->entity))
{
print '<input class="flat" name="MAIN_MAIL_SMTP_SERVER" size="18" value="' . $conf->global->MAIN_MAIL_SMTP_SERVER . '">';
}
else
{
$text = $conf->global->MAIN_MAIL_SMTP_SERVER ? $conf->global->MAIN_MAIL_SMTP_SERVER : $smtpserver;
$htmltext = $langs->trans("ContactSuperAdminForChange");
print $html->textwithredstar($conf->global->MAIN_MAIL_SMTP_SERVER,$htmltext);
}
}
print '</td></tr>';
// Port // Server
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'><td>'; print '<tr '.$bc[$var].'><td>';
if ($linuxlike && $conf->global->MAIN_MAIL_SENDMODE == 'mail') if ($linuxlike && $conf->global->MAIN_MAIL_SENDMODE == 'mail')
{ {
print $langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike"); print $langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike");
print '</td><td>'; print '</td><td>';
print $langs->trans("SeeLocalSendMailSetup"); print $langs->trans("SeeLocalSendMailSetup");
} }
else else
{ {
$smtpport = ini_get('smtp_port')?ini_get('smtp_port'):$langs->transnoentities("Undefined"); $smtpserver = ini_get('SMTP')?ini_get('SMTP'):$langs->transnoentities("Undefined");
print $langs->trans("MAIN_MAIL_SMTP_PORT",$smtpport); print $langs->trans("MAIN_MAIL_SMTP_SERVER",$smtpserver);
print '</td><td>'; print '</td><td>';
// SuperAdministrator access only // SuperAdministrator access only
if ((!$conf->global->MAIN_MODULE_MULTICOMPANY) || ($conf->global->MAIN_MODULE_MULTICOMPANY && $user->admin && !$user->entity)) if ((empty($conf->global->MAIN_MODULE_MULTICOMPANY)) || ($user->admin && !$user->entity))
{ {
print '<input class="flat" name="MAIN_MAIL_SMTP_PORT" size="3" value="' . $conf->global->MAIN_MAIL_SMTP_PORT . '">'; print '<input class="flat" name="MAIN_MAIL_SMTP_SERVER" size="18" value="' . $conf->global->MAIN_MAIL_SMTP_SERVER . '">';
} }
else else
{ {
$text = $conf->global->MAIN_MAIL_SMTP_PORT ? $conf->global->MAIN_MAIL_SMTP_PORT : $smtpport; $text = $conf->global->MAIN_MAIL_SMTP_SERVER ? $conf->global->MAIN_MAIL_SMTP_SERVER : $smtpserver;
$htmltext = $langs->trans("ContactSuperAdminForChange"); $htmltext = $langs->trans("ContactSuperAdminForChange");
print $html->textwithredstar($text,$htmltext); print $html->textwithpicto($text,$htmltext,1,0,'superadmin');
} }
} }
print '</td></tr>'; print '</td></tr>';
// ID
if ($conf->global->MAIN_MAIL_SENDMODE == 'smtps')
{
$var=!$var;
print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_SMTPS_ID").'</td><td>';
// SuperAdministrator access only
if ((!$conf->global->MAIN_MODULE_MULTICOMPANY) || ($conf->global->MAIN_MODULE_MULTICOMPANY && $user->admin && !$user->entity))
{
print '<input class="flat" name="MAIN_MAIL_SMTPS_ID" size="32" value="' . $conf->global->MAIN_MAIL_SMTPS_ID . '">';
}
else
{
$htmltext = $langs->trans("ContactSuperAdminForChange");
print $html->textwithredstar($conf->global->MAIN_MAIL_SMTPS_ID,$htmltext);
}
print '</td></tr>';
}
// PW // Port
if ($conf->global->MAIN_MAIL_SENDMODE == 'smtps') $var=!$var;
{ print '<tr '.$bc[$var].'><td>';
$var=!$var; if ($linuxlike && $conf->global->MAIN_MAIL_SENDMODE == 'mail')
print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_SMTPS_PW").'</td><td>'; {
// SuperAdministrator access only print $langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike");
if ((!$conf->global->MAIN_MODULE_MULTICOMPANY) || ($conf->global->MAIN_MODULE_MULTICOMPANY && $user->admin && !$user->entity)) print '</td><td>';
{ print $langs->trans("SeeLocalSendMailSetup");
print '<input class="flat" name="MAIN_MAIL_SMTPS_PW" size="32" value="' . $conf->global->MAIN_MAIL_SMTPS_PW . '">'; }
} else
else {
{ $smtpport = ini_get('smtp_port')?ini_get('smtp_port'):$langs->transnoentities("Undefined");
$htmltext = $langs->trans("ContactSuperAdminForChange"); print $langs->trans("MAIN_MAIL_SMTP_PORT",$smtpport);
print $html->textwithredstar($conf->global->MAIN_MAIL_SMTPS_PW,$htmltext); print '</td><td>';
} // SuperAdministrator access only
print '</td></tr>'; if ((empty($conf->global->MAIN_MODULE_MULTICOMPANY)) || ($user->admin && !$user->entity))
} {
print '<input class="flat" name="MAIN_MAIL_SMTP_PORT" size="3" value="' . $conf->global->MAIN_MAIL_SMTP_PORT . '">';
}
else
{
$text = $conf->global->MAIN_MAIL_SMTP_PORT ? $conf->global->MAIN_MAIL_SMTP_PORT : $smtpport;
$htmltext = $langs->trans("ContactSuperAdminForChange");
print $html->textwithpicto($text,$htmltext,1,0,'superadmin');
}
}
print '</td></tr>';
// From // ID
$var=!$var; if ($conf->global->MAIN_MAIL_SENDMODE == 'smtps')
print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_EMAIL_FROM",ini_get('sendmail_from')?ini_get('sendmail_from'):$langs->transnoentities("Undefined")).'</td><td><input class="flat" name="MAIN_MAIL_EMAIL_FROM" size="32" value="' . $conf->global->MAIN_MAIL_EMAIL_FROM . '"></td></tr>'; {
$var=!$var;
print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_SMTPS_ID").'</td><td>';
// SuperAdministrator access only
if ((empty($conf->global->MAIN_MODULE_MULTICOMPANY)) || ($user->admin && !$user->entity))
{
print '<input class="flat" name="MAIN_MAIL_SMTPS_ID" size="32" value="' . $conf->global->MAIN_MAIL_SMTPS_ID . '">';
}
else
{
$htmltext = $langs->trans("ContactSuperAdminForChange");
print $html->textwithpicto($conf->global->MAIN_MAIL_SMTPS_ID,$htmltext,1,0,'superadmin');
}
print '</td></tr>';
}
print '</table>'; // PW
if ($conf->global->MAIN_MAIL_SENDMODE == 'smtps')
{
$var=!$var;
print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_SMTPS_PW").'</td><td>';
// SuperAdministrator access only
if ((empty($conf->global->MAIN_MODULE_MULTICOMPANY)) || ($user->admin && !$user->entity))
{
print '<input class="flat" name="MAIN_MAIL_SMTPS_PW" size="32" value="' . $conf->global->MAIN_MAIL_SMTPS_PW . '">';
}
else
{
$htmltext = $langs->trans("ContactSuperAdminForChange");
print $html->textwithpicto($conf->global->MAIN_MAIL_SMTPS_PW,$htmltext,1,0,'superadmin');
}
print '</td></tr>';
}
print '<br><center>'; // From
print '<input class="button" type="submit" value="'.$langs->trans("Save").'">'; $var=!$var;
print '</center>'; print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_EMAIL_FROM",ini_get('sendmail_from')?ini_get('sendmail_from'):$langs->transnoentities("Undefined")).'</td><td><input class="flat" name="MAIN_MAIL_EMAIL_FROM" size="32" value="' . $conf->global->MAIN_MAIL_EMAIL_FROM . '"></td></tr>';
print '</form>'; print '</table>';
print '<br>';
print '<br><center>';
print '<input class="button" type="submit" value="'.$langs->trans("Save").'">';
print '</center>';
print '</form>';
print '<br>';
} }
else else
{ {
$var=true; $var=true;
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>'; print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
// Disable // Disable
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_DISABLE_ALL_MAILS").'</td><td>'.yn($conf->global->MAIN_DISABLE_ALL_MAILS).'</td></tr>'; print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_DISABLE_ALL_MAILS").'</td><td>'.yn($conf->global->MAIN_DISABLE_ALL_MAILS).'</td></tr>';
// Method // Method
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_SENDMODE").'</td><td>'; print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_SENDMODE").'</td><td>';
if ($conf->global->MAIN_MAIL_SENDMODE == 'mail') print 'PHP mail function'; if ($conf->global->MAIN_MAIL_SENDMODE == 'mail') print 'PHP mail function';
elseif ($conf->global->MAIN_MAIL_SENDMODE == 'smtps') print 'SMTPS library'; elseif ($conf->global->MAIN_MAIL_SENDMODE == 'smtps') print 'SMTPS library';
else { print $langs->trans("Undefined"); } else { print $langs->trans("Undefined"); }
print '</td></tr>'; print '</td></tr>';
// Server // Server
$var=!$var; $var=!$var;
if ($linuxlike && $conf->global->MAIN_MAIL_SENDMODE == 'mail') if ($linuxlike && $conf->global->MAIN_MAIL_SENDMODE == 'mail')
{ {
print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike").'</td><td>'.$langs->trans("SeeLocalSendMailSetup").'</td></tr>'; print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike").'</td><td>'.$langs->trans("SeeLocalSendMailSetup").'</td></tr>';
} }
else else
{ {
print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_SMTP_SERVER",ini_get('SMTP')?ini_get('SMTP'):$langs->transnoentities("Undefined")).'</td><td>'.$conf->global->MAIN_MAIL_SMTP_SERVER.'</td></tr>'; print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_SMTP_SERVER",ini_get('SMTP')?ini_get('SMTP'):$langs->transnoentities("Undefined")).'</td><td>'.$conf->global->MAIN_MAIL_SMTP_SERVER.'</td></tr>';
} }
// Port // Port
$var=!$var; $var=!$var;
if ($linuxlike && $conf->global->MAIN_MAIL_SENDMODE == 'mail') if ($linuxlike && $conf->global->MAIN_MAIL_SENDMODE == 'mail')
{ {
print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike").'</td><td>'.$langs->trans("SeeLocalSendMailSetup").'</td></tr>'; print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike").'</td><td>'.$langs->trans("SeeLocalSendMailSetup").'</td></tr>';
} }
else else
{ {
print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_SMTP_PORT",ini_get('smtp_port')?ini_get('smtp_port'):$langs->transnoentities("Undefined")).'</td><td>'.$conf->global->MAIN_MAIL_SMTP_PORT.'</td></tr>'; print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_SMTP_PORT",ini_get('smtp_port')?ini_get('smtp_port'):$langs->transnoentities("Undefined")).'</td><td>'.$conf->global->MAIN_MAIL_SMTP_PORT.'</td></tr>';
} }
// SMTPS ID // SMTPS ID
$var=!$var; $var=!$var;
if ($conf->global->MAIN_MAIL_SENDMODE == 'smtps') if ($conf->global->MAIN_MAIL_SENDMODE == 'smtps')
{ {
print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_SMTPS_ID").'</td><td>'.$conf->global->MAIN_MAIL_SMTPS_ID.'</td></tr>'; print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_SMTPS_ID").'</td><td>'.$conf->global->MAIN_MAIL_SMTPS_ID.'</td></tr>';
} }
// SMTPS PW // SMTPS PW
$var=!$var; $var=!$var;
if ($conf->global->MAIN_MAIL_SENDMODE == 'smtps') if ($conf->global->MAIN_MAIL_SENDMODE == 'smtps')
{ {
print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_SMTPS_PW").'</td><td>'.$conf->global->MAIN_MAIL_SMTPS_PW.'</td></tr>'; print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_SMTPS_PW").'</td><td>'.$conf->global->MAIN_MAIL_SMTPS_PW.'</td></tr>';
} }
// From // From
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_EMAIL_FROM",ini_get('sendmail_from')?ini_get('sendmail_from'):$langs->transnoentities("Undefined")).'</td><td>'.$conf->global->MAIN_MAIL_EMAIL_FROM.'</td></tr>'; print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_MAIL_EMAIL_FROM",ini_get('sendmail_from')?ini_get('sendmail_from'):$langs->transnoentities("Undefined")).'</td><td>'.$conf->global->MAIN_MAIL_EMAIL_FROM.'</td></tr>';
print '</table>'; print '</table>';
// Boutons actions // Boutons actions
print '<div class="tabsAction">'; print '<div class="tabsAction">';
if (! $linuxlike) if (! $linuxlike)
{ {
if (function_exists('fsockopen') && $port && $server) if (function_exists('fsockopen') && $port && $server)
{ {
print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=testconnect">'.$langs->trans("DoTestServerAvailability").'</a>'; print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=testconnect">'.$langs->trans("DoTestServerAvailability").'</a>';
} }
} }
else else
{ {
print '<a class="butActionRefused" href="#" title="'.$langs->trans("FeatureNotAvailableOnLinux").'">'.$langs->trans("DoTestServerAvailability").'</a>'; print '<a class="butActionRefused" href="#" title="'.$langs->trans("FeatureNotAvailableOnLinux").'">'.$langs->trans("DoTestServerAvailability").'</a>';
} }
print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=test&amp;mode=init">'.$langs->trans("DoTestSend").'</a>'; print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=test&amp;mode=init">'.$langs->trans("DoTestSend").'</a>';
if ($conf->fckeditor->enabled) if ($conf->fckeditor->enabled)
@ -426,117 +426,117 @@ else
print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=testhtml&amp;mode=init">'.$langs->trans("DoTestSendHTML").'</a>'; print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=testhtml&amp;mode=init">'.$langs->trans("DoTestSendHTML").'</a>';
} }
print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>'; print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>';
print '</div>'; print '</div>';
// Affichage formulaire de TEST // Affichage formulaire de TEST
if ($_GET["action"] == 'testconnect') if ($_GET["action"] == 'testconnect')
{ {
print '<br>'; print '<br>';
print_titre($langs->trans("DoTestServerAvailability")); print_titre($langs->trans("DoTestServerAvailability"));
// Cree l'objet formulaire mail // Cree l'objet formulaire mail
include_once(DOL_DOCUMENT_ROOT."/lib/CMailFile.class.php"); include_once(DOL_DOCUMENT_ROOT."/lib/CMailFile.class.php");
$mail = new CMailFile('','','',''); $mail = new CMailFile('','','','');
$result=$mail->check_server_port($server,$port); $result=$mail->check_server_port($server,$port);
if ($result) print '<div class="ok">'.$langs->trans("ServerAvailableOnIPOrPort",$server,$port).'</div>'; if ($result) print '<div class="ok">'.$langs->trans("ServerAvailableOnIPOrPort",$server,$port).'</div>';
else else
{ {
print '<div class="error">'.$langs->trans("ServerNotAvailableOnIPOrPort",$server,$port); print '<div class="error">'.$langs->trans("ServerNotAvailableOnIPOrPort",$server,$port);
if ($mail->error) print ' - '.$langs->convToOutputCharset($mail->error,'ISO-8859-1'); if ($mail->error) print ' - '.$langs->convToOutputCharset($mail->error,'ISO-8859-1');
print '</div>'; print '</div>';
} }
print '<br>'; print '<br>';
} }
// Affichage formulaire de TEST simple // Affichage formulaire de TEST simple
if ($_GET["action"] == 'test') if ($_GET["action"] == 'test')
{ {
print '<br>'; print '<br>';
print_titre($langs->trans("DoTestSend")); print_titre($langs->trans("DoTestSend"));
// Cree l'objet formulaire mail // Cree l'objet formulaire mail
include_once(DOL_DOCUMENT_ROOT."/html.formmail.class.php"); include_once(DOL_DOCUMENT_ROOT."/html.formmail.class.php");
$formmail = new FormMail($db); $formmail = new FormMail($db);
$formmail->fromname = (isset($_POST['fromname'])?$_POST['fromname']:$conf->global->MAIN_MAIL_EMAIL_FROM); $formmail->fromname = (isset($_POST['fromname'])?$_POST['fromname']:$conf->global->MAIN_MAIL_EMAIL_FROM);
$formmail->frommail = (isset($_POST['frommail'])?$_POST['frommail']:$conf->global->MAIN_MAIL_EMAIL_FROM); $formmail->frommail = (isset($_POST['frommail'])?$_POST['frommail']:$conf->global->MAIN_MAIL_EMAIL_FROM);
$formmail->withfromreadonly=0; $formmail->withfromreadonly=0;
$formmail->withsubstit=0; $formmail->withsubstit=0;
$formmail->withfrom=1; $formmail->withfrom=1;
$formmail->witherrorsto=1; $formmail->witherrorsto=1;
$formmail->withto=(isset($_POST['sendto'])?$_POST['sendto']:$user->email?$user->email:1); $formmail->withto=(isset($_POST['sendto'])?$_POST['sendto']:$user->email?$user->email:1);
$formmail->withtocc=(isset($_POST['sendtocc'])?$_POST['sendtocc']:1); $formmail->withtocc=(isset($_POST['sendtocc'])?$_POST['sendtocc']:1);
$formmail->withtoccc=(isset($_POST['sendtoccc'])?$_POST['sendtoccc']:1); $formmail->withtoccc=(isset($_POST['sendtoccc'])?$_POST['sendtoccc']:1);
$formmail->withtopic=(isset($_POST['subject'])?$_POST['subject']:$langs->trans("Test")); $formmail->withtopic=(isset($_POST['subject'])?$_POST['subject']:$langs->trans("Test"));
$formmail->withtopicreadonly=0; $formmail->withtopicreadonly=0;
$formmail->withfile=2; $formmail->withfile=2;
$formmail->withbody=(isset($_POST['message'])?$_POST['message']:$langs->trans("Test")); $formmail->withbody=(isset($_POST['message'])?$_POST['message']:$langs->trans("Test"));
$formmail->withbodyreadonly=0; $formmail->withbodyreadonly=0;
$formmail->withcancel=1; $formmail->withcancel=1;
$formmail->withdeliveryreceipt=1; $formmail->withdeliveryreceipt=1;
$formmail->withfckeditor=0; $formmail->withfckeditor=0;
// Tableau des substitutions // Tableau des substitutions
$formmail->substit=$substitutionarrayfortest; $formmail->substit=$substitutionarrayfortest;
// Tableau des parametres complementaires du post // Tableau des parametres complementaires du post
$formmail->param["action"]="send"; $formmail->param["action"]="send";
$formmail->param["models"]="body"; $formmail->param["models"]="body";
$formmail->param["mailid"]=$mil->id; $formmail->param["mailid"]=$mil->id;
$formmail->param["returnurl"]=DOL_URL_ROOT."/admin/mails.php"; $formmail->param["returnurl"]=DOL_URL_ROOT."/admin/mails.php";
// Init list of files // Init list of files
if (! empty($_REQUEST["mode"]) && $_REQUEST["mode"]=='init') if (! empty($_REQUEST["mode"]) && $_REQUEST["mode"]=='init')
{ {
$formmail->clear_attached_files(); $formmail->clear_attached_files();
} }
$formmail->show_form('addfile'); $formmail->show_form('addfile');
print '<br>'; print '<br>';
} }
// Affichage formulaire de TEST HTML // Affichage formulaire de TEST HTML
if ($_GET["action"] == 'testhtml') if ($_GET["action"] == 'testhtml')
{ {
print '<br>'; print '<br>';
print_titre($langs->trans("DoTestSendHTML")); print_titre($langs->trans("DoTestSendHTML"));
// Cree l'objet formulaire mail // Cree l'objet formulaire mail
include_once(DOL_DOCUMENT_ROOT."/html.formmail.class.php"); include_once(DOL_DOCUMENT_ROOT."/html.formmail.class.php");
$formmail = new FormMail($db); $formmail = new FormMail($db);
$formmail->fromname = $conf->global->MAIN_MAIL_EMAIL_FROM; $formmail->fromname = $conf->global->MAIN_MAIL_EMAIL_FROM;
$formmail->frommail = $conf->global->MAIN_MAIL_EMAIL_FROM; $formmail->frommail = $conf->global->MAIN_MAIL_EMAIL_FROM;
$formmail->withfromreadonly=0; $formmail->withfromreadonly=0;
$formmail->withsubstit=0; $formmail->withsubstit=0;
$formmail->withfrom=1; $formmail->withfrom=1;
$formmail->witherrorsto=1; $formmail->witherrorsto=1;
$formmail->withto=(isset($_POST['sendto'])?$_POST['sendto']:$user->email?$user->email:1); $formmail->withto=(isset($_POST['sendto'])?$_POST['sendto']:$user->email?$user->email:1);
$formmail->withtocc=(isset($_POST['sendtocc'])?$_POST['sendtocc']:1); $formmail->withtocc=(isset($_POST['sendtocc'])?$_POST['sendtocc']:1);
$formmail->withtoccc=(isset($_POST['sendtoccc'])?$_POST['sendtoccc']:1); $formmail->withtoccc=(isset($_POST['sendtoccc'])?$_POST['sendtoccc']:1);
$formmail->withtopic=(isset($_POST['subject'])?$_POST['subject']:$langs->trans("Test")); $formmail->withtopic=(isset($_POST['subject'])?$_POST['subject']:$langs->trans("Test"));
$formmail->withtopicreadonly=0; $formmail->withtopicreadonly=0;
$formmail->withfile=2; $formmail->withfile=2;
$formmail->withbody=(isset($_POST['message'])?$_POST['message']:$langs->trans("Test")); $formmail->withbody=(isset($_POST['message'])?$_POST['message']:$langs->trans("Test"));
$formmail->withbodyreadonly=0; $formmail->withbodyreadonly=0;
$formmail->withcancel=1; $formmail->withcancel=1;
$formmail->withdeliveryreceipt=1; $formmail->withdeliveryreceipt=1;
$formmail->withfckeditor=1; $formmail->withfckeditor=1;
// Tableau des substitutions // Tableau des substitutions
$formmail->substit=$substitutionarrayfortest; $formmail->substit=$substitutionarrayfortest;
// Tableau des parametres complementaires du post // Tableau des parametres complementaires du post
$formmail->param["action"]="sendhtml"; $formmail->param["action"]="sendhtml";
$formmail->param["models"]="body"; $formmail->param["models"]="body";
$formmail->param["mailid"]=$mil->id; $formmail->param["mailid"]=$mil->id;
$formmail->param["returnurl"]=DOL_URL_ROOT."/admin/mails.php"; $formmail->param["returnurl"]=DOL_URL_ROOT."/admin/mails.php";
// Init list of files // Init list of files
if (! empty($_REQUEST["mode"]) && $_REQUEST["mode"]=='init') if (! empty($_REQUEST["mode"]) && $_REQUEST["mode"]=='init')
{ {
$formmail->clear_attached_files(); $formmail->clear_attached_files();
} }
$formmail->show_form('addfilehtml'); $formmail->show_form('addfilehtml');
print '<br>'; print '<br>';
} }
} }

4
htdocs/admin/security_other.php
View File

@ -203,7 +203,7 @@ if (function_exists("imagecreatefrompng"))
else else
{ {
$html = new Form($db); $html = new Form($db);
$desc = $html->textwithwarning('',$langs->transnoentities("EnableGDLibraryDesc"),1); $desc = $html->textwithpicto('',$langs->transnoentities("EnableGDLibraryDesc"),1,0,'warning');
print $desc; print $desc;
} }
print "</td>"; print "</td>";
@ -246,7 +246,7 @@ if (function_exists("cl_scanfile")) // Clamav
else else
{ {
$html = new Form($db); $html = new Form($db);
$desc = $html->textwithwarning('',$langs->transnoentities("EnablePhpAVModuleDesc"),1); $desc = $html->textwithpicto('',$langs->transnoentities("EnablePhpAVModuleDesc"),1,0,'warning');
print $desc; print $desc;
} }
print "</td>"; print "</td>";

2
htdocs/admin/system/database.php
View File

@ -128,7 +128,7 @@ else
} }
if ($show==0) print $row[1]; if ($show==0) print $row[1];
if ($show==1) print $html->textwithhelp($row[1],$text); if ($show==1) print $html->textwithhelp($row[1],$text);
if ($show==2) print $html->textwithwarning($row[1],$text); if ($show==2) print $html->textwithpicto($row[1],$text,1,0,'warning');
print '</td>'; print '</td>';
print "</tr>\n"; print "</tr>\n";
} }

53
htdocs/html.form.class.php
View File

@ -145,12 +145,12 @@ class Form
} }
/** /**
* \brief Affiche un texte avec picto help qui affiche un tooltip * \brief Show a text with a picto and a tooltip on picto
* \param text Texte à afficher * \param text Text to show
* \param htmltooltip Contenu html du tooltip * \param htmltooltip Content of tooltip
* \param direction 1=Le picto est après, -1=le picto est avant * \param direction 1=Icon is after text, -1=Icon is before text
* \param usehelpcursor 1=Utilise curseur help, 0=Curseur par defaut * \param usehelpcursor 1=Use a help cursor, 0=Use default cursor
* \return string Code html du texte,picto * \return string HTML code of text, picto, tooltip
*/ */
function textwithhelp($text,$htmltext,$direction=1,$usehelpcursor=1) function textwithhelp($text,$htmltext,$direction=1,$usehelpcursor=1)
{ {
@ -161,33 +161,22 @@ class Form
} }
/** /**
* \brief Affiche un texte avec picto warning qui affiche un tooltip * \brief Show a text with a picto and a tooltip on picto
* \param text Texte à afficher * \param text Text to show
* \param htmltooltip Contenu html du tooltip * \param htmltooltip Content of tooltip
* \param direction 1=Le picto est après, -1=le picto est avant * \param direction 1=Icon is after text, -1=Icon is before text
* \return string Code html du texte,picto * \param usehelpcursor 1=Use a help cursor, 0=Use default cursor
* \return string HTML code of text, picto, tooltip
*/ */
function textwithwarning($text,$htmltext,$direction=1) function textwithpicto($text,$htmltext,$direction=1,$usehelpcursor=0,$type='help')
{ {
global $conf; global $conf;
$alt=''; $alt='';
if ($type == 'help') $img=img_help($usehelpcursor,$alt);
if ($type == 'warning') $img=img_warning($alt);
if ($type == 'superadmin') $img=img_redstar($alt);
if (empty($conf->use_javascript_ajax)) $alt='Help disabled (javascript disabled)'; if (empty($conf->use_javascript_ajax)) $alt='Help disabled (javascript disabled)';
return $this->textwithtooltip($text,$htmltext,2,$direction,img_warning($alt)); return $this->textwithtooltip($text,$htmltext,2,$direction,$img);
}
/**
* \brief Affiche un texte avec picto redstar qui affiche un tooltip
* \param text Texte à afficher
* \param htmltooltip Contenu html du tooltip
* \param direction 1=Le picto est après, -1=le picto est avant
* \return string Code html du texte,picto
*/
function textwithredstar($text,$htmltext,$direction=1)
{
global $conf;
$alt='';
if (empty($conf->use_javascript_ajax)) $alt='Help disabled (javascript disabled)';
return $this->textwithtooltip($text,$htmltext,2,$direction,img_redstar($alt));
} }
@ -696,7 +685,7 @@ class Form
function select_users($selected='',$htmlname='userid',$show_empty=0,$exclude='',$disabled=0) function select_users($selected='',$htmlname='userid',$show_empty=0,$exclude='',$disabled=0)
{ {
global $conf; global $conf;
// Permettre l'exclusion d'utilisateurs // Permettre l'exclusion d'utilisateurs
if (is_array($exclude)) $excludeUsers = implode("','",$exclude); if (is_array($exclude)) $excludeUsers = implode("','",$exclude);
@ -804,7 +793,7 @@ class Form
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON cp.fk_categorie = c.rowid"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON cp.fk_categorie = c.rowid";
} }
$sql.= " WHERE p.entity = ".$conf->entity; $sql.= " WHERE p.entity = ".$conf->entity;
if($finished == 0) if($finished == 0)
{ {
$sql.= " AND p.finished = ".$finished; $sql.= " AND p.finished = ".$finished;
@ -1462,7 +1451,7 @@ class Form
function select_comptes($selected='',$htmlname='accountid',$statut=0,$filtre='',$useempty=0) function select_comptes($selected='',$htmlname='accountid',$statut=0,$filtre='',$useempty=0)
{ {
global $langs, $conf; global $langs, $conf;
$langs->load("admin"); $langs->load("admin");
$sql = "SELECT rowid, label, bank"; $sql = "SELECT rowid, label, bank";
@ -1485,7 +1474,7 @@ class Form
{ {
print '<option value="'.$obj->rowid.'">&nbsp;</option>'; print '<option value="'.$obj->rowid.'">&nbsp;</option>';
} }
while ($i < $num) while ($i < $num)
{ {
$obj = $this->db->fetch_object($result); $obj = $this->db->fetch_object($result);

8
htdocs/user/fiche.php
View File

@ -754,7 +754,7 @@ else
* Affichage onglets * Affichage onglets
*/ */
$head = user_prepare_head($fuser); $head = user_prepare_head($fuser);
$title = $fuser->admin ? $langs->trans("Administrator") : $langs->trans("User"); $title = $fuser->admin ? $langs->trans("Administrator") : $langs->trans("User");
$title = !$fuser->entity ? $langs->trans("SuperAdministrator") : $title; $title = !$fuser->entity ? $langs->trans("SuperAdministrator") : $title;
@ -892,7 +892,7 @@ else
// Administrateur // Administrateur
print '<tr><td width="25%" valign="top">'.$langs->trans("Administrator").'</td>'; print '<tr><td width="25%" valign="top">'.$langs->trans("Administrator").'</td>';
print '<td>'.yn($fuser->admin); print '<td>'.yn($fuser->admin);
if ($fuser->admin && !$fuser->entity) if ($conf->global->MAIN_MODULE_MULTICOMPANY && $fuser->admin && ! $fuser->entity)
{ {
print ' '.img_redstar($langs->trans("SuperAdministrator")); print ' '.img_redstar($langs->trans("SuperAdministrator"));
} }
@ -1337,7 +1337,7 @@ else
$text='<input size="12" maxlength="32" type="text" class="flat" name="password" value="'.$fuser->pass.'">'; $text='<input size="12" maxlength="32" type="text" class="flat" name="password" value="'.$fuser->pass.'">';
if ($dolibarr_main_authentication && $dolibarr_main_authentication == 'http') if ($dolibarr_main_authentication && $dolibarr_main_authentication == 'http')
{ {
$text=$html->textwithwarning($text,$langs->trans("DolibarrInHttpAuthenticationSoPasswordUseless",$dolibarr_main_authentication)); $text=$html->textwithpicto($text,$langs->trans("DolibarrInHttpAuthenticationSoPasswordUseless",$dolibarr_main_authentication),1,0,'warning');
} }
} }
else else
@ -1366,7 +1366,7 @@ else
{ {
$yn = yn($fuser->admin); $yn = yn($fuser->admin);
print '<input type="hidden" name="admin" value="'.$fuser->admin.'">'; print '<input type="hidden" name="admin" value="'.$fuser->admin.'">';
print $html->textwithwarning($yn,$langs->trans("DontChangeSuperAdmin")); print $html->textwithpicto($yn,$langs->trans("DontChangeSuperAdmin"),1,0,'warning');
} }
print '</td></tr>'; print '</td></tr>';
} }

2
htdocs/user/home.php
View File

@ -99,7 +99,7 @@ if ($resql)
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
print "<td><a href=\"".DOL_URL_ROOT."/user/fiche.php?id=$obj->rowid\">".img_object($langs->trans("ShowUser"),"user")." ".$obj->firstname." ".$obj->name."</a>"; print "<td><a href=\"".DOL_URL_ROOT."/user/fiche.php?id=$obj->rowid\">".img_object($langs->trans("ShowUser"),"user")." ".$obj->firstname." ".$obj->name."</a>";
if ($obj->admin && !$obj->entity) if ($conf->global->MAIN_MODULE_MULTICOMPANY && $obj->admin && ! $obj->entity)
{ {
print img_redstar($langs->trans("SuperAdministrator")); print img_redstar($langs->trans("SuperAdministrator"));
} }

2
htdocs/user/index.php
View File

@ -98,7 +98,7 @@ if ($result)
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
print '<td><a href="fiche.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowUser"),"user").' '.$obj->login.'</a>'; print '<td><a href="fiche.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowUser"),"user").' '.$obj->login.'</a>';
if ($obj->admin && !$obj->entity) if ($conf->global->MAIN_MODULE_MULTICOMPANY && $obj->admin && ! $obj->entity)
{ {
print img_redstar($langs->trans("SuperAdministrator")); print img_redstar($langs->trans("SuperAdministrator"));
} }